re PR sanitizer/79168 (libtsan fails to link when cross compiling GCC tip for Aarch64 target)

	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

+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

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

libsanitizer/sanitizer_common/sanitizer_linux_mips64.S

 // 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

libsanitizer/sanitizer_common/sanitizer_linux_x86_64.S

 // 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

libsanitizer/tsan/tsan_interceptors.h

 #ifndef TSAN_INTERCEPTORS_H
+#define TSAN_INTERCEPTORS_H
+
 #include "sanitizer_common/sanitizer_stacktrace.h"
 #include "tsan_rtl.h"
 

libsanitizer/tsan/tsan_ppc_regs.h

 #define r0 0
+#define r1 1
+#define r2 2
 #define r3 3
 #define r4 4
 #define r5 5

libsanitizer/tsan/tsan_rtl_aarch64.S

 #include "sanitizer_common/sanitizer_asm.h"
+
+.section .bss
 .type	__tsan_pointer_chk_guard, %object
 .size	__tsan_pointer_chk_guard, 8
 __tsan_pointer_chk_guard:

libsanitizer/tsan/tsan_rtl_mips64.S

 .section .text
+.set noreorder
+
 .hidden __tsan_setjmp
 .comm _ZN14__interception11real_setjmpE,8,8
 .globl setjmp

libsanitizer/tsan/tsan_rtl_ppc64.S

 #include "tsan_ppc_regs.h"
+
+        .section .text
         .hidden __tsan_setjmp
         .globl _setjmp
         .type _setjmp, @function