ARM: Macroize use of .cfi_sections directive.

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 5b5220f931fdb3340040acb7023a674848cc1cb7..9e91ad112b42648793fc4c63a717a54ac747047f 100644 (file)
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,11 @@
+2013-02-27  Roland McGrath  <roland@hack.frob.com>
+
+       * 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  <joseph@codesourcery.com>
 
        [BZ #14920]

diff --git a/ports/sysdeps/arm/dl-tlsdesc.S b/ports/sysdeps/arm/dl-tlsdesc.S
index 0ae3abb38d2191633f4001c38fe5a03199a1064f..66759923b0895c4fa8c85bbaeeac2a193bfb0897 100644 (file)
--- 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 ebf221c85c8e6cd13e47f4940594f642c9c7b142..6d41ebd88fbf7ac98fffbdad022fce16d6014d0b 100644 (file)
--- 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 0e6f645e807c621822169a9149dd487e45f3f08b..6598f51911d91271e2a8b0ad9e9276561babc79f 100644 (file)
--- 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 1b0a2447f2d174b748050bddd306d22ae0a17081..5e07b8bd85fd53b41dd4fc3aa9a3bda710cb6294 100644 (file)
--- 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;                                                     \