projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 158c139)
re PR sanitizer/79168 (libtsan fails to link when cross compiling GCC tip for Aarch64...
authorJakub Jelinek <jakub@redhat.com>
Tue, 24 Jan 2017 00:18:36 +0000 (01:18 +0100)
committerJakub Jelinek <jakub@gcc.gnu.org>
Tue, 24 Jan 2017 00:18:36 +0000 (01:18 +0100)
PR sanitizer/79168
* merge.sh (change_comment_headers): Don't remove 2nd and 3rd line
if the 3rd line doesn't contain 'The LLVM Compiler Infrastructure'
text.
* sanitizer_common/sanitizer_linux_mips64.S: Regenerated.
* sanitizer_common/sanitizer_linux_x86_64.S: Likewise.
* tsan/tsan_ppc_regs.h: Likewise.
* tsan/tsan_rtl_aarch64.S: Likewise.
* tsan/tsan_rtl_mips64.S: Likewise.
* tsan/tsan_rtl_ppc64.S: Likewise.

From-SVN: r244844

libsanitizer/ChangeLog patch | blob | history
libsanitizer/merge.sh patch | blob | history
libsanitizer/sanitizer_common/sanitizer_linux_mips64.S patch | blob | history
libsanitizer/sanitizer_common/sanitizer_linux_x86_64.S patch | blob | history
libsanitizer/tsan/tsan_interceptors.h patch | blob | history
libsanitizer/tsan/tsan_ppc_regs.h patch | blob | history
libsanitizer/tsan/tsan_rtl_aarch64.S patch | blob | history
libsanitizer/tsan/tsan_rtl_mips64.S patch | blob | history
libsanitizer/tsan/tsan_rtl_ppc64.S patch | blob | history

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index bdc4fb106a2f0061f8805e14f3d1aaab249e53ba..70a66cddf6f92578b3ee87ef8164c825a641f3f7 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,16 @@
+2017-01-24  Jakub Jelinek  <jakub@redhat.com>
+
+       PR sanitizer/79168
+       * merge.sh (change_comment_headers): Don't remove 2nd and 3rd line
+       if the 3rd line doesn't contain 'The LLVM Compiler Infrastructure'
+       text.
+       * sanitizer_common/sanitizer_linux_mips64.S: Regenerated.
+       * sanitizer_common/sanitizer_linux_x86_64.S: Likewise.
+       * tsan/tsan_ppc_regs.h: Likewise.
+       * tsan/tsan_rtl_aarch64.S: Likewise.
+       * tsan/tsan_rtl_mips64.S: Likewise.
+       * tsan/tsan_rtl_ppc64.S: Likewise.
+
 2017-01-21  Jakub Jelinek  <jakub@redhat.com>
 
        PR other/79046
diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh
index b332102773344efb15061880bc844d4a5301475c..2e5ec2527b80cea138af16a331c0c2dd13cf71aa 100755 (executable)
--- a/libsanitizer/merge.sh
+++ b/libsanitizer/merge.sh
@@ -22,6 +22,7 @@ list_files() {
 
 change_comment_headers() {
   for f in $(list_files $1); do
+    sed -n 3p $1/$f | grep -q 'The LLVM Compiler Infrastructure' || continue
     changed=$(awk 'NR != 2 && NR != 3' < $1/$f)
     echo "$changed" > $1/$f
   done
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_mips64.S b/libsanitizer/sanitizer_common/sanitizer_linux_mips64.S
index 0b76f3a473a234a0ad79abacb6e415a22d1cf80c..8729642aa654985b50c2fc0a42750247d57c6231 100644 (file)
--- a/libsanitizer/sanitizer_common/sanitizer_linux_mips64.S
+++ b/libsanitizer/sanitizer_common/sanitizer_linux_mips64.S
@@ -1,4 +1,6 @@
 // This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+
 // Avoid being marked as needing an executable stack:
 #if defined(__linux__) && defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_x86_64.S b/libsanitizer/sanitizer_common/sanitizer_linux_x86_64.S
index 6b892116ff4c33dc7654a8932e58d8434b6adc2c..8ff909542b681cb79bd40d2e3b08c75e8f8e1a2f 100644 (file)
--- a/libsanitizer/sanitizer_common/sanitizer_linux_x86_64.S
+++ b/libsanitizer/sanitizer_common/sanitizer_linux_x86_64.S
@@ -1,4 +1,6 @@
 // This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+
 // Avoid being marked as needing an executable stack:
 #if defined(__linux__) && defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
diff --git a/libsanitizer/tsan/tsan_interceptors.h b/libsanitizer/tsan/tsan_interceptors.h
index 97fa5085a789d75aafc2d23d9d4681d266069826..a0f9a0753a63af9246a46ddc0b9dc9d08602f153 100644 (file)
--- a/libsanitizer/tsan/tsan_interceptors.h
+++ b/libsanitizer/tsan/tsan_interceptors.h
@@ -1,4 +1,6 @@
 #ifndef TSAN_INTERCEPTORS_H
+#define TSAN_INTERCEPTORS_H
+
 #include "sanitizer_common/sanitizer_stacktrace.h"
 #include "tsan_rtl.h"
 
diff --git a/libsanitizer/tsan/tsan_ppc_regs.h b/libsanitizer/tsan/tsan_ppc_regs.h
index 15bd10ad96bc358fa69618f8ec5e5a45a9230f1b..5b43f3ddada3f81c96f369947a39df015fd45118 100644 (file)
--- a/libsanitizer/tsan/tsan_ppc_regs.h
+++ b/libsanitizer/tsan/tsan_ppc_regs.h
@@ -1,4 +1,6 @@
 #define r0 0
+#define r1 1
+#define r2 2
 #define r3 3
 #define r4 4
 #define r5 5
diff --git a/libsanitizer/tsan/tsan_rtl_aarch64.S b/libsanitizer/tsan/tsan_rtl_aarch64.S
index ab5a830d60c06038c9b2ba6829e1a1a8984194d3..ef06f0444ae4ac2339963a252361d4bf2113330a 100644 (file)
--- a/libsanitizer/tsan/tsan_rtl_aarch64.S
+++ b/libsanitizer/tsan/tsan_rtl_aarch64.S
@@ -1,4 +1,6 @@
 #include "sanitizer_common/sanitizer_asm.h"
+
+.section .bss
 .type  __tsan_pointer_chk_guard, %object
 .size  __tsan_pointer_chk_guard, 8
 __tsan_pointer_chk_guard:
diff --git a/libsanitizer/tsan/tsan_rtl_mips64.S b/libsanitizer/tsan/tsan_rtl_mips64.S
index b1c9d8bb12d893fc4453485d5e8ef28df36b0f90..d0f7a3f9af9890799d061ffb41176227ebd44c6f 100644 (file)
--- a/libsanitizer/tsan/tsan_rtl_mips64.S
+++ b/libsanitizer/tsan/tsan_rtl_mips64.S
@@ -1,4 +1,6 @@
 .section .text
+.set noreorder
+
 .hidden __tsan_setjmp
 .comm _ZN14__interception11real_setjmpE,8,8
 .globl setjmp
diff --git a/libsanitizer/tsan/tsan_rtl_ppc64.S b/libsanitizer/tsan/tsan_rtl_ppc64.S
index 81d309fbd2ff7571d818b7ba2cd056751d055bb3..8285e21aa1ec7a797dfcf4840ee5a7851106b497 100644 (file)
--- a/libsanitizer/tsan/tsan_rtl_ppc64.S
+++ b/libsanitizer/tsan/tsan_rtl_ppc64.S
@@ -1,4 +1,6 @@
 #include "tsan_ppc_regs.h"
+
+        .section .text
         .hidden __tsan_setjmp
         .globl _setjmp
         .type _setjmp, @function