summaryrefslogtreecommitdiffstats
path: root/libffi/src
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2014-09-11 09:04:29 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2014-09-11 09:04:29 +0000
commit595ee83d4dca74371adf79613c36b76d1ec1c9b8 (patch)
tree1e35d071992f26a9f4aa2e276e830fa6fb63258e /libffi/src
parentb82aef210d119f14c65ca0bb45e584aa46450e3f (diff)
downloadppe42-gcc-595ee83d4dca74371adf79613c36b76d1ec1c9b8.tar.gz
ppe42-gcc-595ee83d4dca74371adf79613c36b76d1ec1c9b8.zip
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@215156 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi/src')
-rw-r--r--libffi/src/powerpc/linux64.S5
-rw-r--r--libffi/src/powerpc/linux64_closure.S5
2 files changed, 6 insertions, 4 deletions
diff --git a/libffi/src/powerpc/linux64.S b/libffi/src/powerpc/linux64.S
index c4d01d8e3f7..d2acb7007b0 100644
--- 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 46a9ddfcd6b..1d80a39490b 100644
--- 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
OpenPOWER on IntegriCloud