https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79168
--- Comment #3 from Jakub Jelinek <jakub at gcc dot gnu.org> --- Author: jakub Date: Tue Jan 24 00:18:36 2017 New Revision: 244844 URL: https://gcc.gnu.org/viewcvs?rev=244844&root=gcc&view=rev Log: 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. Modified: trunk/libsanitizer/ChangeLog trunk/libsanitizer/merge.sh trunk/libsanitizer/sanitizer_common/sanitizer_linux_mips64.S trunk/libsanitizer/sanitizer_common/sanitizer_linux_x86_64.S trunk/libsanitizer/tsan/tsan_interceptors.h trunk/libsanitizer/tsan/tsan_ppc_regs.h trunk/libsanitizer/tsan/tsan_rtl_aarch64.S trunk/libsanitizer/tsan/tsan_rtl_mips64.S trunk/libsanitizer/tsan/tsan_rtl_ppc64.S