--- gcc/config/m68k/sun3.h	2018/04/24 18:10:24	1.1.1.1
+++ gcc/config/m68k/sun3.h	2018/04/24 18:14:29	1.1.1.2
@@ -61,7 +61,6 @@ the Free Software Foundation, 675 Mass A
 #define CC1_SPEC "%{sun3:} %{target:}"
 
 #define PTRDIFF_TYPE "int"
-#define SIZE_TYPE "int"
 
 /* We must override m68k.h.  */
 #undef WCHAR_TYPE
@@ -82,8 +81,13 @@ the Free Software Foundation, 675 Mass A
   %{fpic:-k} %{fPIC:-k}"
 
 /* Names to predefine in the preprocessor for this target machine.  */
+/* For a while,  -D_CROSS_TARGET_ARCH=SUN3 was included here,
+   but it doesn't work, partly because SUN3 etc. aren't defined
+   (and shouldn't be).  It seems that on a native compiler _CROSS_TARGET_ARCH
+   should not be defined.  For cross compilers, let's do things as we
+   normally do in GCC.  -- rms.  */
 
-#define CPP_PREDEFINES "-Dmc68000 -Dsun -Dunix"
+#define CPP_PREDEFINES "-Dmc68000 -Dsun -Dunix -Asystem(unix)  -Asystem(bsd) -Acpu(m68k) -Amachine(m68k)"
 
 /* STARTFILE_SPEC to include sun floating point initialization
    This is necessary (tr: Sun does it) for both the m68881 and the fpa
@@ -276,3 +280,16 @@ the Free Software Foundation, 675 Mass A
           asm_fprintf (FILE, "%I0r%s", dstr);				\
         }								\
     } while (0)
+
+#undef BLOCK_PROFILER_CODE
+#define BLOCK_PROFILER_CODE						\
+extern int ___tcov_init;						\
+									\
+__bb_init_func (blocks)							\
+	struct bb *blocks;						\
+{									\
+  if (! ___tcov_init)							\
+    ___tcov_init_func ();						\
+									\
+  ___bb_link (blocks->filename, blocks->counts, blocks->ncounts);	\
+}