Fixed aarch64 build.

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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244844 138bc75d-0d04-0410-961f-82ee72b054a4

Change-Id: I384d6d121d2e0fcd2947400c14082f7b83e8cb20
Signed-off-by: Michail Kashkarov <m.kashkarov@partner.samsung.com>

diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh
index b332102..2e5ec25 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 0b76f3a..8729642 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 6b89211..8ff9095 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 97fa508..a0f9a07 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 15bd10a..5b43f3d 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 ab5a830..ef06f04 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 b1c9d8b..d0f7a3f 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 81d309f..8285e21 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