include: de-duplicate i386.h and x86_64.h

Move common definitions to a new x86.h, thus allowing gas'es obj-coff.h
to include just that, getting rid of a TE_PEP compile-time dependency.

4 files changed, 62 insertions, 73 deletions

diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index 7bde584..277d025 100644
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -49,12 +49,7 @@
 #endif
 
 #ifdef TC_I386
-#ifdef TE_PEP
-#include "coff/x86_64.h"
-#else
-#include "coff/i386.h"
-#endif
-
+#include "coff/x86.h"
 #ifndef TARGET_FORMAT
 #ifdef TE_PEP
 #define TARGET_FORMAT "coff-x86-64"
diff --git a/include/coff/i386.h b/include/coff/i386.h
index 982c152..a576d2a 100644
--- a/include/coff/i386.h
+++ b/include/coff/i386.h
@@ -17,11 +17,7 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#define L_LNNO_SIZE 2
-#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
-#include "coff/external.h"
-
-#define COFF_PAGE_SIZE	0x1000
+#include "coff/x86.h"
 
 /* Bits for f_flags:
  	F_RELFLG	Relocation info stripped from file
@@ -43,15 +39,6 @@
 
 #define LYNXCOFFMAGIC	0415
 
-/* .NET DLLs XOR the Machine number (above) with an override to
-    indicate that the DLL contains OS-specific machine code rather
-    than just IL or bytecode. See
-    https://github.com/dotnet/coreclr/blob/6f7aa7967c607b8c667518314ab937c0d7547025/src/inc/pedecoder.h#L94-L107. */
-#define IMAGE_FILE_MACHINE_NATIVE_APPLE_OVERRIDE   0x4644
-#define IMAGE_FILE_MACHINE_NATIVE_FREEBSD_OVERRIDE 0xadc4
-#define IMAGE_FILE_MACHINE_NATIVE_LINUX_OVERRIDE   0x7b79
-#define IMAGE_FILE_MACHINE_NATIVE_NETBSD_OVERRIDE  0x1993
-
 /* Used in some .NET DLLs that target a specific OS.  */
 #define I386_APPLE_MAGIC   (I386MAGIC ^ IMAGE_FILE_MACHINE_NATIVE_APPLE_OVERRIDE)
 #define I386_FREEBSD_MAGIC (I386MAGIC ^ IMAGE_FILE_MACHINE_NATIVE_FREEBSD_OVERRIDE)
@@ -72,25 +59,6 @@
 #define STMAGIC		0401	/* Target shlib.  */
 #define SHMAGIC		0443	/* Host shlib.  */
 
-/* Define some NT default values.  */
-/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
-#define NT_SECTION_ALIGNMENT 0x1000
-#define NT_FILE_ALIGNMENT    0x200
-#define NT_DEF_RESERVE       0x100000
-#define NT_DEF_COMMIT        0x1000
-
-/* Relocation directives.  */
-
-struct external_reloc
-{
-  char r_vaddr[4];
-  char r_symndx[4];
-  char r_type[2];
-};
-
-#define RELOC struct external_reloc
-#define RELSZ 10
-
 /* i386 Relocations.  */
 
 #define R_DIR32		 6
diff --git a/include/coff/x86.h b/include/coff/x86.h
new file mode 100644
index 0000000..b62b176
--- /dev/null
+++ b/include/coff/x86.h
@@ -0,0 +1,59 @@
+/* COFF information shared by Intel 386/486 and AMD 64 (aka x86-64).
+   Copyright (C) 2001-2024 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef COFF_X86_H
+#define COFF_X86_H
+
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+
+#include "coff/external.h"
+
+#define COFF_PAGE_SIZE	0x1000
+
+/* .NET DLLs XOR the Machine number (above) with an override to
+    indicate that the DLL contains OS-specific machine code rather
+    than just IL or bytecode. See
+    https://github.com/dotnet/coreclr/blob/6f7aa7967c607b8c667518314ab937c0d7547025/src/inc/pedecoder.h#L94-L107. */
+#define IMAGE_FILE_MACHINE_NATIVE_APPLE_OVERRIDE   0x4644
+#define IMAGE_FILE_MACHINE_NATIVE_FREEBSD_OVERRIDE 0xadc4
+#define IMAGE_FILE_MACHINE_NATIVE_LINUX_OVERRIDE   0x7b79
+#define IMAGE_FILE_MACHINE_NATIVE_NETBSD_OVERRIDE  0x1993
+
+/* Define some NT default values.  */
+/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h.  */
+#define NT_SECTION_ALIGNMENT 0x1000
+#define NT_FILE_ALIGNMENT    0x200
+#define NT_DEF_RESERVE       0x100000
+#define NT_DEF_COMMIT        0x1000
+
+/* Relocation directives.  */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 10
+
+#endif /* COFF_X86_H */
diff --git a/include/coff/x86_64.h b/include/coff/x86_64.h
index 72f3417..76b914f 100644
--- a/include/coff/x86_64.h
+++ b/include/coff/x86_64.h
@@ -23,24 +23,10 @@
 #ifndef COFF_X86_64_H
 #define COFF_X86_64_H
 
-#define L_LNNO_SIZE 2
-#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
-
-#include "coff/external.h"
-
-#define COFF_PAGE_SIZE	0x1000
+#include "coff/x86.h"
 
 #define AMD64MAGIC	0x8664
 
-/* .NET DLLs XOR the Machine number (above) with an override to
-    indicate that the DLL contains OS-specific machine code rather
-    than just IL or bytecode. See
-    https://github.com/dotnet/coreclr/blob/6f7aa7967c607b8c667518314ab937c0d7547025/src/inc/pedecoder.h#L94-L107. */
-#define IMAGE_FILE_MACHINE_NATIVE_APPLE_OVERRIDE   0x4644
-#define IMAGE_FILE_MACHINE_NATIVE_FREEBSD_OVERRIDE 0xadc4
-#define IMAGE_FILE_MACHINE_NATIVE_LINUX_OVERRIDE   0x7b79
-#define IMAGE_FILE_MACHINE_NATIVE_NETBSD_OVERRIDE  0x1993
-
 /* Used in some .NET DLLs that target a specific OS.  */
 #define AMD64_APPLE_MAGIC   (AMD64MAGIC ^ IMAGE_FILE_MACHINE_NATIVE_APPLE_OVERRIDE)
 #define AMD64_FREEBSD_MAGIC (AMD64MAGIC ^ IMAGE_FILE_MACHINE_NATIVE_FREEBSD_OVERRIDE)
@@ -60,25 +46,6 @@
 #define STMAGIC		0401	/* Target shlib.  */
 #define SHMAGIC		0443	/* Host   shlib.  */
 
-/* Define some NT default values.  */
-/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h.  */
-#define NT_SECTION_ALIGNMENT 0x1000
-#define NT_FILE_ALIGNMENT    0x200
-#define NT_DEF_RESERVE       0x100000
-#define NT_DEF_COMMIT        0x1000
-
-/* Relocation directives.  */
-
-struct external_reloc
-{
-  char r_vaddr[4];
-  char r_symndx[4];
-  char r_type[2];
-};
-
-#define RELOC struct external_reloc
-#define RELSZ 10
-
 /* X86-64 relocations.  */
 #define R_AMD64_ABS 		 0 /* Reference is absolute, no relocation is necessary.  */
 #define R_AMD64_DIR64		 1 /* 64-bit address (VA).  */