--- gcc/config/amix.h	2018/04/24 17:51:32	1.1.1.1
+++ gcc/config/amix.h	2018/04/24 18:04:22	1.1.1.3
@@ -21,6 +21,14 @@ the Free Software Foundation, 675 Mass A
 
 #include "m68kv4.h"
 
+/* Alter assembler syntax for fsgldiv and fsglmul.
+   It is highly likely that this is a generic SGS m68k assembler dependency.
+   If so, it should eventually be handled in the m68ksgs.h ASM_OUTPUT_OPCODE
+   macro, like the other SGS assembler quirks.  -fnf */
+
+#define FSGLDIV_USE_S		/* Use fsgldiv.s, not fsgldiv.x */
+#define FSGLMUL_USE_S		/* Use fsglmul.s, not fsglmul.x */
+
 /* Names to predefine in the preprocessor for this target machine.  For the
    Amiga, these definitions match those of the native AT&T compiler.  Note
    that we override the definition in m68kv4.h, where SVR4 is defined and
@@ -30,16 +38,10 @@ the Free Software Foundation, 675 Mass A
 #define CPP_PREDEFINES \
   "-Dm68k -Dunix -DAMIX -Amachine(m68k) -Acpu(m68k) -Asystem(unix) -Alint(off)"
 
-/* This is the library routine that is used to transfer control from
-   the trampoline to the actual nested function.  FIXME:  This needs to
-   be implemented still.  -fnf */
-
-#undef TRANSFER_FROM_TRAMPOLINE
-
 /* At end of a switch table, define LDnnn iff the symbol LInnn was defined.
    Some SGS assemblers have a bug such that "Lnnn-LInnn-2.b(pc,d0.l*2)"
    fails to assemble.  Luckily "Lnnn(pc,d0.l*2)" produces the results
-   we want.  This difference can be accommodated by using an assembler
+   we want.  This difference can be accommodated by making the assembler
    define such "LDnnn" to be either "Lnnn-LInnn-2.b", "Lnnn", or any other
    string, as necessary.  This is accomplished via the ASM_OUTPUT_CASE_END
    macro. (the Amiga assembler has this bug) */
@@ -47,10 +49,13 @@ the Free Software Foundation, 675 Mass A
 #undef ASM_OUTPUT_CASE_END
 #define ASM_OUTPUT_CASE_END(FILE,NUM,TABLE)				\
 do {									\
-  if (RTX_INTEGRATED_P (TABLE))						\
-    asm_fprintf ((FILE), "%s %LLD%d,%LL%d\n", SET_ASM_OP, (NUM), (NUM));\
+  if (switch_table_difference_label_flag)				\
+    asm_fprintf ((FILE), "\t%s %LLD%d,%LL%d\n", SET_ASM_OP, (NUM), (NUM));\
+  switch_table_difference_label_flag = 0;				\
 } while (0)
 
+int switch_table_difference_label_flag;
+
 /* This says how to output assembler code to declare an
    uninitialized external linkage data object.  Under SVR4,
    the linker seems to want the alignment of data objects
@@ -78,7 +83,7 @@ do {									\
 #undef ASM_OUTPUT_ALIGNED_LOCAL
 #define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN)		\
 do {									\
-  fprintf ((FILE), "%s\t%s,%u,%u\n",					\
+  fprintf ((FILE), "\t%s\t%s,%u,%u\n",					\
 	   BSS_ASM_OP, (NAME), (SIZE), MAX ((ALIGN) / BITS_PER_UNIT, 4)); \
 } while (0)
 
@@ -91,7 +96,7 @@ do {									\
 #define ASM_OUTPUT_ASCII(FILE,PTR,LEN)				\
 {								\
   register int sp = 0, lp = 0, ch;				\
-  fprintf ((FILE), "%s ", BYTE_ASM_OP);				\
+  fprintf ((FILE), "\t%s ", BYTE_ASM_OP);				\
   do {								\
     ch = (PTR)[sp];						\
     if (ch > ' ' && ! (ch & 0x80) && ch != '\\')		\
@@ -106,7 +111,7 @@ do {									\
       {								\
 	if ((sp % 10) == 0)					\
 	  {							\
-	    fprintf ((FILE), "\n%s ", BYTE_ASM_OP);		\
+	    fprintf ((FILE), "\n\t%s ", BYTE_ASM_OP);		\
 	  }							\
 	else							\
 	  {							\