From c37f6138d4ddd445f69cfc8299ae41a91d3a2978 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@cygnus>
Date: Sun, 20 Mar 1994 21:13:59 +0000
Subject: [PATCH] * Makefile.in (config-stamp): If `defs' is defined, emit a
 preprocessor directive to create a macro named by this value into config.new;
 don't explicitly go for BFD_ASSEMBLER. * configure.in: Define `defs', not
 `BFDDEF'.  Set it to MANY_SEGMENTS for any obj-coffbfd target. *
 config/obj-coffbfd.h (BFD_HEADERS, BFD): Define. * config/i386coff.mt
 (TDEFINES): Don't define BFD, MANY_SEGMENTS, BFD_HEADERS. (LOCAL_LOADLIBES):
 Deleted. * config/m68kcoff.mt (TDEFINES): Don't define those macros. *
 config/m88kcoff.mt (TDEFINES): Ditto. * config/ebmon29k.mt: Deleted. *
 config/h8300hds.mt: Deleted. * config/ic960coff.mt: Deleted. *
 config/sparc.mt: Deleted. * config/h8300.mt (LOCAL_LOADLIBES, TDEFINES):
 Deleted. * config/h8500.mt (LOCAL_LOADLIBES, TDEFINES): Deleted. *
 config/sh.mt (LOCAL_LOADLIBES, TDEFINES): Deleted. * config/z8k.mt
 (LOCAL_LOADLIBES): Deleted. (TDEFINES): Don't define the coffbfd macros.

* Makefile.in: Insert makefile fragments before OBJS definition.
(OBJS): Add $(TE_OBJS).
---
 gas/ChangeLog            | 24 ++++++++++++++++++++++++
 gas/config/ebmon29k.mt   |  6 ------
 gas/config/h8300.mt      |  2 --
 gas/config/h8300hds.mt   |  4 ----
 gas/config/h8500.mt      |  2 --
 gas/config/i386coff.mt   |  3 +--
 gas/config/ic960coff.mt  |  1 -
 gas/config/m68kcoff.mt   |  2 +-
 gas/config/m88kcoff.mt   |  2 +-
 gas/config/obj-coffbfd.h |  3 +++
 gas/config/sh.mt         |  2 --
 gas/config/sparc.mt      |  1 -
 gas/config/z8k.mt        |  3 +--
 13 files changed, 31 insertions(+), 24 deletions(-)
 delete mode 100644 gas/config/ebmon29k.mt
 delete mode 100644 gas/config/h8300hds.mt
 delete mode 100644 gas/config/ic960coff.mt
 delete mode 100644 gas/config/sparc.mt

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 609ad00453a..764835f40cd 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,29 @@
 Sun Mar 20 14:43:14 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
+	* Makefile.in (config-stamp): If `defs' is defined, emit a
+	preprocessor directive to create a macro named by this value into
+	config.new; don't explicitly go for BFD_ASSEMBLER.
+	* configure.in: Define `defs', not `BFDDEF'.  Set it to
+	MANY_SEGMENTS for any obj-coffbfd target.
+	* config/obj-coffbfd.h (BFD_HEADERS, BFD): Define.
+	* config/i386coff.mt (TDEFINES): Don't define BFD, MANY_SEGMENTS,
+	or BFD_HEADERS.
+	(LOCAL_LOADLIBES): Deleted.
+	* config/m68kcoff.mt (TDEFINES): Don't define those macros.
+	* config/m88kcoff.mt (TDEFINES): Ditto.
+	* config/ebmon29k.mt: Deleted.
+	* config/h8300hds.mt: Deleted.
+	* config/ic960coff.mt: Deleted.
+	* config/sparc.mt: Deleted.
+	* config/h8300.mt (LOCAL_LOADLIBES, TDEFINES): Deleted.
+	* config/h8500.mt (LOCAL_LOADLIBES, TDEFINES): Deleted.
+	* config/sh.mt (LOCAL_LOADLIBES, TDEFINES): Deleted.
+	* config/z8k.mt (LOCAL_LOADLIBES): Deleted.
+	(TDEFINES): Don't define the coffbfd macros.
+
+	* Makefile.in: Insert makefile fragments before OBJS definition.
+	(OBJS): Add $(TE_OBJS).
+
 	* config/obj-coff.c (obj_pseudo_table): Supply "section"
 	unconditionally.
 
diff --git a/gas/config/ebmon29k.mt b/gas/config/ebmon29k.mt
deleted file mode 100644
index fb7d33271dc..00000000000
--- a/gas/config/ebmon29k.mt
+++ /dev/null
@@ -1,6 +0,0 @@
-TARG_CPU_DEPENDENTS=
-LOCAL_LOADLIBES=../bfd$(subdir)/libbfd.a ../libiberty$(subdir)/libiberty.a
-TDEFINES=-DBFD_HEADERS -DMANY_SEGMENTS -DBFD
-
-
-
diff --git a/gas/config/h8300.mt b/gas/config/h8300.mt
index e2ce39f6c54..b45ae5864fc 100644
--- a/gas/config/h8300.mt
+++ b/gas/config/h8300.mt
@@ -1,3 +1 @@
 TARG_CPU_DEPENDENTS=$(srcdir)/../include/opcode/h8300.h
-LOCAL_LOADLIBES=../bfd/libbfd.a
-TDEFINES=-DBFD_HEADERS -DMANY_SEGMENTS -DBFD
diff --git a/gas/config/h8300hds.mt b/gas/config/h8300hds.mt
deleted file mode 100644
index 1e6eb3c8dc9..00000000000
--- a/gas/config/h8300hds.mt
+++ /dev/null
@@ -1,4 +0,0 @@
-TARG_CPU_DEPENDENTS=$(srcdir)/../include/h8300-opcode.h
-LOCAL_LOADLIBES=$(srcdir)/../bfd/$(srcdir)/libbfd.a
-TDEFINES=-DBFD -DMANY_SEGMENTS
-
diff --git a/gas/config/h8500.mt b/gas/config/h8500.mt
index e990aebe21d..6bd54641108 100644
--- a/gas/config/h8500.mt
+++ b/gas/config/h8500.mt
@@ -1,3 +1 @@
 TARG_CPU_DEPENDENTS=$(srcdir)/../opcodes/h8500-opc.h
-LOCAL_LOADLIBES=../bfd/libbfd.a
-TDEFINES=-DBFD_HEADERS -DMANY_SEGMENTS -DBFD
diff --git a/gas/config/i386coff.mt b/gas/config/i386coff.mt
index 940e7039522..f44b9a4859f 100644
--- a/gas/config/i386coff.mt
+++ b/gas/config/i386coff.mt
@@ -1,3 +1,2 @@
 TARG_CPU_DEPENDENTS=$(srcdir)/../include/opcode/i386.h
-LOCAL_LOADLIBES=../bfd/libbfd.a
-TDEFINES=-DBFD_HEADERS -DMANY_SEGMENTS -DBFD -DI386COFF
+TDEFINES=-DI386COFF
diff --git a/gas/config/ic960coff.mt b/gas/config/ic960coff.mt
deleted file mode 100644
index 33a443727b7..00000000000
--- a/gas/config/ic960coff.mt
+++ /dev/null
@@ -1 +0,0 @@
-TDEFINES=-DBFD_HEADERS -DMANY_SECTIONS -DBFD
diff --git a/gas/config/m68kcoff.mt b/gas/config/m68kcoff.mt
index 6d0710c3b60..79bcbfedac5 100644
--- a/gas/config/m68kcoff.mt
+++ b/gas/config/m68kcoff.mt
@@ -1,2 +1,2 @@
 TARG_CPU_DEPENDENTS=$(srcdir)/../include/opcode/m68k.h
-TDEFINES=-DBFD_HEADERS -DMANY_SEGMENTS -DBFD -DM68KCOFF
+TDEFINES=-DM68KCOFF
diff --git a/gas/config/m88kcoff.mt b/gas/config/m88kcoff.mt
index e244e002bdb..373326623cb 100644
--- a/gas/config/m88kcoff.mt
+++ b/gas/config/m88kcoff.mt
@@ -1,2 +1,2 @@
 TARG_CPU_DEPENDENTS=$(srcdir)/config/m88k-opcode.h
-TDEFINES=-DBFD_HEADERS -DMANY_SEGMENTS -DBFD -DM88KCOFF
+TDEFINES=-DM88KCOFF
diff --git a/gas/config/obj-coffbfd.h b/gas/config/obj-coffbfd.h
index f7b9155e80a..80d45234a5a 100644
--- a/gas/config/obj-coffbfd.h
+++ b/gas/config/obj-coffbfd.h
@@ -28,6 +28,9 @@
 /* By default we omit the optional aouthdr.  */
 #define OBJ_COFF_OMIT_OPTIONAL_HEADER
 
+#define BFD_HEADERS
+#define BFD
+
 #include "targ-cpu.h"
 
 #include "bfd.h"
diff --git a/gas/config/sh.mt b/gas/config/sh.mt
index e990aebe21d..6bd54641108 100644
--- a/gas/config/sh.mt
+++ b/gas/config/sh.mt
@@ -1,3 +1 @@
 TARG_CPU_DEPENDENTS=$(srcdir)/../opcodes/h8500-opc.h
-LOCAL_LOADLIBES=../bfd/libbfd.a
-TDEFINES=-DBFD_HEADERS -DMANY_SEGMENTS -DBFD
diff --git a/gas/config/sparc.mt b/gas/config/sparc.mt
deleted file mode 100644
index db805f19469..00000000000
--- a/gas/config/sparc.mt
+++ /dev/null
@@ -1 +0,0 @@
-LOCAL_LOADLIBES=../bfd/libbfd.a
diff --git a/gas/config/z8k.mt b/gas/config/z8k.mt
index 2c7971095e8..4946aa55524 100644
--- a/gas/config/z8k.mt
+++ b/gas/config/z8k.mt
@@ -1,3 +1,2 @@
 TARG_CPU_DEPENDENTS=$(srcdir)/../opcodes/z8k-opc.h
-LOCAL_LOADLIBES=../bfd/libbfd.a
-TDEFINES=-DBFD_HEADERS -DMANY_SEGMENTS -DBFD -DSINGLE_QUOTE_STRINGS
+TDEFINES=-DSINGLE_QUOTE_STRINGS
-- 
2.30.2