From: ktietz Date: Tue, 11 May 2010 18:42:04 +0000 (+0000) Subject: 2010-05-11 Kai Tietz X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=942dc46586347bab783d278d60a211ffc617188f;p=thirdparty%2Fgcc.git 2010-05-11 Kai Tietz * lto-coff.c (IMAGE_FILE_MACHINE_ADM64): Rename to IMAGE_FILE_MACHINE_AMD64. * lto-coff.c (IMAGE_FILE_MACHINE_ADM64): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159290 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index c8d8f006a185..0cfd5be420bc 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,9 @@ +2010-05-11 Kai Tietz + + * lto-coff.c (IMAGE_FILE_MACHINE_ADM64): Rename to + IMAGE_FILE_MACHINE_AMD64. + * lto-coff.c (IMAGE_FILE_MACHINE_ADM64): Likewise. + 2010-05-11 Jan Hubicka * lto.c (lto_fixup_decls): Remove global var decls freeing here. diff --git a/gcc/lto/lto-coff.c b/gcc/lto/lto-coff.c index 6c15e66d41d5..1b87cbbe7641 100644 --- a/gcc/lto/lto-coff.c +++ b/gcc/lto/lto-coff.c @@ -379,7 +379,7 @@ validate_file (lto_coff_file *coff_file) return false; } - if (mach != IMAGE_FILE_MACHINE_ADM64 + if (mach != IMAGE_FILE_MACHINE_AMD64 && COFF_CHARACTERISTICS != (COFF_CHARACTERISTICS & charact)) { /* ECOFF/XCOFF support not implemented. */ diff --git a/gcc/lto/lto-coff.h b/gcc/lto/lto-coff.h index 5792f3dc5965..bdc9fa522220 100644 --- a/gcc/lto/lto-coff.h +++ b/gcc/lto/lto-coff.h @@ -79,13 +79,13 @@ along with GCC; see the file COPYING3. If not see /* COFF header machine codes. */ #define IMAGE_FILE_MACHINE_I386 (0x014c) -#define IMAGE_FILE_MACHINE_ADM64 (0x8664) +#define IMAGE_FILE_MACHINE_AMD64 (0x8664) /* Known header magics for validation, as an array initialiser. */ #define COFF_KNOWN_MACHINES \ { IMAGE_FILE_MACHINE_I386, \ - IMAGE_FILE_MACHINE_ADM64/*, ... add more here when working. */ } + IMAGE_FILE_MACHINE_AMD64/*, ... add more here when working. */ } /* COFF object file header, section and symbol flags and types. These are currently specific to PE-COFF, which is the only LTO-COFF format at the