This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[committed] fix assert4 testcase for mips-elf


Fairly obvious fix. Tested on mips-elf.

Applied to mainline.

-eric

2004-12-23  Eric Christopher  <echristo@redhat.com>

	* config/mips/mips.h (TARGET_CPU_CPP_BUILTINS): Add
	assert for machine=mips for !TARGET_IRIX.
	* config/mips/linux.h: Remove machine=mips assert.
	* config/mips/netbsd.h: Ditto.
	* config/mips/openbsd.h: Ditto.

Index: gcc/config/mips/linux.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/linux.h,v
retrieving revision 1.81
diff -u -p -w -r1.81 linux.h
--- gcc/config/mips/linux.h	11 Nov 2004 03:17:59 -0000	1.81
+++ gcc/config/mips/linux.h	23 Dec 2004 19:37:32 -0000
@@ -61,7 +61,6 @@ Boston, MA 02111-1307, USA.  */
 	    builtin_define ("__PIC__");				\
 	    builtin_define ("__pic__");				\
 	  }							\
-        builtin_assert ("machine=mips");			\
 	/* The GNU C++ standard library requires this.  */	\
 	if (c_dialect_cxx ())					\
 	  builtin_define ("_GNU_SOURCE");			\
Index: gcc/config/mips/mips.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/mips.h,v
retrieving revision 1.377
diff -u -p -w -r1.377 mips.h
--- gcc/config/mips/mips.h	27 Nov 2004 09:46:42 -0000	1.377
+++ gcc/config/mips/mips.h	23 Dec 2004 19:37:33 -0000
@@ -384,6 +384,10 @@ extern const struct mips_cpu_info *mips_
 #define TARGET_CPU_CPP_BUILTINS()				\
   do								\
     {								\
+      /* Everyone but IRIX defines this to mips.  */            \
+      if (!TARGET_IRIX)                                         \
+        builtin_assert ("machine=mips");                        \
+                                                                \
       builtin_assert ("cpu=mips");				\
       builtin_define ("__mips__");     				\
       builtin_define ("_mips");					\
Index: gcc/config/mips/netbsd.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/netbsd.h,v
retrieving revision 1.33
diff -u -p -w -r1.33 netbsd.h
--- gcc/config/mips/netbsd.h	31 Jan 2004 02:07:03 -0000	1.33
+++ gcc/config/mips/netbsd.h	23 Dec 2004 19:37:33 -0000
@@ -35,7 +35,6 @@ Boston, MA 02111-1307, USA.  */
       NETBSD_OS_CPP_BUILTINS_ELF();			\
       builtin_define ("__NO_LEADING_UNDERSCORES__");	\
       builtin_define ("__GP_SUPPORT__");		\
-      builtin_assert ("machine=mips");			\
       if (TARGET_LONG64)				\
 	builtin_define ("__LONG64");			\
 							\
Index: gcc/config/mips/openbsd.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/openbsd.h,v
retrieving revision 1.16
diff -u -p -w -r1.16 openbsd.h
--- gcc/config/mips/openbsd.h	31 Jan 2004 02:07:03 -0000	1.16
+++ gcc/config/mips/openbsd.h	23 Dec 2004 19:37:33 -0000
@@ -52,7 +52,6 @@ Boston, MA 02111-1307, USA.  */
 	builtin_define ("__OpenBSD__");			\
 	builtin_assert ("system=unix");			\
 	builtin_assert ("system=OpenBSD");		\
-	builtin_assert ("machine=mips");			\
 } while (0)
 
 /* Layout of source language data types.  */



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]