aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Sandiford <richard@codesourcery.com>2007-01-18 19:04:52 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2007-01-18 19:04:52 +0000
commit78218d899779528fc2fe6ec5c01ce8b22f2fb404 (patch)
treeebfd90da6d45a1ab9f4b5ab63c1ac5278e4a139a /gcc
parent5189ab949ec36792eea8d11f4f64f611f5855522 (diff)
downloadgcc-78218d899779528fc2fe6ec5c01ce8b22f2fb404.zip
gcc-78218d899779528fc2fe6ec5c01ce8b22f2fb404.tar.gz
gcc-78218d899779528fc2fe6ec5c01ce8b22f2fb404.tar.bz2
config.gcc (m68k-*-uclinux*): Base the port on the common and m68k GNU/Linux files rather than on the generic...
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. From-SVN: r120911
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config.gcc5
-rw-r--r--gcc/config/m68k/uclinux.h25
3 files changed, 20 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83c6035..98ec52b 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 d611a8c..6acecd3 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 82124f9..2cf0d07 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)