diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-01-24 01:18:36 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-01-24 01:18:36 +0100 |
| commit | 86b2a5583b9494d2e80803fd6e325e123516d9f0 (patch) | |
| tree | 24f0c6a6a6a9f8245d39b259240c6a3e769a5e56 /libsanitizer/sanitizer_common | |
| parent | 158c139f304ee57d47eaf801556c1aa47cbcd94c (diff) | |
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
Diffstat (limited to 'libsanitizer/sanitizer_common')
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_linux_mips64.S | 2 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_linux_x86_64.S | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_mips64.S b/libsanitizer/sanitizer_common/sanitizer_linux_mips64.S index 0b76f3a473a..8729642aa65 100644 --- 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 6b892116ff4..8ff909542b6 100644 --- 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 |