From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7048 invoked by alias); 30 May 2012 10:09:18 -0000 Received: (qmail 7031 invoked by uid 22791); 30 May 2012 10:09:17 -0000 X-SWARE-Spam-Status: No, hits=-3.4 required=5.0 tests=AWL,BAYES_00,FROM_12LTRDOM,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 30 May 2012 10:09:02 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1SZfpu-0002kD-2s from joseph_myers@mentor.com for libc-ports@sourceware.org; Wed, 30 May 2012 03:09:02 -0700 Received: from digraph.polyomino.org.uk ([172.16.63.104]) by EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Wed, 30 May 2012 11:09:00 +0100 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.74) (envelope-from ) id 1SZfpr-0007UN-Cb for libc-ports@sourceware.org; Wed, 30 May 2012 10:08:59 +0000 Date: Wed, 30 May 2012 10:09:00 -0000 From: "Joseph S. Myers" To: libc-ports@sourceware.org Subject: Remove SJLJ exceptions conditionals for ARM Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-05/txt/msg00178.txt.bz2 When updating pthread_once for libc changes I noticed a conditional on __USING_SJLJ_EXCEPTIONS__. This is irrelevant for ARM EABI and so I've applied this patch to remove such stray SJLJ exceptions conditionals. diff --git a/ChangeLog.arm b/ChangeLog.arm index 1d684d2..1737284 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,5 +1,10 @@ 2012-05-30 Joseph Myers + * sysdeps/arm/start.S [!__USING_SJLJ_EXCEPTIONS__]: Make code + unconditional. + * sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c + [__USING_SJLJ_EXCEPTIONS__ && !__PIC__]: Remove conditional code. + * sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c: Replace _internal alias by hidden_def. diff --git a/sysdeps/arm/start.S b/sysdeps/arm/start.S index 7f3de8c..245d7aa 100644 --- a/sysdeps/arm/start.S +++ b/sysdeps/arm/start.S @@ -73,10 +73,8 @@ .globl _start .type _start,#function _start: -#if !defined(__USING_SJLJ_EXCEPTIONS__) /* Protect against unhandled exceptions. */ .fnstart -#endif /* Clear the frame pointer and link register since this is the outermost frame. */ mov fp, #0 mov lr, #0 @@ -138,11 +136,8 @@ _start: .word main(GOT) #endif - -#if !defined(__USING_SJLJ_EXCEPTIONS__) .cantunwind .fnend -#endif /* Define a symbol for the first piece of initialized data. */ .data diff --git a/sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c b/sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c index eea1287..0c03f1c 100644 --- a/sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c +++ b/sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c @@ -87,12 +87,3 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) } weak_alias (__pthread_once, pthread_once) hidden_def (__pthread_once) - -#if defined(__USING_SJLJ_EXCEPTIONS__) && !defined(__PIC__) -/* When statically linked, if pthread_create is used, this file - will be brought in. The exception handling code in GCC assumes - that if pthread_create is available, so are these. */ -const void *include_pthread_getspecific attribute_hidden = pthread_getspecific; -const void *include_pthread_setspecific attribute_hidden = pthread_setspecific; -const void *include_pthread_key_create attribute_hidden = pthread_key_create; -#endif -- Joseph S. Myers joseph@codesourcery.com