From: Roland McGrath <roland@hack.frob.com>
To: Joseph Myers <joseph@codesourcery.com>
Cc: libc-ports@sourceware.org
Subject: [PATCH roland/arm-unwind-macros] ARM: Macroize assembly use of EABI unwind directives.
Date: Fri, 19 Apr 2013 20:58:00 -0000 [thread overview]
Message-ID: <20130419205838.DEFE82C08A@topped-with-meat.com> (raw)
In a configuration that does not use EABI unwind info, using the directives
for it anywhere causes link-time references to magic symbols that such a
configuration's libgcc won't necessarily define. (I haven't changed the
uses in .../linux/arm/ files because there is no configuration planned
using those files that doesn't use EABI unwind info.)
Tested on armv7l-linux-gnueabihf that compiled code was unchanged by the
patch.
Thanks,
Roland
ports/ChangeLog.arm
2013-04-19 Roland McGrath <roland@hack.frob.com>
* sysdeps/arm/sysdep.h
(eabi_fnstart, eabi_fnend, eabi_save, eabi_cantunwind, eabi_pad):
New macros.
* sysdeps/arm/dl-tlsdesc.S: Use them.
--- a/ports/sysdeps/arm/dl-tlsdesc.S
+++ b/ports/sysdeps/arm/dl-tlsdesc.S
@@ -29,13 +29,13 @@
.global _dl_tlsdesc_return
.type _dl_tlsdesc_return,#function
cfi_startproc
- .fnstart
+ eabi_fnstart
.align 2
_dl_tlsdesc_return:
sfi_breg r0, \
ldr r0, [\B]
BX (lr)
- .fnend
+ eabi_fnend
cfi_endproc
.size _dl_tlsdesc_return, .-_dl_tlsdesc_return
@@ -43,14 +43,14 @@ _dl_tlsdesc_return:
.global _dl_tlsdesc_undefweak
.type _dl_tlsdesc_undefweak,#function
cfi_startproc
- .fnstart
+ eabi_fnstart
.align 2
_dl_tlsdesc_undefweak:
GET_TLS (r1)
rsb r0, r0, #0
BX (lr)
cfi_endproc
- .fnend
+ eabi_fnend
.size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak
#ifdef SHARED
@@ -80,12 +80,12 @@ _dl_tlsdesc_dynamic(struct tlsdesc *tdp)
*/
cfi_startproc
- .fnstart
+ eabi_fnstart
.align 2
_dl_tlsdesc_dynamic:
/* Our calling convention is to clobber r0, r1 and the processor
flags. All others that are modified must be saved */
- .save {r2,r3,r4,lr}
+ eabi_save ({r2,r3,r4,lr})
push {r2,r3,r4,lr}
cfi_adjust_cfa_offset (16)
cfi_rel_offset (r2,0)
@@ -135,7 +135,7 @@ _dl_tlsdesc_dynamic:
#else
pop {r2,r3,r4, pc}
#endif
- .fnend
+ eabi_fnend
cfi_endproc
.size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic
#endif /* SHARED */
@@ -145,7 +145,7 @@ _dl_tlsdesc_dynamic:
.global _dl_tlsdesc_lazy_resolver
.type _dl_tlsdesc_lazy_resolver,#function
cfi_startproc
- .fnstart
+ eabi_fnstart
.align 2
_dl_tlsdesc_lazy_resolver:
/* r0 points at the tlsdesc,
@@ -155,10 +155,10 @@ _dl_tlsdesc_lazy_resolver:
We push the remaining call-clobbered registers here, and also
R1 -- to keep the stack correctly aligned. */
/* Tell the unwinder that r2 has already been pushed. */
- .save {r2}
+ eabi_save ({r2})
cfi_adjust_cfa_offset (4)
cfi_rel_offset (r2, 0)
- .save {r0,r1,r3,ip,lr}
+ eabi_save ({r0,r1,r3,ip,lr})
push {r0, r1, r3, ip, lr}
cfi_adjust_cfa_offset (20)
cfi_rel_offset (r0, 0)
@@ -180,7 +180,7 @@ _dl_tlsdesc_lazy_resolver:
sfi_breg r0, \
ldr r1, [\B, #4]
BX (r1)
- .fnend
+ eabi_fnend
cfi_endproc
.size _dl_tlsdesc_lazy_resolver, .-_dl_tlsdesc_lazy_resolver
@@ -190,14 +190,14 @@ _dl_tlsdesc_lazy_resolver:
.global _dl_tlsdesc_resolve_hold
.type _dl_tlsdesc_resolve_hold,#function
cfi_startproc
- .fnstart
+ eabi_fnstart
.align 2
_dl_tlsdesc_resolve_hold:
/* Tell the unwinder that r2 has already been pushed. */
- .save {r2}
+ eabi_save ({r2})
cfi_adjust_cfa_offset (4)
cfi_rel_offset (r2, 0)
- .save {r0,r1,r3,ip,lr}
+ eabi_save ({r0,r1,r3,ip,lr})
push {r0, r1, r3, ip, lr}
cfi_adjust_cfa_offset (20)
cfi_rel_offset (r0, 0)
@@ -220,6 +220,6 @@ _dl_tlsdesc_resolve_hold:
sfi_breg r0, \
ldr r1, [\B, #4]
BX (r1)
- .fnend
+ eabi_fnend
cfi_endproc
.size _dl_tlsdesc_resolve_hold, .-_dl_tlsdesc_resolve_hold
--- a/ports/sysdeps/arm/sysdep.h
+++ b/ports/sysdeps/arm/sysdep.h
@@ -257,6 +257,15 @@
# endif
+/* These are the directives used for EABI unwind info.
+ Wrap them in macros so another configuration's sysdep.h
+ file can define them away if it doesn't use EABI unwind info. */
+# define eabi_fnstart .fnstart
+# define eabi_fnend .fnend
+# define eabi_save(...) .save __VA_ARGS__
+# define eabi_cantunwind .cantunwind
+# define eabi_pad(n) .pad n
+
#endif /* __ASSEMBLER__ */
/* This number is the offset from the pc at the current location. */
next reply other threads:[~2013-04-19 20:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-19 20:58 Roland McGrath [this message]
2013-04-19 21:35 ` Joseph S. Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130419205838.DEFE82C08A@topped-with-meat.com \
--to=roland@hack.frob.com \
--cc=joseph@codesourcery.com \
--cc=libc-ports@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).