From 97eb2f0cb61a312b0a1cbdd723bb9eef9795e4cb Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@cygnus>
Date: Wed, 13 Oct 1993 23:08:10 +0000
Subject: [PATCH] More "make dep" fixups. Apollo 68k support from Troy Rollo
 <troy@cbme.unsw.edu.au>.

---
 bfd/.Sanitize  |  2 ++
 bfd/ChangeLog  | 29 +++++++++++++++++++++++++++++
 bfd/coffcode.h | 18 ++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 297462bcd2c..b5117f2f2a7 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -52,6 +52,7 @@ bout.c
 cache.c
 coff-a29k.c
 coff-alpha.c
+coff-apollo.c
 coff-h8300.c
 coff-h8500.c
 coff-i386.c
@@ -91,6 +92,7 @@ cpu-we32k.c
 cpu-z8k.c
 ctor.c
 demo64.c
+dep-in.sed
 doc
 ecoff.c
 ecoffswap.h
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1c8e07d4322..91152d2183b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,32 @@
+Wed Oct 13 18:39:03 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (dep-in): New rule, for editing dependencies into
+	Makefile.in in $(srcdir).  Use move-if-change.
+	(.dep1, dep): Use move-if-change.
+	(CFILES): Add coff-apollo.c.
+
+	Sun Oct 10 18:02:56 1993  Troy Rollo (troy@cbme.unsw.EDU.AU)
+
+	* Makefile.in: Recognise new file, coff-apollo.o
+
+	* coff-apollo.c: New file
+
+	* coffcode.h: Recognise apollo magic numbers and writable text
+
+	* coffswap.h: Swap Apollo optional header entries
+
+	* config.bfd: Add line for Apollo
+
+	* configure.host: Replace apollo68b and apollo68v with Apollo
+
+	* configure.in: Recognise apollocoff_vec
+
+	* targets.c: Likewise
+
+	* config/apollo.mh, config/apollo.mt: New files
+
+	* hosts/apollo68.h: Remove inclusion of strings.h
+
 Wed Oct 13 14:28:17 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 
 	* coff-i386.c (i3coff_object_p): Now static.
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 7ca1616606a..298f8c82926 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -860,7 +860,12 @@ coff_set_arch_mach_hook(abfd, filehdr)
 #ifdef MC68MAGIC
   case MC68MAGIC:
   case M68MAGIC:
+#ifdef MC68KBCSMAGIC
   case MC68KBCSMAGIC:
+#endif
+#ifdef APOLLOM68KMAGIC
+  case APOLLOM68KMAGIC:
+#endif
     arch = bfd_arch_m68k;
     machine = 68020;
     break;
@@ -1140,7 +1145,11 @@ DEFUN(coff_set_flags,(abfd, magicp, flagsp),
 #endif
 #ifdef MC68MAGIC
   case bfd_arch_m68k:
+#ifdef APOLLOM68KMAGIC
+    *magicp = APOLLO_COFF_VERSION_NUMBER;
+#else
     *magicp = MC68MAGIC;
+#endif
     return true;
     break;
 #endif
@@ -1340,6 +1349,10 @@ coff_add_missing_symbols (abfd)
 	 continue;
 	if (!strcmp (name, _TEXT))
 	 need_text = 0;
+#ifdef APOLLO_M68
+	else if (!strcmp(name, ".wtext"))
+	  need_text = 0;
+#endif
 	else if (!strcmp (name, _DATA))
 	 need_data = 0;
 	else if (!strcmp (name, _BSS))
@@ -1633,6 +1646,11 @@ DEFUN(coff_write_object_contents,(abfd),
   internal_a.magic = PAGEMAGICBCS;
 #endif				/* M88 */
 
+#if APOLLO_M68
+#define __A_MAGIC_SET__
+  internal_a.magic = APOLLO_COFF_VERSION_NUMBER;
+#endif
+
 #if M68 || WE32K
 #define __A_MAGIC_SET__
   /* Never was anything here for the 68k */
-- 
2.30.2