From f4564ff0b6131ff0fba4bbc6d4a5340bb8b34388 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 27 Feb 2013 16:36:47 -0800 Subject: [PATCH] ARM: Macroize use of .cfi_sections directive. --- ports/ChangeLog.arm | 8 ++++++++ ports/sysdeps/arm/dl-tlsdesc.S | 2 +- ports/sysdeps/arm/dl-trampoline.S | 4 ++-- ports/sysdeps/arm/sysdep.h | 5 ++++- ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 5b5220f..9e91ad1 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,11 @@ +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. + 2013-02-18 Joseph Myers [BZ #14920] diff --git a/ports/sysdeps/arm/dl-tlsdesc.S b/ports/sysdeps/arm/dl-tlsdesc.S index 0ae3abb..6675992 100644 --- 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 diff --git a/ports/sysdeps/arm/dl-trampoline.S b/ports/sysdeps/arm/dl-trampoline.S index ebf221c..6d41ebd 100644 --- 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: diff --git a/ports/sysdeps/arm/sysdep.h b/ports/sysdeps/arm/sysdep.h index 0e6f645..6598f51 100644 --- 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; \ diff --git a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h index 1b0a244..5e07b8b 100644 --- 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; \ -- 2.7.4