* config/moxie/moxie.h (LINK_SPEC, SIZE_TYPE, PTRDIFF_TYPE,

	WCHAR_TYPE, WCHAR_TYPE_SIZE): Define.
	* config/moxie/rtems.h (LINK_SPEC, SIZE_TYPE, PTRDIFF_TYPE,
	WCHAR_TYPE, WCHAR_TYPE_SIZE): Undefine.
	* config.gcc (moxie-*-elf, moxie-*-uclinux*): Don't use svr4.h.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 108ef62..ee38479 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2010-12-09  Joseph Myers  <joseph@codesourcery.com>
 
+       * config/moxie/moxie.h (LINK_SPEC, SIZE_TYPE, PTRDIFF_TYPE,
+       WCHAR_TYPE, WCHAR_TYPE_SIZE): Define.
+       * config/moxie/rtems.h (LINK_SPEC, SIZE_TYPE, PTRDIFF_TYPE,
+       WCHAR_TYPE, WCHAR_TYPE_SIZE): Undefine.
+       * config.gcc (moxie-*-elf, moxie-*-uclinux*): Don't use svr4.h.
+
+2010-12-09  Joseph Myers  <joseph@codesourcery.com>
+
        * config/frv/frv.h (SIZE_TYPE, PTRDIFF_TYPE, WCHAR_TYPE,
        WCHAR_TYPE_SIZE): Define.
        * config.gcc (frv-*-elf, frv-*-*linux*): Don't use svr4.h.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 5495015..1371c43 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -979,14 +979,14 @@ frv-*-*linux*)
 moxie-*-elf)
        gas=yes
        gnu_ld=yes
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h ${tm_file}"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        tmake_file="${tmake_file} moxie/t-moxie moxie/t-moxie-softfp soft-fp/t-softfp"
        ;;
 moxie-*-uclinux*)
        gas=yes
        gnu_ld=yes
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h glibc-stdint.h moxie/uclinux.h"
+       tm_file="dbxelf.h elfos.h ${tm_file} linux.h glibc-stdint.h moxie/uclinux.h"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        tmake_file="${tmake_file} moxie/t-moxie moxie/t-moxie-softfp soft-fp/t-softfp"
        tm_defines="${tm_defines} DEFAULT_LIBC=LIBC_UCLIBC"

diff --git a/gcc/config/moxie/moxie.h b/gcc/config/moxie/moxie.h
index eae86cc..76ab62e 100644 (file)
--- a/gcc/config/moxie/moxie.h
+++ b/gcc/config/moxie/moxie.h
@@ -48,6 +48,10 @@
 #undef LIB_SPEC
 #define LIB_SPEC "%{!shared:%{!symbolic:-lc}}"
 
+#undef  LINK_SPEC
+#define LINK_SPEC "%{h*} %{v:-V} \
+                  %{static:-Bstatic} %{shared:-shared} %{symbolic:-Bsymbolic}"
+
 /* Layout of Source Language Data Types */
 
 #define INT_TYPE_SIZE 32
@@ -61,6 +65,18 @@
 
 #define DEFAULT_SIGNED_CHAR 1
 
+#undef  SIZE_TYPE
+#define SIZE_TYPE "unsigned int"
+
+#undef  PTRDIFF_TYPE
+#define PTRDIFF_TYPE "int"
+
+#undef  WCHAR_TYPE
+#define WCHAR_TYPE "long int"
+
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE BITS_PER_WORD
+
 /* Registers...
 
    $fp  - frame pointer

diff --git a/gcc/config/moxie/rtems.h b/gcc/config/moxie/rtems.h
index 42893f8..f42baf3 100644 (file)
--- a/gcc/config/moxie/rtems.h
+++ b/gcc/config/moxie/rtems.h
@@ -27,3 +27,9 @@ along with GCC; see the file COPYING3.  If not see
       builtin_assert ("system=rtems");         \
     }                                          \
   while (0)
+
+#undef LINK_SPEC
+#undef SIZE_TYPE
+#undef PTRDIFF_TYPE
+#undef WCHAR_TYPE
+#undef WCHAR_TYPE_SIZE