Module Name:    src
Committed By:   christos
Date:           Sat Nov  7 16:54:00 UTC 2015

Modified Files:
        src/external/gpl3/gcc.old/dist/libgcc/config/alpha: qrnnd.S
        src/external/gpl3/gcc.old/dist/libgcc/config/i386: morestack.S
        src/external/gpl3/gcc.old/dist/libitm/config/alpha: sjlj.S
        src/external/gpl3/gcc.old/dist/libitm/config/arm: sjlj.S
        src/external/gpl3/gcc.old/dist/libitm/config/powerpc: sjlj.S
        src/external/gpl3/gcc.old/dist/libitm/config/s390: sjlj.S
        src/external/gpl3/gcc.old/dist/libitm/config/sh: sjlj.S
        src/external/gpl3/gcc.old/dist/libitm/config/sparc: sjlj.S
        src/external/gpl3/gcc.old/dist/libitm/config/x86: sjlj.S
        src/external/gpl3/gcc.old/dist/libsanitizer/tsan: tsan_rtl_amd64.S

Log Message:
Apply the GNU-stack fixes to the old branch.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libgcc/config/alpha/qrnnd.S
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libgcc/config/i386/morestack.S
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libitm/config/alpha/sjlj.S
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libitm/config/arm/sjlj.S
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libitm/config/powerpc/sjlj.S
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libitm/config/s390/sjlj.S
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libitm/config/sh/sjlj.S
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libitm/config/sparc/sjlj.S
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libitm/config/x86/sjlj.S
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc.old/dist/libsanitizer/tsan/tsan_rtl_amd64.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc.old/dist/libgcc/config/alpha/qrnnd.S
diff -u src/external/gpl3/gcc.old/dist/libgcc/config/alpha/qrnnd.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libgcc/config/alpha/qrnnd.S:1.2
--- src/external/gpl3/gcc.old/dist/libgcc/config/alpha/qrnnd.S:1.1.1.1	Tue Sep 22 23:03:05 2015
+++ src/external/gpl3/gcc.old/dist/libgcc/config/alpha/qrnnd.S	Sat Nov  7 11:53:59 2015
@@ -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

Index: src/external/gpl3/gcc.old/dist/libgcc/config/i386/morestack.S
diff -u src/external/gpl3/gcc.old/dist/libgcc/config/i386/morestack.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libgcc/config/i386/morestack.S:1.2
--- src/external/gpl3/gcc.old/dist/libgcc/config/i386/morestack.S:1.1.1.1	Tue Sep 22 23:03:05 2015
+++ src/external/gpl3/gcc.old/dist/libgcc/config/i386/morestack.S	Sat Nov  7 11:53:59 2015
@@ -853,7 +853,7 @@ __morestack_make_guard:
 	.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

Index: src/external/gpl3/gcc.old/dist/libitm/config/alpha/sjlj.S
diff -u src/external/gpl3/gcc.old/dist/libitm/config/alpha/sjlj.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libitm/config/alpha/sjlj.S:1.2
--- src/external/gpl3/gcc.old/dist/libitm/config/alpha/sjlj.S:1.1.1.1	Tue Sep 22 23:03:04 2015
+++ src/external/gpl3/gcc.old/dist/libitm/config/alpha/sjlj.S	Sat Nov  7 11:53:59 2015
@@ -107,6 +107,6 @@ GTM_longjmp:
 	ret
 .end GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", @progbits
 #endif

Index: src/external/gpl3/gcc.old/dist/libitm/config/arm/sjlj.S
diff -u src/external/gpl3/gcc.old/dist/libitm/config/arm/sjlj.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libitm/config/arm/sjlj.S:1.2
--- src/external/gpl3/gcc.old/dist/libitm/config/arm/sjlj.S:1.1.1.1	Tue Sep 22 23:03:04 2015
+++ src/external/gpl3/gcc.old/dist/libitm/config/arm/sjlj.S	Sat Nov  7 11:53:59 2015
@@ -159,6 +159,6 @@ GTM_longjmp:
 	cfi_endproc
 	.size	GTM_longjmp, . - GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/external/gpl3/gcc.old/dist/libitm/config/powerpc/sjlj.S
diff -u src/external/gpl3/gcc.old/dist/libitm/config/powerpc/sjlj.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libitm/config/powerpc/sjlj.S:1.2
--- src/external/gpl3/gcc.old/dist/libitm/config/powerpc/sjlj.S:1.1.1.1	Tue Sep 22 23:03:04 2015
+++ src/external/gpl3/gcc.old/dist/libitm/config/powerpc/sjlj.S	Sat Nov  7 11:53:59 2015
@@ -428,6 +428,6 @@ FUNC GTM_longjmp
 	cfi_endproc
 END GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", @progbits
 #endif

Index: src/external/gpl3/gcc.old/dist/libitm/config/s390/sjlj.S
diff -u src/external/gpl3/gcc.old/dist/libitm/config/s390/sjlj.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libitm/config/s390/sjlj.S:1.2
--- src/external/gpl3/gcc.old/dist/libitm/config/s390/sjlj.S:1.1.1.1	Tue Sep 22 23:03:04 2015
+++ src/external/gpl3/gcc.old/dist/libitm/config/s390/sjlj.S	Sat Nov  7 11:53:59 2015
@@ -105,4 +105,6 @@ GTM_longjmp:
 
 	.size GTM_longjmp, .-GTM_longjmp
 
+#if defined(__ELF__) && defined(__linux__)
 	.section .note.GNU-stack, "", @progbits
+#endif

Index: src/external/gpl3/gcc.old/dist/libitm/config/sh/sjlj.S
diff -u src/external/gpl3/gcc.old/dist/libitm/config/sh/sjlj.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libitm/config/sh/sjlj.S:1.2
--- src/external/gpl3/gcc.old/dist/libitm/config/sh/sjlj.S:1.1.1.1	Tue Sep 22 23:03:04 2015
+++ src/external/gpl3/gcc.old/dist/libitm/config/sh/sjlj.S	Sat Nov  7 11:53:59 2015
@@ -117,6 +117,6 @@ GTM_longjmp:
 
 	.size	GTM_longjmp, . - GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/external/gpl3/gcc.old/dist/libitm/config/sparc/sjlj.S
diff -u src/external/gpl3/gcc.old/dist/libitm/config/sparc/sjlj.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libitm/config/sparc/sjlj.S:1.2
--- src/external/gpl3/gcc.old/dist/libitm/config/sparc/sjlj.S:1.1.1.1	Tue Sep 22 23:03:04 2015
+++ src/external/gpl3/gcc.old/dist/libitm/config/sparc/sjlj.S	Sat Nov  7 11:53:59 2015
@@ -92,6 +92,6 @@ GTM_longjmp:
 	cfi_endproc
 	.size GTM_longjmp, . - GTM_longjmp
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 	.section .note.GNU-stack, "", @progbits
 #endif

Index: src/external/gpl3/gcc.old/dist/libitm/config/x86/sjlj.S
diff -u src/external/gpl3/gcc.old/dist/libitm/config/x86/sjlj.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libitm/config/x86/sjlj.S:1.2
--- src/external/gpl3/gcc.old/dist/libitm/config/x86/sjlj.S:1.1.1.1	Tue Sep 22 23:03:04 2015
+++ src/external/gpl3/gcc.old/dist/libitm/config/x86/sjlj.S	Sat Nov  7 11:54:00 2015
@@ -142,6 +142,6 @@ SYM(GTM_longjmp):
 	HIDDEN(GTM_longjmp)
 	SIZE(GTM_longjmp)
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 .section .note.GNU-stack, "", @progbits
 #endif

Index: src/external/gpl3/gcc.old/dist/libsanitizer/tsan/tsan_rtl_amd64.S
diff -u src/external/gpl3/gcc.old/dist/libsanitizer/tsan/tsan_rtl_amd64.S:1.1.1.1 src/external/gpl3/gcc.old/dist/libsanitizer/tsan/tsan_rtl_amd64.S:1.2
--- src/external/gpl3/gcc.old/dist/libsanitizer/tsan/tsan_rtl_amd64.S:1.1.1.1	Tue Sep 22 23:03:38 2015
+++ src/external/gpl3/gcc.old/dist/libsanitizer/tsan/tsan_rtl_amd64.S	Sat Nov  7 11:54:00 2015
@@ -166,7 +166,7 @@ __tsan_report_race_thunk:
   ret
   .cfi_endproc
 
-#ifdef __linux__
+#if defined(__ELF__) && defined(__linux__)
 /* We do not need executable stack.  */
 .section        .note.GNU-stack,"",@progbits
 #endif

Reply via email to