From patchwork Sat Feb 25 02:45:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Howarth X-Patchwork-Id: 143008 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id D0C79B6F98 for ; Sat, 25 Feb 2012 13:45:46 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1330742748; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=woZYqlxekOaKaPJCpP5atROGwyM=; b=nIByL2mDAV+m5Ab Oo3olEhD+x+fHZDucoBaSNcSmZFqymyUEJi8ZVg/IBGLKifkQwEDWhayazVllTHb AdwaJzGGFCL7wivVhLyeFX7Npvhl/hiGszNLPMCZ1QVjHSRM6jmEwMF/6hbQnGbb z8WGGO+Uy8scPOXUBDT7p5ePXYcw= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=EA7IEcuaII2LkDbVvEkVUYOZXwfL7aJGUNJb0hj8PcuMt4U24EKNkgpqRpJmp/ Ci269DZ9RhQ2fjhdof1468EJ9DFyy/fTYCROrCltF1VckhskF5Wlo8b8L3eAa2W1 +OWZU7cR39CXQhT/iP89egy7ZBNL5F2w4JLBxVhxXCI1g=; Received: (qmail 10636 invoked by alias); 25 Feb 2012 02:45:42 -0000 Received: (qmail 10624 invoked by uid 22791); 25 Feb 2012 02:45:41 -0000 X-SWARE-Spam-Status: No, hits=-0.5 required=5.0 tests=AWL, BAYES_50, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from bromo.med.uc.edu (HELO bromo.med.uc.edu) (129.137.3.146) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 25 Feb 2012 02:45:24 +0000 Received: from bromo.med.uc.edu (localhost.localdomain [127.0.0.1]) by bromo.med.uc.edu (Postfix) with ESMTP id 84D99B2DBA; Fri, 24 Feb 2012 21:45:22 -0500 (EST) Received: (from howarth@localhost) by bromo.med.uc.edu (8.14.3/8.14.3/Submit) id q1P2jMRX018025; Fri, 24 Feb 2012 21:45:22 -0500 Date: Fri, 24 Feb 2012 21:45:22 -0500 From: Jack Howarth To: gcc-patches@gcc.gnu.org Cc: patrick.marlier@gmail.com, mikestump@comcast.net, iains@gcc.gnu.org Subject: [PATCH] backport r184555 to gcc-4_6-branch Message-ID: <20120225024522.GA18023@bromo.med.uc.edu> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org The attached patch is a backport of r184555 to the gcc-4_6-branch to fix PR52179 so that boehm-gc functions properly with darwin11 and later's default usage of -pie in the linker. This fixes PR49461 properly and allows the previous hack of passing -no_pie to SYSTEMSPEC to be removed. Bootstrap and regression tested on x86_64-apple-darwin11... http://gcc.gnu.org/ml/gcc-testresults/2012-02/msg02427.html Okay for gcc-4_6-branch when it reopens for gcc 4.6.4? Jack boehm-gc/ 2012-02-25 Jack Howarth Backport from mainline 2012-02-23 Patrick Marlier Jack Howarth PR boehm-gc/52179 * include/gc_config.h.in: Undefine HAVE_PTHREAD_GET_STACKADDR_NP. * include/private/gcconfig.h (DARWIN): Define STACKBOTTOM with pthread_get_stackaddr_np when available. * configure.ac (THREADS): Check availability of pthread_get_stackaddr_np. * configure: Regenerate. libjava/ 2012-02-25 Jack Howarth Backport from mainline 2012-02-23 Patrick Marlier Jack Howarth PR target/49461 * configure.ac (SYSTEMSPEC): No longer pass -no_pie for darwin11. * configure: Regenerate. Index: boehm-gc/configure.ac =================================================================== --- boehm-gc/configure.ac (revision 184553) +++ boehm-gc/configure.ac (working copy) @@ -392,6 +392,7 @@ esac oldLIBS="$LIBS" LIBS="$LIBS $THREADLIBS" AC_CHECK_FUNCS([pthread_getattr_np]) +AC_CHECK_FUNCS([pthread_get_stackaddr_np]) LIBS="$oldLIBS" # Configuration of machine-dependent code Index: boehm-gc/include/gc_config.h.in =================================================================== --- boehm-gc/include/gc_config.h.in (revision 184553) +++ boehm-gc/include/gc_config.h.in (working copy) @@ -87,6 +87,9 @@ /* Define to 1 if you have the `pthread_getattr_np' function. */ #undef HAVE_PTHREAD_GETATTR_NP +/* Define to 1 if you have the `pthread_get_stackaddr_np_np' function. */ +#undef HAVE_PTHREAD_GET_STACKADDR_NP + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H Index: boehm-gc/include/private/gcconfig.h =================================================================== --- boehm-gc/include/private/gcconfig.h (revision 184553) +++ boehm-gc/include/private/gcconfig.h (working copy) @@ -1331,7 +1331,11 @@ These aren't used when dyld support is enabled (it is by default) */ # define DATASTART ((ptr_t) get_etext()) # define DATAEND ((ptr_t) get_end()) -# define STACKBOTTOM ((ptr_t) 0xc0000000) +# ifdef HAVE_PTHREAD_GET_STACKADDR_NP +# define STACKBOTTOM (ptr_t)pthread_get_stackaddr_np(pthread_self()) +# else +# define STACKBOTTOM ((ptr_t) 0xc0000000) +# endif # define USE_MMAP # define USE_MMAP_ANON # define USE_ASM_PUSH_REGS @@ -2011,7 +2015,11 @@ These aren't used when dyld support is enabled (it is by default) */ # define DATASTART ((ptr_t) get_etext()) # define DATAEND ((ptr_t) get_end()) -# define STACKBOTTOM ((ptr_t) 0x7fff5fc00000) +# ifdef HAVE_PTHREAD_GET_STACKADDR_NP +# define STACKBOTTOM (ptr_t)pthread_get_stackaddr_np(pthread_self()) +# else +# define STACKBOTTOM ((ptr_t) 0x7fff5fc00000) +# endif # define USE_MMAP # define USE_MMAP_ANON # ifdef GC_DARWIN_THREADS Index: libjava/configure.ac =================================================================== --- libjava/configure.ac (revision 184553) +++ libjava/configure.ac (working copy) @@ -886,14 +886,9 @@ case "${host}" in SYSTEMSPEC="-lunicows $SYSTEMSPEC" fi ;; - *-*-darwin9*) + *-*-darwin[[912]]*) SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" ;; - *-*-darwin[[12]]*) - # Something is incompatible with pie, would be nice to fix it and - # remove -no_pie. PR49461 - SYSTEMSPEC="-no_pie %{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" - ;; *) SYSTEMSPEC= ;;