[src/trunk]: src/external/gpl3/gcc/dist Fix inconsistencies with GNU-stack note:

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2635f9e972a7
branches:  trunk
changeset: 341464:2635f9e972a7
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Nov 07 16:53:07 2015 +0000

description:
Fix inconsistencies with GNU-stack note:
- always use __ELF__ && __linux, not just __ELF__ or just __linux__
- remember to pop back to the previous section where it is missing
XXX: need to file this bug with the GNU folks.

diffstat:

 external/gpl3/gcc/dist/libgcc/config/alpha/qrnnd.S        |  3 ++-
 external/gpl3/gcc/dist/libgcc/config/i386/morestack.S     |  2 +-
 external/gpl3/gcc/dist/libitm/config/alpha/sjlj.S         |  2 +-
 external/gpl3/gcc/dist/libitm/config/arm/sjlj.S           |  2 +-
 external/gpl3/gcc/dist/libitm/config/powerpc/sjlj.S       |  2 +-
 external/gpl3/gcc/dist/libitm/config/s390/sjlj.S          |  2 ++
 external/gpl3/gcc/dist/libitm/config/sh/sjlj.S            |  2 +-
 external/gpl3/gcc/dist/libitm/config/sparc/sjlj.S         |  2 +-
 external/gpl3/gcc/dist/libitm/config/x86/sjlj.S           |  2 +-
 external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S |  2 +-
 10 files changed, 12 insertions(+), 9 deletions(-)

diffs (114 lines):

diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libgcc/config/alpha/qrnnd.S
--- a/external/gpl3/gcc/dist/libgcc/config/alpha/qrnnd.S        Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libgcc/config/alpha/qrnnd.S        Sat Nov 07 16:53:07 2015 +0000
@@ -22,8 +22,9 @@
  # see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  # <http://www.gnu.org/licenses/>.
 
-#ifdef __ELF__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack,""
+.previous
 #endif
 
         .set noreorder
diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libgcc/config/i386/morestack.S
--- a/external/gpl3/gcc/dist/libgcc/config/i386/morestack.S     Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libgcc/config/i386/morestack.S     Sat Nov 07 16:53:07 2015 +0000
@@ -853,7 +853,7 @@
        .quad   __morestack_load_mmap
 #endif
 
-#ifdef __ELF__
+#if defined(__ELF__) && defined(__linux__)
        .section        .note.GNU-stack,"",@progbits
        .section        .note.GNU-split-stack,"",@progbits
        .section        .note.GNU-no-split-stack,"",@progbits
diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libitm/config/alpha/sjlj.S
--- a/external/gpl3/gcc/dist/libitm/config/alpha/sjlj.S Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libitm/config/alpha/sjlj.S Sat Nov 07 16:53:07 2015 +0000
@@ -107,6 +107,6 @@
        ret
 .end GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", @progbits
 #endif
diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libitm/config/arm/sjlj.S
--- a/external/gpl3/gcc/dist/libitm/config/arm/sjlj.S   Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libitm/config/arm/sjlj.S   Sat Nov 07 16:53:07 2015 +0000
@@ -159,6 +159,6 @@
        cfi_endproc
        .size   GTM_longjmp, . - GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", %progbits
 #endif
diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libitm/config/powerpc/sjlj.S
--- a/external/gpl3/gcc/dist/libitm/config/powerpc/sjlj.S       Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libitm/config/powerpc/sjlj.S       Sat Nov 07 16:53:07 2015 +0000
@@ -428,6 +428,6 @@
        cfi_endproc
 END GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", @progbits
 #endif
diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libitm/config/s390/sjlj.S
--- a/external/gpl3/gcc/dist/libitm/config/s390/sjlj.S  Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libitm/config/s390/sjlj.S  Sat Nov 07 16:53:07 2015 +0000
@@ -105,4 +105,6 @@
 
        .size GTM_longjmp, .-GTM_longjmp
 
+#if defined(__ELF__) && defined(__linux__)
        .section .note.GNU-stack, "", @progbits
+#endif
diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libitm/config/sh/sjlj.S
--- a/external/gpl3/gcc/dist/libitm/config/sh/sjlj.S    Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libitm/config/sh/sjlj.S    Sat Nov 07 16:53:07 2015 +0000
@@ -117,6 +117,6 @@
 
        .size   GTM_longjmp, . - GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", %progbits
 #endif
diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libitm/config/sparc/sjlj.S
--- a/external/gpl3/gcc/dist/libitm/config/sparc/sjlj.S Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libitm/config/sparc/sjlj.S Sat Nov 07 16:53:07 2015 +0000
@@ -92,6 +92,6 @@
        cfi_endproc
        .size GTM_longjmp, . - GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
        .section .note.GNU-stack, "", @progbits
 #endif
diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libitm/config/x86/sjlj.S
--- a/external/gpl3/gcc/dist/libitm/config/x86/sjlj.S   Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libitm/config/x86/sjlj.S   Sat Nov 07 16:53:07 2015 +0000
@@ -142,6 +142,6 @@
        HIDDEN(GTM_longjmp)
        SIZE(GTM_longjmp)
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", @progbits
 #endif
diff -r 4549292d0a1b -r 2635f9e972a7 external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S
--- a/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S Sat Nov 07 16:21:42 2015 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S Sat Nov 07 16:53:07 2015 +0000
@@ -166,7 +166,7 @@
   ret
   .cfi_endproc
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 /* We do not need executable stack.  */
 .section        .note.GNU-stack,"",@progbits
 #endif