* tc-m68k.c (flag_reg_prefix_optional): New variable. Initialized to value of

REGISTER_PREFIX_OPTIONAL, if defined, or zero.
(m68k_reg_parse): If flag_reg_prefix_optional is set, permit register prefix to
be absent.
(m68k_ip_op): Accept `&' also for immediate constants.
(insert_reg): Don't bother with (two!?) sanity checks of the symbol table when
inserting each register.
(m68k_parse_long_option): New function.  Set flag_reg_prefix_optional if
"register-prefix-optional" is passed.
* tc-m68k.h (REGISTER_PREFIX): Always define if not already defined.
(OPTIONAL_REGISTER_PREFIX): Don't define.
(REGISTER_PREFIX_OPTIONAL): If not already defined, define as zero
or one depending on M68KCOFF.

Some changes to help Apollo support, from troy@cbme.unsw.edu.au:
* tc-m68k.c (DATA, ADDR, SP, FPREG, COPNUM, BAD, BAC): Define as macros instead
of enumerators, since the Apollo compiler can't handle "enumVal1, enumVal2 =
enumVal1" when defining an enum type.
(make_pcrel_absolute) [NO_PCREL_RELOCS]: New function.
(tc_coff_fix2rtype) [NO_PCREL_RELOCS]: Generate only R_RELBYTE, R_DIR16, and
R_DIR32 relocs.
* tc-m68k.h [TE_APOLLO] (COFF_MAGIC, COFF_AOUTHDR_MAGIC): Use Apollo versions.
[TE_APOLLO] (OBJ_COFF_OMIT_OPTIONAL_HEADER): Undefine.  That is, do include the
optional header for Apollo target.
(COFF_MAGIC): Don't define as MC68MAGIC if it's already defined.

* tc-m68k.h [TE_DELTA] (LEX_PCT): Define as 1, so that `%' can be used within a
label name.

* tc-m68k.h (m68k_init_after_args): Declare.
(tc_init_after_args): Define as m68k_init_after_args.
* tc-m68k.c (m68k_init_after_args): New function, containing one-shot code from
md_assemble.  Added warning for combination of 68040 and 68851.
(md_assemble): Startup-time code deleted.

1 files changed, 32 insertions, 3 deletions

diff --git a/gas/config/tc-m68k.h b/gas/config/tc-m68k.h
index 415706a..36abd6c 100644
--- a/gas/config/tc-m68k.h
+++ b/gas/config/tc-m68k.h
@@ -24,11 +24,19 @@
 #define TARGET_FORMAT "a.out-sunos-big"
 #endif
 
+#ifdef TE_APOLLO
+#define COFF_MAGIC		APOLLOM68KMAGIC
+#define COFF_AOUTHDR_MAGIC	APOLLO_COFF_VERSION_NUMBER
+#undef OBJ_COFF_OMIT_OPTIONAL_HEADER
+#endif
+
 #ifdef TE_LYNX
 #define TARGET_FORMAT		"coff-m68k-lynx"
 #endif
 
+#ifndef COFF_MAGIC
 #define COFF_MAGIC MC68MAGIC
+#endif
 #define BFD_ARCH bfd_arch_m68k
 #define COFF_FLAGS F_AR32W
 #define TC_COUNT_RELOC(x) ((x)->fx_addsy||(x)->fx_subsy)
@@ -64,11 +72,26 @@ extern int m68k_aout_machtype;
 					aim=this_type->rlx_forward+1; /* Force relaxation into word mode */ \
 				    }
 
-#ifdef M68KCOFF
-#define DOT_LABEL_PREFIX
+#ifndef REGISTER_PREFIX
 #define REGISTER_PREFIX '%'
+#endif
+
+#if !defined (REGISTER_PREFIX_OPTIONAL)
+#ifdef M68KCOFF
+#define LOCAL_LABEL(name) (name[0] == '.' \
+			   && (name[1] == 'L' || name[1] == '.'))
+#define FAKE_LABEL_NAME ".L0\001"
+#define REGISTER_PREFIX_OPTIONAL 0
 #else
-#define OPTIONAL_REGISTER_PREFIX '%'
+#define REGISTER_PREFIX_OPTIONAL 1
+#endif
+#endif /* not def REGISTER_PREFIX and not def OPTIONAL_REGISTER_PREFIX */
+
+#ifdef TE_DELTA
+/* On the Delta, `%' can occur within a label name.  I'm assuming it
+   can't be used as the initial character.  If that's not true, more
+   work will be needed to fix this up.  */
+#define LEX_PCT 1
 #endif
 
 #ifdef BFD_ASSEMBLER
@@ -78,4 +101,10 @@ extern int m68k_aout_machtype;
 
 #define DIFF_EXPR_OK
 
+extern void m68k_init_after_args PARAMS ((void));
+#define tc_init_after_args m68k_init_after_args
+
+extern int m68k_parse_long_option PARAMS ((char *));
+#define md_parse_long_option m68k_parse_long_option
+
 /* end of tc-m68k.h */