[binutils-gdb] gas: re-use config/te-*.h

Jan Beulich jbeulich@sourceware.org
Fri Sep 4 09:48:45 GMT 2026


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=75b73bd35c5a7fa211e4ed0858a6701634a6c84b

commit 75b73bd35c5a7fa211e4ed0858a6701634a6c84b
Author: Jan Beulich <jbeulich@suse.com>
Date:   Fri Sep 4 11:44:16 2026 +0200

    gas: re-use config/te-*.h
    
    ... instead of spelling out all the same things repeatedly.

Diff:
---
 gas/config/te-armeabi.h     |  5 +----
 gas/config/te-dragonfly.h   |  5 +----
 gas/config/te-freebsd.h     |  5 +----
 gas/config/te-go32.h        |  6 +-----
 gas/config/te-haiku.h       |  5 +----
 gas/config/te-hppa64.h      |  5 +----
 gas/config/te-hppalinux64.h |  4 +---
 gas/config/te-macos.h       |  8 +-------
 gas/config/te-pep.h         |  8 +-------
 gas/config/te-pepaarch64.h  |  8 +-------
 gas/config/te-solaris.h     |  5 +----
 gas/config/te-tmips.h       | 15 ++-------------
 gas/config/te-vxworks.h     |  9 +--------
 13 files changed, 14 insertions(+), 74 deletions(-)

diff --git a/gas/config/te-armeabi.h b/gas/config/te-armeabi.h
index 2fd59c11fc8..d253ebf2118 100644
--- a/gas/config/te-armeabi.h
+++ b/gas/config/te-armeabi.h
@@ -21,7 +21,4 @@
 #define FPU_DEFAULT FPU_ARCH_SOFTVFP
 #define EABI_DEFAULT EF_ARM_EABI_VER5
 
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-#include "obj-format.h"
+#include "te-generic.h"
diff --git a/gas/config/te-dragonfly.h b/gas/config/te-dragonfly.h
index 502fc2de934..3de6ca6ac8b 100644
--- a/gas/config/te-dragonfly.h
+++ b/gas/config/te-dragonfly.h
@@ -24,7 +24,4 @@
    DragonFlyBSD kernel uses "/" to mean division.  (What a concept!)  */
 #define TE_DragonFly 1
 
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-#include "obj-format.h"
+#include "te-generic.h"
diff --git a/gas/config/te-freebsd.h b/gas/config/te-freebsd.h
index 930b0a7d0ae..3322492de47 100644
--- a/gas/config/te-freebsd.h
+++ b/gas/config/te-freebsd.h
@@ -24,7 +24,4 @@
    FreeBSD kernel uses "/" to mean division.  (What a concept!)  */
 #define TE_FreeBSD 1
 
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-#include "obj-format.h"
+#include "te-generic.h"
diff --git a/gas/config/te-go32.h b/gas/config/te-go32.h
index eadd6f6954c..a0be8a12ab4 100644
--- a/gas/config/te-go32.h
+++ b/gas/config/te-go32.h
@@ -19,13 +19,9 @@
 
 #define TE_GO32
 
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
 /* GAS should treat '.align value' as an alignment of 2**value.  */
 #define USE_ALIGN_PTWO
 
 #define COFF_LONG_SECTION_NAMES
 
-/* These define interfaces.  */
-#include "obj-format.h"
+#include "te-generic.h"
diff --git a/gas/config/te-haiku.h b/gas/config/te-haiku.h
index f8917b3db5b..b958961f235 100644
--- a/gas/config/te-haiku.h
+++ b/gas/config/te-haiku.h
@@ -24,7 +24,4 @@
    haiku kernel uses "/" to mean division.  (What a concept!)  */
 #define TE_Haiku 1
 
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-#include "obj-format.h"
+#include "te-generic.h"
diff --git a/gas/config/te-hppa64.h b/gas/config/te-hppa64.h
index 9e09384a689..3bbd06f80c8 100644
--- a/gas/config/te-hppa64.h
+++ b/gas/config/te-hppa64.h
@@ -19,7 +19,4 @@
 
 #define TARGET_ARCH_SIZE 64
 
-/* Labels are not required to have a colon for a suffix.  */
-#define LABELS_WITHOUT_COLONS 1
-
-#include "obj-format.h"
+#include "te-hppa.h"
diff --git a/gas/config/te-hppalinux64.h b/gas/config/te-hppalinux64.h
index aa131247e64..27ce00265e7 100644
--- a/gas/config/te-hppalinux64.h
+++ b/gas/config/te-hppalinux64.h
@@ -17,8 +17,6 @@
    Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-#define TE_LINUX
 #define TARGET_ARCH_SIZE 64
-#define LOCAL_LABELS_FB 1
 
-#include "obj-format.h"
+#include "te-linux.h"
diff --git a/gas/config/te-macos.h b/gas/config/te-macos.h
index 33c565a58af..df77b885ec7 100644
--- a/gas/config/te-macos.h
+++ b/gas/config/te-macos.h
@@ -19,10 +19,4 @@
 
 #define TE_POWERMAC 1
 
-/* Added these, because if we don't know what we're targeting we may
-   need an assembler version of libgcc, and that will use local
-   labels.  */
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-#include "obj-format.h"
+#include "te-generic.h"
diff --git a/gas/config/te-pep.h b/gas/config/te-pep.h
index 8d7737a74a8..701f1fe6606 100644
--- a/gas/config/te-pep.h
+++ b/gas/config/te-pep.h
@@ -20,10 +20,4 @@
 #define TE_PEP
 #define COFF_WITH_pex64
 
-#define TE_PE
-#define LEX_AT (LEX_BEGIN_NAME | LEX_NAME) /* Can have @'s inside labels.  */
-
-/* The PE format supports long section names.  */
-#define COFF_LONG_SECTION_NAMES
-
-#include "obj-format.h"
+#include "te-pe.h"
diff --git a/gas/config/te-pepaarch64.h b/gas/config/te-pepaarch64.h
index 4dff9747d4a..25e81f8a1a6 100644
--- a/gas/config/te-pepaarch64.h
+++ b/gas/config/te-pepaarch64.h
@@ -20,10 +20,4 @@
 #define TE_PEP
 #define COFF_WITH_peAArch64
 
-#define TE_PE
-#define LEX_AT (LEX_BEGIN_NAME | LEX_NAME) /* Can have @'s inside labels.  */
-
-/* The PE format supports long section names.  */
-#define COFF_LONG_SECTION_NAMES
-
-#include "obj-format.h"
+#include "te-pe.h"
diff --git a/gas/config/te-solaris.h b/gas/config/te-solaris.h
index 153c6fe37de..87095bc3fed 100644
--- a/gas/config/te-solaris.h
+++ b/gas/config/te-solaris.h
@@ -19,10 +19,7 @@
 
 #define TE_SOLARIS
 
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-#include "obj-format.h"
+#include "te-generic.h"
 
 /* The Sun linker doesn't merge read-only and read-write sections into
    a single section so we must force all EH frame sections to use the
diff --git a/gas/config/te-tmips.h b/gas/config/te-tmips.h
index 433a92f7912..e05aa71f417 100644
--- a/gas/config/te-tmips.h
+++ b/gas/config/te-tmips.h
@@ -20,21 +20,10 @@
 
 /* This file is te-tmips.h and is intended to provide support for
    traditional mips targets like mips-dde-sysv4.2MP (Supermax ) ,
-   mips-sni-sysv4* (Sinix) etc. The base for this file is te-generic.h.
+   mips-sni-sysv4* (Sinix) etc.
    Created by Koundinya.K < kk@ddeorg.soft.net > with the help of
    Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>.  */
 
-/* Added these, because if we don't know what we're targeting we may
-   need an assembler version of libgcc, and that will use local
-   labels.  */
-
 #define TE_TMIPS 1
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
 
-/* these define interfaces */
-#ifdef OBJ_HEADER
-#include OBJ_HEADER
-#else
-#include "obj-format.h"
-#endif
+#include "te-generic.h"
diff --git a/gas/config/te-vxworks.h b/gas/config/te-vxworks.h
index f1ea0c72994..af4eefc4976 100644
--- a/gas/config/te-vxworks.h
+++ b/gas/config/te-vxworks.h
@@ -19,12 +19,5 @@
    02110-1301, USA.  */
 
 #define TE_VXWORKS	1
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
 
-/* these define interfaces */
-#ifdef OBJ_HEADER
-#include OBJ_HEADER
-#else
-#include "obj-format.h"
-#endif
+#include "te-generic.h"


More information about the Binutils-cvs mailing list