[PATCH] Fix PR 12021, more fall out from Neil's clean up to m68k backend

Andrew Pinski pinskia@physics.uc.edu
Mon Sep 8 05:48:00 GMT 2003


When Neil cleaned up the m68k backend and moved it to the new style of 
builtin_assert and builtin_define,
he also converted too much in the sense that the some of the target 
"OS" headers also had them in there.
This patch removes them from the netbsd*.h headers from the m68k target 
directory, there might be others
but I have not looked.

OK?
Dara (yes the bug guy) tested this patch.

ChangeLog:
	* config/m68k/netbsd-elf.h (TARGET_OS_CPP_BUILTINS): Remove the asserts
	as they already are done in config/m68k/m68k.h.
	* config/m68k/netbsd.h (TARGET_OS_CPP_BUILTINS): Likewise



Patch:
Index: netbsd-elf.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m68k/netbsd-elf.h,v
retrieving revision 1.16
diff -u -d -b -w -u -p -r1.16 netbsd-elf.h
--- netbsd-elf.h        21 Aug 2003 01:03:37 -0000      1.16
+++ netbsd-elf.h        22 Aug 2003 21:30:33 -0000
@@ -31,8 +31,6 @@ Boston, MA 02111-1307, USA.  */
        builtin_define ("__m68k__");             \
        builtin_define ("__SVR4_ABI__");         \
        builtin_define ("__motorola__");         \
-      builtin_assert ("cpu=m68k");             \
-      builtin_assert ("machine=m68k");         \
      }                                          \
    while (0)

Index: netbsd.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m68k/netbsd.h,v
retrieving revision 1.14
diff -u -d -b -w -u -p -r1.14 netbsd.h
--- netbsd.h    21 Aug 2003 17:27:23 -0000      1.14
+++ netbsd.h    22 Aug 2003 21:30:33 -0000
@@ -6,8 +6,6 @@
        builtin_define_std ("m68k");             \
        builtin_define_std ("mc68000");          \
        builtin_define_std ("mc68020");          \
-      builtin_assert ("cpu=m68k");             \
-      builtin_assert ("machine=m68k");         \
      }                                          \
    while (0)



More information about the Gcc-patches mailing list