summaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2014-09-11 09:03:49 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2014-09-11 09:03:49 +0000
commit9a11bbe02eb0f7d65deac732af7482f7f62e8279 (patch)
treed59c0dfbd56c44219c99af29c2c0e3905697ef2a /libffi
parent986b9a67c847f59e5c383e1f8d6faa7431a11911 (diff)
downloadgcc-9a11bbe02eb0f7d65deac732af7482f7f62e8279.tar.gz
* 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/trunk@215155 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ChangeLog6
-rw-r--r--libffi/src/powerpc/linux64.S5
-rw-r--r--libffi/src/powerpc/linux64_closure.S5
3 files changed, 12 insertions, 4 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index a2db36614fd..ee6c4769bd8 100644
--- 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 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