diff options
author | Kai Tietz <kai.tietz@onevision.com> | 2010-05-11 18:42:04 +0000 |
---|---|---|
committer | Kai Tietz <ktietz@gcc.gnu.org> | 2010-05-11 20:42:04 +0200 |
commit | f6430ea53c7b591d4064ff583b9621aa999ad814 (patch) | |
tree | 3ae28ee3ece2740382f1a8b5bce9ae5812756e77 /gcc | |
parent | 3b5fda81f9c543ca8bccf438a74a0cb5b54f6a70 (diff) | |
download | gcc-f6430ea53c7b591d4064ff583b9621aa999ad814.zip gcc-f6430ea53c7b591d4064ff583b9621aa999ad814.tar.gz gcc-f6430ea53c7b591d4064ff583b9621aa999ad814.tar.bz2 |
lto-coff.c (IMAGE_FILE_MACHINE_ADM64): Rename to IMAGE_FILE_MACHINE_AMD64.
2010-05-11 Kai Tietz <kai.tietz@onevision.com>
* lto-coff.c (IMAGE_FILE_MACHINE_ADM64): Rename to
IMAGE_FILE_MACHINE_AMD64.
* lto-coff.c (IMAGE_FILE_MACHINE_ADM64): Likewise.
From-SVN: r159290
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/lto/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/lto/lto-coff.c | 2 | ||||
-rw-r--r-- | gcc/lto/lto-coff.h | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index c8d8f00..0cfd5be 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,9 @@ +2010-05-11 Kai Tietz <kai.tietz@onevision.com> + + * 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 <jh@suse.cz> * 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 6c15e66..1b87cbb 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 5792f3d..bdc9fa5 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 |