From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ebotcazou@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1285)
 id 5F2653857C70; Thu, 28 Jan 2021 10:35:14 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F2653857C70
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Eric Botcazou <ebotcazou@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r10-9307] Fix LTO bootstrap on Windows
X-Act-Checkin: gcc
X-Git-Author: Eric Botcazou <ebotcazou@adacore.com>
X-Git-Refname: refs/heads/releases/gcc-10
X-Git-Oldrev: 653bf2a54d9c9b3aacfd8c2d98efff3ad7156c64
X-Git-Newrev: 4be929be0317b2baf1c67b430ad0a2fbaed05152
Message-Id: <20210128103514.5F2653857C70@sourceware.org>
Date: Thu, 28 Jan 2021 10:35:14 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2021 10:35:14 -0000

https://gcc.gnu.org/g:4be929be0317b2baf1c67b430ad0a2fbaed05152

commit r10-9307-g4be929be0317b2baf1c67b430ad0a2fbaed05152
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Thu Jan 28 11:31:35 2021 +0100

    Fix LTO bootstrap on Windows
    
    The latest fix introduced a comparison of executables and this cannot
    directly work on Windows because they are timestamped.  Moreover nobody
    sets $(exeext) at top level, at least on MinGW, so you get weird behavior
    because some tools add the implicit .exe suffix and others do not.
    
    contrib/
            PR lto/85574
            * compare-lto: Deal with PE-COFF executables specifically.

Diff:
---
 contrib/compare-lto | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/contrib/compare-lto b/contrib/compare-lto
index 17379e196a7..c0bb71c0765 100755
--- a/contrib/compare-lto
+++ b/contrib/compare-lto
@@ -32,7 +32,7 @@ case $1 in
 esac
 
 if test $# != 2; then
-  echo 'usage: compare-lto file1.o file2.o' >&2
+  echo 'usage: compare-lto file1 file2' >&2
   exit 1
 fi
 
@@ -101,6 +101,25 @@ else
     else
       status=1
     fi
+
+  # PE-COFF executables are timestamped so skip leading bytes for them.
+  else
+    case "$1" in
+      *.exe)
+        if cmp -i 256 "$1" "$2"; then
+          status=0
+        else
+          status=1
+        fi
+        ;;
+      *)
+        if test -f "$1.exe" && cmp -i 256 "$1.exe" "$2.exe"; then
+          status=0
+        else
+          status=1
+        fi
+        ;;
+    esac
   fi
 fi