aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-02-27 16:36:47 -0800
committerRoland McGrath <roland@hack.frob.com>2013-02-27 16:36:47 -0800
commitf4564ff0b6131ff0fba4bbc6d4a5340bb8b34388 (patch)
treee2fbd6c50fe37e5b8b39982688a9cf21dc154fb5
parent43301bd3c281036ba97eef384c9340cc7b6130d3 (diff)
downloadglibc-f4564ff0b6131ff0fba4bbc6d4a5340bb8b34388.tar
glibc-f4564ff0b6131ff0fba4bbc6d4a5340bb8b34388.tar.gz
glibc-f4564ff0b6131ff0fba4bbc6d4a5340bb8b34388.tar.bz2
glibc-f4564ff0b6131ff0fba4bbc6d4a5340bb8b34388.zip
ARM: Macroize use of .cfi_sections directive.
-rw-r--r--ports/ChangeLog.arm8
-rw-r--r--ports/sysdeps/arm/dl-tlsdesc.S2
-rw-r--r--ports/sysdeps/arm/dl-trampoline.S4
-rw-r--r--ports/sysdeps/arm/sysdep.h5
-rw-r--r--ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h2
5 files changed, 16 insertions, 5 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 5b5220f931..9e91ad112b 100644
--- 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 0ae3abb38d..66759923b0 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 ebf221c85c..6d41ebd88f 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 0e6f645e80..6598f51911 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 1b0a2447f2..5e07b8bd85 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; \