From 5fd6b60d86ab6ab4bbd173524062b5d2aeac199a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 25 May 2023 19:43:37 +0200 Subject: [PATCH] Remove duplicate definition * coff/pe.h (IMAGE_FILE_MACHINE_AMD64): Remove duplicate definition. Alphabetize. --- include/ChangeLog | 5 +++++ include/coff/pe.h | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index b157251bea8..097242b5ca0 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2023-05-25 Andreas Schwab + + * coff/pe.h (IMAGE_FILE_MACHINE_AMD64): Remove duplicate + definition. Alphabetize. + 2023-03-23 Frederic Cambus * elf/common.h (PT_OPENBSD_MUTABLE): Define. diff --git a/include/coff/pe.h b/include/coff/pe.h index 27f56caa0f1..4af7b0c3b26 100644 --- a/include/coff/pe.h +++ b/include/coff/pe.h @@ -144,6 +144,7 @@ #define IMAGE_FILE_MACHINE_EBC 0x0ebc #define IMAGE_FILE_MACHINE_I386 0x014c #define IMAGE_FILE_MACHINE_IA64 0x0200 +#define IMAGE_FILE_MACHINE_LOONGARCH64 0x6264 #define IMAGE_FILE_MACHINE_M32R 0x9041 #define IMAGE_FILE_MACHINE_M68K 0x0268 #define IMAGE_FILE_MACHINE_MIPS16 0x0266 @@ -162,8 +163,6 @@ #define IMAGE_FILE_MACHINE_THUMB 0x01c2 #define IMAGE_FILE_MACHINE_TRICORE 0x0520 #define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169 -#define IMAGE_FILE_MACHINE_AMD64 0x8664 -#define IMAGE_FILE_MACHINE_LOONGARCH64 0x6264 #define IMAGE_SUBSYSTEM_UNKNOWN 0 #define IMAGE_SUBSYSTEM_NATIVE 1 -- 2.30.2