diff options
| author | Yiran Wang <yiran@google.com> | 2015-06-23 15:33:17 -0700 |
|---|---|---|
| committer | Yiran Wang <yiran@google.com> | 2015-06-29 10:56:28 -0700 |
| commit | 1d9fec7937f45dde5e04cac966a2d9a12f2fc15a (patch) | |
| tree | 3fbcd18a379a05fd6d43491a107e1f36bc61b185 /gcc-4.9/libffi | |
| parent | f378ebf14df0952eae870c9865bab8326aa8f137 (diff) | |
| download | toolchain_gcc-1d9fec7937f45dde5e04cac966a2d9a12f2fc15a.tar.gz toolchain_gcc-1d9fec7937f45dde5e04cac966a2d9a12f2fc15a.tar.bz2 toolchain_gcc-1d9fec7937f45dde5e04cac966a2d9a12f2fc15a.zip | |
Synchronize with google/gcc-4_9 to r224707 (from r214835)
Change-Id: I3d6f06fc613c8f8b6a82143dc44b7338483aac5d
Diffstat (limited to 'gcc-4.9/libffi')
| -rw-r--r-- | gcc-4.9/libffi/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc-4.9/libffi/src/powerpc/linux64.S | 5 | ||||
| -rw-r--r-- | gcc-4.9/libffi/src/powerpc/linux64_closure.S | 5 |
3 files changed, 16 insertions, 4 deletions
diff --git a/gcc-4.9/libffi/ChangeLog b/gcc-4.9/libffi/ChangeLog index 6b22f6930..4d336469e 100644 --- a/gcc-4.9/libffi/ChangeLog +++ b/gcc-4.9/libffi/ChangeLog @@ -1,3 +1,13 @@ +2014-10-30 Release Manager + + * GCC 4.9.2 released. + +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-16 Release Manager * GCC 4.9.1 released. diff --git a/gcc-4.9/libffi/src/powerpc/linux64.S b/gcc-4.9/libffi/src/powerpc/linux64.S index c4d01d8e3..d2acb7007 100644 --- a/gcc-4.9/libffi/src/powerpc/linux64.S +++ b/gcc-4.9/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/gcc-4.9/libffi/src/powerpc/linux64_closure.S b/gcc-4.9/libffi/src/powerpc/linux64_closure.S index 46a9ddfcd..1d80a3949 100644 --- a/gcc-4.9/libffi/src/powerpc/linux64_closure.S +++ b/gcc-4.9/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 |