Re: [PATCH] Fix libsanitizer merge (PR sanitizer/79168)

[Jeff Law]

On 01/23/2017 03:28 PM, Jakub Jelinek wrote:

Hi!

The merge.sh script seems to remove lines 2 and 3 regardless of what they
contain.  If they contain the The LLVM Compiler Infrastructure
comment, we do want that, but a couple of files (mostly *.S) don't contain
that.

The following patch ought to fix that.
Bootstrapped/regtested on x86_64-linux, i686-linux and s390x-linux, 
bootstrap/regtest
pending on powerpc64{,le}-linux and aarch64-linux, ok for trunk if that
succeeds?

2017-01-23  Jakub Jelinek  <ja...@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.

OK.
jeff