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
This commit is contained in:
Jakub Jelinek 2017-01-24 01:18:36 +01:00 committed by Jakub Jelinek
parent 158c139f30
commit 86b2a5583b
9 changed files with 28 additions and 0 deletions

View File

@ -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> 2017-01-21 Jakub Jelinek <jakub@redhat.com>
PR other/79046 PR other/79046

View File

@ -22,6 +22,7 @@ list_files() {
change_comment_headers() { change_comment_headers() {
for f in $(list_files $1); do 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) changed=$(awk 'NR != 2 && NR != 3' < $1/$f)
echo "$changed" > $1/$f echo "$changed" > $1/$f
done done

View File

@ -1,4 +1,6 @@
// This file is dual licensed under the MIT and the University of Illinois Open // 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: // Avoid being marked as needing an executable stack:
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits .section .note.GNU-stack,"",%progbits

View File

@ -1,4 +1,6 @@
// This file is dual licensed under the MIT and the University of Illinois Open // 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: // Avoid being marked as needing an executable stack:
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits .section .note.GNU-stack,"",%progbits

View File

@ -1,4 +1,6 @@
#ifndef TSAN_INTERCEPTORS_H #ifndef TSAN_INTERCEPTORS_H
#define TSAN_INTERCEPTORS_H
#include "sanitizer_common/sanitizer_stacktrace.h" #include "sanitizer_common/sanitizer_stacktrace.h"
#include "tsan_rtl.h" #include "tsan_rtl.h"

View File

@ -1,4 +1,6 @@
#define r0 0 #define r0 0
#define r1 1
#define r2 2
#define r3 3 #define r3 3
#define r4 4 #define r4 4
#define r5 5 #define r5 5

View File

@ -1,4 +1,6 @@
#include "sanitizer_common/sanitizer_asm.h" #include "sanitizer_common/sanitizer_asm.h"
.section .bss
.type __tsan_pointer_chk_guard, %object .type __tsan_pointer_chk_guard, %object
.size __tsan_pointer_chk_guard, 8 .size __tsan_pointer_chk_guard, 8
__tsan_pointer_chk_guard: __tsan_pointer_chk_guard:

View File

@ -1,4 +1,6 @@
.section .text .section .text
.set noreorder
.hidden __tsan_setjmp .hidden __tsan_setjmp
.comm _ZN14__interception11real_setjmpE,8,8 .comm _ZN14__interception11real_setjmpE,8,8
.globl setjmp .globl setjmp

View File

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