diff options
| author | aurel32 <aurel32@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-12-04 22:54:23 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-12-04 22:54:23 +0000 |
| commit | 6bbcede187a4fdb284a78a7ac2c48d93fe1fc897 (patch) | |
| tree | 1a15f55ade661c5df618e7f0a9a925423d44b296 | |
| parent | 360ae21f802d931d30c60d821be66f99a164f129 (diff) | |
| download | gcc-47-6bbcede187a4fdb284a78a7ac2c48d93fe1fc897.tar.gz | |
patches/note-gnu-stack.diff: restore and rebase lost parts.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@7053 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/note-gnu-stack.diff | 77 |
2 files changed, 71 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 1e40a6b..f45f725 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ gcc-4.7 (4.7.3-10) UNRELEASED; urgency=low + [ Matthias Klose ] * Configure --with-long-double-128 on powerpcspe. Closes: #731141. + [ Aurelien Jarno ] + * patches/note-gnu-stack.diff: restore and rebase lost parts. + -- Matthias Klose <doko@debian.org> Mon, 02 Dec 2013 14:11:44 +0100 gcc-4.7 (4.7.3-9) unstable; urgency=low diff --git a/debian/patches/note-gnu-stack.diff b/debian/patches/note-gnu-stack.diff index 6acf220..203ec52 100644 --- a/debian/patches/note-gnu-stack.diff +++ b/debian/patches/note-gnu-stack.diff @@ -50,18 +50,16 @@ libffi/ * src/arm/sysv.S: Likewise. --- + boehm-gc/ia64_save_regs_in_stack.S | 15 +++++++++++++++ boehm-gc/ia64_save_regs_in_stack.s | 12 ------------ - gcc/config/ia64/crtbegin.asm | 4 ++++ - gcc/config/ia64/crtend.asm | 4 ++++ - gcc/config/ia64/crti.asm | 4 ++++ - gcc/config/ia64/crtn.asm | 4 ++++ - gcc/config/ia64/lib1funcs.asm | 4 ++++ - gcc/config/ia64/linux.h | 2 ++ + gcc/config/ia64/linux.h | 3 +++ gcc/config/rs6000/ppc-asm.h | 2 +- - libffi/src/ia64/unix.S | 4 ++++ - libffi/src/powerpc/linux64.S | 4 ++++ - libffi/src/powerpc/linux64_closure.S | 4 ++++ - 11 files changed, 35 insertions(+), 13 deletions(-) + libgcc/config/ia64/crtbegin.S | 4 ++++ + libgcc/config/ia64/crtend.S | 4 ++++ + libgcc/config/ia64/crti.S | 4 ++++ + libgcc/config/ia64/crtn.S | 4 ++++ + libgcc/config/ia64/lib1funcs.S | 4 ++++ + 9 files changed, 39 insertions(+), 13 deletions(-) --- a/src/boehm-gc/ia64_save_regs_in_stack.s +++ /dev/null @@ -96,6 +94,65 @@ libffi/ +#ifdef __linux__ + .section .note.GNU-stack,"",@progbits +#endif +--- a/src/libgcc/config/ia64/crtbegin.S ++++ b/src/libgcc/config/ia64/crtbegin.S +@@ -252,3 +252,7 @@ + .weak __cxa_finalize + #endif + .weak _Jv_RegisterClasses ++ ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif +--- a/src/libgcc/config/ia64/crtend.S ++++ b/src/libgcc/config/ia64/crtend.S +@@ -119,3 +119,7 @@ + + br.ret.sptk.many rp + .endp __do_global_ctors_aux ++ ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif +--- a/src/libgcc/config/ia64/crti.S ++++ b/src/libgcc/config/ia64/crti.S +@@ -51,3 +51,7 @@ + .body + + # end of crti.S ++ ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif +--- a/src/libgcc/config/ia64/crtn.S ++++ b/src/libgcc/config/ia64/crtn.S +@@ -41,3 +41,7 @@ + br.ret.sptk.many b0 + + # end of crtn.S ++ ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif +--- a/src/libgcc/config/ia64/lib1funcs.S ++++ b/src/libgcc/config/ia64/lib1funcs.S +@@ -793,3 +793,7 @@ + .endp __floattitf + #endif + #endif ++ ++#ifdef __linux__ ++.section .note.GNU-stack; .previous ++#endif +--- a/src/gcc/config/ia64/linux.h ++++ b/src/gcc/config/ia64/linux.h +@@ -86,3 +86,6 @@ + + #undef TARGET_INIT_LIBFUNCS + #define TARGET_INIT_LIBFUNCS ia64_soft_fp_init_libfuncs ++ ++#undef TARGET_ASM_FILE_END ++#define TARGET_ASM_FILE_END file_end_indicate_exec_stack --- a/src/gcc/config/rs6000/ppc-asm.h +++ b/src/gcc/config/rs6000/ppc-asm.h @@ -352,7 +352,7 @@ |