linux64.S: Emit .note.GNU-stack even when POWERPC64 is not defined.

	* src/powerpc/linux64.S: Emit .note.GNU-stack even when
	POWERPC64 is not defined.
	* src/powerpc/linux64_closure.S: Likewise.  Also test _CALL_ELF == 2.

From-SVN: r215155

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index a2db36614fd478870eb23339614692fe1de1b86e..ee6c4769bd87b7d68b269e629b81b089b5e8090f 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-11  Jakub Jelinek  <jakub@redhat.com>
+
+       * src/powerpc/linux64.S: Emit .note.GNU-stack even when
+       POWERPC64 is not defined.
+       * src/powerpc/linux64_closure.S: Likewise.  Also test _CALL_ELF == 2.
+
 2014-07-21  Uros Bizjak  <ubizjak@gmail.com>
 
        * src/alpha/ffi.c: Do not include stdlib.h.

diff --git a/libffi/src/powerpc/linux64.S b/libffi/src/powerpc/linux64.S
index c4d01d8e3f7a77211af2b70c38bc0058e54cf3c4..d2acb7007b0a0472fd0d5c65c0d531247b459e1f 100644 (file)
--- a/libffi/src/powerpc/linux64.S
+++ b/libffi/src/powerpc/linux64.S
@@ -254,7 +254,8 @@ ffi_call_LINUX64:
        .align 3
 .LEFDE1:
 
-# if (defined __ELF__ && defined __linux__) || _CALL_ELF == 2
+#endif
+
+#if (defined __ELF__ && defined __linux__) || _CALL_ELF == 2
        .section        .note.GNU-stack,"",@progbits
-# endif
 #endif

diff --git a/libffi/src/powerpc/linux64_closure.S b/libffi/src/powerpc/linux64_closure.S
index 46a9ddfcd6b0129e9a17bf25b6934d25545fd008..1d80a39490b581db3a126f6b53c24ed257d8077b 100644 (file)
--- a/libffi/src/powerpc/linux64_closure.S
+++ b/libffi/src/powerpc/linux64_closure.S
@@ -381,7 +381,8 @@ ffi_closure_LINUX64:
        .align 3
 .LEFDE1:
 
-# if defined __ELF__ && defined __linux__
+#endif
+
+#if (defined __ELF__ && defined __linux__) || _CALL_ELF == 2
        .section        .note.GNU-stack,"",@progbits
-# endif
 #endif