public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-6951] Fix LTO bootstrap on Windows
@ 2021-01-28 10:34 Eric Botcazou
  0 siblings, 0 replies; only message in thread
From: Eric Botcazou @ 2021-01-28 10:34 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:f7a6d314e7f7eeb6240a4f62511c189c90ef300c

commit r11-6951-gf7a6d314e7f7eeb6240a4f62511c189c90ef300c
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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-01-28 10:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-28 10:34 [gcc r11-6951] Fix LTO bootstrap on Windows Eric Botcazou

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).