procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libitm: de-ELF-ize x86/sjlj.S.

Browse source 
* config/x86/sjlj.S: Protect elf directives with __ELF__.
        Protect .note.GNU-stack with __linux__.

From-SVN: r181229
This commit is contained in:
Richard Henderson 2011-11-09 10:38:21 -08:00 • committed by Richard Henderson
parent 9f13f69749
commit 9bdc63433a
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libitm/ChangeLog
View file

@ -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.

23
libitm/config/x86/sjlj.S
View file

@ -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
.size _ITM_beginTransaction, .-_ITM_beginTransaction
.p2align 4
#ifdef __ELF__
.type _ITM_beginTransaction, @function
.size _ITM_beginTransaction, .-_ITM_beginTransaction
#endif
.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
.size GTM_longjmp, .-GTM_longjmp
#ifdef __ELF__
.type GTM_longjmp, @function
.hidden GTM_longjmp
.size GTM_longjmp, .-GTM_longjmp
#endif
#ifdef __linux__
.section .note.GNU-stack, "", @progbits
#endif