From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21489 invoked by alias); 1 Oct 2010 23:36:22 -0000 Received: (qmail 21432 invoked by uid 22791); 1 Oct 2010 23:36:20 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 01 Oct 2010 23:36:15 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id B40C82BAD4D; Fri, 1 Oct 2010 19:36:13 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id eTdhKfInZCAc; Fri, 1 Oct 2010 19:36:13 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 852772BACCB; Fri, 1 Oct 2010 19:36:13 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id 1A945F591F; Fri, 1 Oct 2010 16:36:09 -0700 (PDT) From: Joel Brobecker To: gdb-patches@sourceware.org Cc: Joel Brobecker Subject: [patch] Fix build failures with python support on sparc-solaris Date: Fri, 01 Oct 2010 23:36:00 -0000 Message-Id: <1285976168-4119-1-git-send-email-brobecker@adacore.com> Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-10/txt/msg00016.txt.bz2 Hello, This is something that I'd like to commit in a few days, bearing suggestions. There were two types of errors, mostly compiler warnings: 1. _FILE_OFFSET_BITS being redefined in pyconfig.h; This is a problem we're familiar with, having seen similar issues on GNU/Linux systems. I used a similar solution. 2. GCC 4.5 complains that calls to PyEval_InitThreads and PyEval_ReleaseLock have no effect. This is because our Python is built without thread support, leading us to use the dummy #define in python-internal.h which just gets replaced by `0'. Since this function returns void (checked versions 2.4 and 2.7), I simply removed the 0. gdb/ChangeLog: python/python-internal.h (_FILE_OFFSET_BITS): Undefine. (PyEval_InitThreads): Remove duplicate. Define as nothing. (PyEval_ReleaseLock): Define as nothing. Tested on x86_64-linux. --- gdb/python/python-internal.h | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index c5d1e73..97ac2fd 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -36,6 +36,11 @@ #undef _POSIX_C_SOURCE #undef _XOPEN_SOURCE +/* On sparc-solaris, /usr/include/sys/feature_tests.h defines + _FILE_OFFSET_BITS, which pyconfig.h also defines. Same work + arount technique as above. */ +#undef _FILE_OFFSET_BITS + #if HAVE_LIBPYTHON2_4 #include "python2.4/Python.h" #include "python2.4/frameobject.h" @@ -63,10 +68,9 @@ typedef int Py_ssize_t; #ifndef WITH_THREAD #define PyGILState_Ensure() ((PyGILState_STATE) 0) #define PyGILState_Release(ARG) ((void)(ARG)) -#define PyEval_InitThreads() 0 +#define PyEval_InitThreads() #define PyThreadState_Swap(ARG) ((void)(ARG)) -#define PyEval_InitThreads() 0 -#define PyEval_ReleaseLock() 0 +#define PyEval_ReleaseLock() #endif /* In order to be able to parse symtab_and_line_to_sal_object function -- 1.7.1