From 14d304da97f132b411b5c581e38b2bbd177cc3ca Mon Sep 17 00:00:00 2001
From: Svein Seldal <Svein.Seldal@solidas.com>
Date: Mon, 20 Jan 2003 22:34:39 +0000
Subject: [PATCH] Updates for fixing tic4x arch tagging of its object files.

	* bfd/coffcode.h (coff_set_flags): Added get/set arch hooks.
	* include/coff/tic4x.h (TICOFF_TARGET_MACHINE_GET): Fixed define bug
	* include/coff/ti.h (TICOFF_TARGET_MACHINE_GET): Added macros
	* ld/Makefile.am: Added etic3xcoff.o and etic4xcoff_onchip.o
	* ld/Makefile.in: Regenerate
	* ld/configure.tgt: Added extra target emulations
	* ld/emulparams/tic3xcoff.sh: Remove old settings
	* ld/emulparams/tic4xcoff.sh: Ditto
	* ld/emulparams/tic3xcoff-onchip.sh: Added new
	* ld/scripttempl/tic4xcoff.sc: Revise and combine both c3x and c4x
	* ld/scripttempl/tic3xcoff.sc: Remove
---
 include/ChangeLog    | 5 +++++
 include/coff/ti.h    | 8 ++++++++
 include/coff/tic4x.h | 6 +++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/include/ChangeLog b/include/ChangeLog
index 771808c64..79cf42d1f 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-20  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* coff/tic4x.h (TICOFF_TARGET_MACHINE_GET): Fixed define bug
+	* coff/ti.h (TICOFF_TARGET_MACHINE_GET): Added macros
+
 2002-07-17  Geoffrey Keating  <geoffk@redhat.com>
 
 	* splay-tree.h (GTY): Define if undefined.
diff --git a/include/coff/ti.h b/include/coff/ti.h
index 0a59b226a..8df15223c 100644
--- a/include/coff/ti.h
+++ b/include/coff/ti.h
@@ -57,6 +57,14 @@ struct external_filehdr
 #error "TICOFF_TARGET_ARCH needs to be defined for your CPU"
 #endif
 
+#ifndef TICOFF_TARGET_MACHINE_GET
+#define TICOFF_TARGET_MACHINE_GET(FLAGS) 0
+#endif
+
+#ifndef TICOFF_TARGET_MACHINE_SET
+#define TICOFF_TARGET_MACHINE_SET(FLAGSP, MACHINE)
+#endif
+
 /* Default to COFF2 for file output */
 #ifndef TICOFF_DEFAULT_MAGIC
 #define TICOFF_DEFAULT_MAGIC TICOFF2MAGIC
diff --git a/include/coff/tic4x.h b/include/coff/tic4x.h
index 03215fb53..083cc3b10 100644
--- a/include/coff/tic4x.h
+++ b/include/coff/tic4x.h
@@ -30,14 +30,14 @@
 /* We use COFF2.  */
 #define TICOFF_DEFAULT_MAGIC 	TICOFF2MAGIC 
 
-#define TICOFF_TARGET_MACHINE_GET (FLAGS) \
+#define TICOFF_TARGET_MACHINE_GET(FLAGS) \
   (((FLAGS) & F_VERS) ? bfd_mach_c4x : bfd_mach_c3x)
 
-#define TICOFF_TARGET_MACHINE_SET (FLAGSP, MACHINE)	\
+#define TICOFF_TARGET_MACHINE_SET(FLAGSP, MACHINE)	\
   do							\
     {							\
       if ((MACHINE) == bfd_mach_c4x)			\
-        *(FLAGSP) = F_VERS;				\
+        *(FLAGSP) |= F_VERS;				\
     }							\
   while (0)