diff options
| author | Richard Henderson <rth@redhat.com> | 2011-11-09 10:38:21 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2011-11-09 10:38:21 -0800 |
| commit | 9bdc63433a4b27f731bbca86ac35733b8c294c71 (patch) | |
| tree | 03f86bd585cfa60f51b04af9ead06e7930738727 | |
| parent | 9f13f697497c1bc7d3b9609eafad3ffec52d83b8 (diff) | |
| download | gcc-9bdc63433a4b27f731bbca86ac35733b8c294c71.zip gcc-9bdc63433a4b27f731bbca86ac35733b8c294c71.tar.gz gcc-9bdc63433a4b27f731bbca86ac35733b8c294c71.tar.bz2 | |
libitm: de-ELF-ize x86/sjlj.S.
* config/x86/sjlj.S: Protect elf directives with __ELF__.
Protect .note.GNU-stack with __linux__.
From-SVN: r181229
| -rw-r--r-- | libitm/ChangeLog | 3 | ||||
| -rw-r--r-- | libitm/config/x86/sjlj.S | 19 |
2 files changed, 17 insertions, 5 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index e91f91e..e78716d 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,5 +1,8 @@ 2011-11-09 Richard Henderson <rth@redhat.com> + * config/x86/sjlj.S: Protect elf directives with __ELF__. + Protect .note.GNU-stack with __linux__. + * configure.ac (GCC_AS_CFI_PSEUDO_OP): Test it. * configure, aclocal.m4, config.h.in: Rebuild. * config/generic/asmcfi.h: New file. diff --git a/libitm/config/x86/sjlj.S b/libitm/config/x86/sjlj.S index 6169499..32572d9 100644 --- a/libitm/config/x86/sjlj.S +++ b/libitm/config/x86/sjlj.S @@ -26,9 +26,9 @@ #include "asmcfi.h" .text - .p2align 4 + + .align 4 .globl _ITM_beginTransaction - .type _ITM_beginTransaction, @function _ITM_beginTransaction: cfi_startproc @@ -66,12 +66,14 @@ _ITM_beginTransaction: ret #endif cfi_endproc + +#ifdef __ELF__ + .type _ITM_beginTransaction, @function .size _ITM_beginTransaction, .-_ITM_beginTransaction +#endif - .p2align 4 + .align 4 .globl GTM_longjmp - .type GTM_longjmp, @function - .hidden GTM_longjmp GTM_longjmp: cfi_startproc @@ -103,6 +105,13 @@ GTM_longjmp: jmp *%edx #endif cfi_endproc + +#ifdef __ELF__ + .type GTM_longjmp, @function + .hidden GTM_longjmp .size GTM_longjmp, .-GTM_longjmp +#endif +#ifdef __linux__ .section .note.GNU-stack, "", @progbits +#endif |