> I'll hang on .. and test stuff ;-)
Try now. I've committed the following.
r~
commit f29a2041f32773464e226a83f41762c2e9cf658e
Author: rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed Nov 9 18:38:21 2011 +0000
libitm: de-ELF-ize x86/sjlj.S.
* config/x86/sjlj.S: Protect elf directives with __ELF__.
Protect .note.GNU-stack with __linux__.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181229
138bc75d-0d04-0410-961f-82ee72b054a4
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 <r...@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
