From: rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 18 Jan 2007 19:04:52 +0000 (+0000)
Subject: gcc/
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4e649cf0cc9471cf9c0e8ff8d2cb4df47925807;p=thirdparty%2Fgcc.git

gcc/
	* config.gcc (m68k-*-uclinux*): Base the port on the common
	and m68k GNU/Linux files rather than on the generic ELF ones.
	* config/m68k/uclinux.h (TARGET_VERSION): Override.
	(TARGET_OS_CPP_BUILTINS): Use LINUX_TARGET_OS_CPP_BUILTINS.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120911 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83c6035f4369..98ec52bb1ef3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-18  Richard Sandiford  <richard@codesourcery.com>
+
+	* config.gcc (m68k-*-uclinux*): Base the port on the common
+	and m68k GNU/Linux files rather than on the generic ELF ones.
+	* config/m68k/uclinux.h (TARGET_VERSION): Override.
+	(TARGET_OS_CPP_BUILTINS): Use LINUX_TARGET_OS_CPP_BUILTINS.
+
 2007-01-18  Julian Brown  <julian@codesourcery.com>
 	    Richard Sandiford  <richard@codesourcery.com>
 
diff --git a/gcc/config.gcc b/gcc/config.gcc
index d611a8c2bc27..6acecd38f765 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1523,8 +1523,9 @@ m68k-*-uclinux*)		# Motorola m68k/ColdFire running uClinux
 				# with uClibc, using the new GNU/Linux-style
 				# ABI.
 	default_m68k_cpu=68020
-	tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux.h"
- 	tm_defines="${tm_defines} MOTOROLA USE_GAS"
+	tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h m68k/linux.h m68k/uclinux.h"
+ 	tm_defines="${tm_defines} MOTOROLA USE_GAS UCLIBC_DEFAULT=1"
+	extra_options="${extra_options} linux.opt"
 	tmake_file=m68k/t-uclinux
 	use_fixproto=no
 	;;
diff --git a/gcc/config/m68k/uclinux.h b/gcc/config/m68k/uclinux.h
index 82124f9619e0..2cf0d0761b76 100644
--- a/gcc/config/m68k/uclinux.h
+++ b/gcc/config/m68k/uclinux.h
@@ -21,6 +21,8 @@ along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
+#undef TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (68k uClinux)");
 
 /* Undo the definition of STARTFILE_SPEC from m68kelf.h so we'll
    pick the default from gcc.c (just link crt0.o from multilib dir).  */
@@ -45,21 +47,14 @@ Boston, MA 02110-1301, USA.  */
 #undef ENDFILE_SPEC
 #define ENDFILE_SPEC ""
  
-/* Bring in standard linux defines */
 #undef TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS()		\
-  do						\
-    {						\
-	builtin_define_std ("mc68000");		\
-	builtin_define ("__uClinux__");		\
-	builtin_define_std ("linux");		\
-	builtin_define_std ("unix");		\
-	builtin_define ("__gnu_linux__");	\
-	builtin_assert ("system=linux");	\
-	builtin_assert ("system=unix");		\
-	builtin_assert ("system=posix");	\
-	if (TARGET_ID_SHARED_LIBRARY)		\
-	  builtin_define ("__ID_SHARED_LIBRARY__"); \
-    }						\
+#define TARGET_OS_CPP_BUILTINS()				\
+  do								\
+    {								\
+      LINUX_TARGET_OS_CPP_BUILTINS ();				\
+      builtin_define ("__uClinux__");				\
+      if (TARGET_ID_SHARED_LIBRARY)				\
+	builtin_define ("__ID_SHARED_LIBRARY__");		\
+    }								\
   while (0)