From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5349 invoked by alias); 28 Feb 2013 00:43:46 -0000 Received: (qmail 5300 invoked by uid 22791); 28 Feb 2013 00:43:45 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,KAM_STOCKGEN X-Spam-Check-By: sourceware.org Received: from toast.topped-with-meat.com (HELO topped-with-meat.com) (204.197.218.159) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 28 Feb 2013 00:43:40 +0000 Received: by topped-with-meat.com (Postfix, from userid 5281) id 8921A2C0A1; Wed, 27 Feb 2013 16:43:38 -0800 (PST) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit From: Roland McGrath To: libc-ports@sourceware.org Subject: [PATCH] ARM: Macroize use of .cfi_sections directive. Message-Id: <20130228004338.8921A2C0A1@topped-with-meat.com> Date: Thu, 28 Feb 2013 00:43:00 -0000 X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=LYSvtFvi c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=R1FrS97iX6oA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=E_sR1xKUBsMA:10 a=a5hXjhHqSwt8r4bsTDQA:9 a=CjuIK1q_8ugA:10 X-IsSubscribed: yes 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: 2013-02/txt/msg00124.txt.bz2 Some future ARM configurations might use DWARF2 CFI rather than EABI. Using a macro for .cfi_sections makes it easy for a new sysdep.h file to override the choice. Thanks, Roland ports/ChangeLog.arm 2013-02-27 Roland McGrath * sysdeps/arm/sysdep.h (CFI_SECTIONS): New macro. (ENTRY): Use it. * sysdeps/arm/dl-tlsdesc.S: Likewise. * sysdeps/arm/dl-trampoline.S: Likewise. * sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h (PSEUDO): Likewise. --- a/ports/sysdeps/arm/dl-tlsdesc.S +++ b/ports/sysdeps/arm/dl-tlsdesc.S @@ -29,7 +29,7 @@ .text @ emit debug information with cfi @ use arm-specific pseudos for unwinding itself - .cfi_sections .debug_frame + CFI_SECTIONS .hidden _dl_tlsdesc_return .global _dl_tlsdesc_return .type _dl_tlsdesc_return,#function --- a/ports/sysdeps/arm/dl-trampoline.S +++ b/ports/sysdeps/arm/dl-trampoline.S @@ -28,7 +28,7 @@ .text .globl _dl_runtime_resolve .type _dl_runtime_resolve, #function - .cfi_sections .debug_frame + CFI_SECTIONS cfi_startproc .align 2 _dl_runtime_resolve: @@ -77,7 +77,7 @@ _dl_runtime_resolve: #ifndef PROF .globl _dl_runtime_profile .type _dl_runtime_profile, #function - .cfi_sections .debug_frame + CFI_SECTIONS cfi_startproc .align 2 _dl_runtime_profile: --- a/ports/sysdeps/arm/sysdep.h +++ b/ports/sysdeps/arm/sysdep.h @@ -63,10 +63,13 @@ .type C_SYMBOL_NAME(name),%function; \ .align ALIGNARG(4); \ C_LABEL(name) \ - .cfi_sections .debug_frame; \ + CFI_SECTIONS; \ cfi_startproc; \ CALL_MCOUNT +#define CFI_SECTIONS \ + .cfi_sections .debug_frame + #undef END #define END(name) \ cfi_endproc; \ --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h @@ -35,7 +35,7 @@ .type __##syscall_name##_nocancel,%function; \ .globl __##syscall_name##_nocancel; \ __##syscall_name##_nocancel: \ - .cfi_sections .debug_frame; \ + CFI_SECTIONS; \ cfi_startproc; \ DO_CALL (syscall_name, args); \ cmn r0, $4096; \