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

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index e91f91e5497f9b5a2b4a49332b40d1d81a8c0128..e78716d2a378f864c455b2fc95bb6b786faa23c6 100644 (file)
--- 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 616949904b05503b5d62f092074123ac0bf5192c..32572d9db60e1488733529640396c6dd01042b47 100644 (file)
--- 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