2010-05-11 Kai Tietz <kai.tietz@onevision.com>

        * collect2.c (maybe_lto_object_file): Add x64-coff magic and check.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159272 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c56411..92220ec 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-11  Kai Tietz  <kai.tietz@onevision.com>
+
+       * collect2.c (maybe_lto_object_file): Add x64-coff magic and check.
+
 2010-05-11  Jan Hubicka  <jh@suse.cz>
 
        * lto-cgraph.c (output_cgraph): Remove loop adding all varpool nodes

diff --git a/gcc/collect2.c b/gcc/collect2.c
index 6582185..5322e10 100644 (file)
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -2574,6 +2574,7 @@ maybe_lto_object_file (const char *prog_name)
 
   static unsigned char elfmagic[4] = { 0x7f, 'E', 'L', 'F' };
   static unsigned char coffmagic[2] = { 0x4c, 0x01 };
+  static unsigned char coffmagic_x64[2] = { 0x64, 0x86 };
   static unsigned char machomagic[4][4] = {
     { 0xcf, 0xfa, 0xed, 0xfe },
     { 0xce, 0xfa, 0xed, 0xfe },
@@ -2589,7 +2590,8 @@ maybe_lto_object_file (const char *prog_name)
   fclose (f);
 
   if (memcmp (buf, elfmagic, sizeof (elfmagic)) == 0
-      || memcmp (buf, coffmagic, sizeof (coffmagic)) == 0)
+      || memcmp (buf, coffmagic, sizeof (coffmagic)) == 0
+      || memcmp (buf, coffmagic_x64, sizeof (coffmagic_x64)) == 0)
     return true;
   for (i = 0; i < 4; i++)
     if (memcmp (buf, machomagic[i], sizeof (machomagic[i])) == 0)