[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/arm Define size_t, ptrdiff...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5a853f25b0a3
branches:  trunk
changeset: 784527:5a853f25b0a3
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jan 31 06:52:16 2013 +0000

description:
Define size_t, ptrdiff_t, and wchar_t to what NetBSD/arm wants instead of the
stupid values chosen for AAPCS.

diffstat:

 external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h |  29 ++++++++++----------
 1 files changed, 15 insertions(+), 14 deletions(-)

diffs (60 lines):

diff -r 7aef65ad7c67 -r 5a853f25b0a3 external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
--- a/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Thu Jan 31 06:47:55 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Thu Jan 31 06:52:16 2013 +0000
@@ -20,13 +20,7 @@
 
 /* Run-time Target Specification.  */
 #undef TARGET_VERSION
-#define TARGET_VERSION fputs (" (NetBSD/arm ELF EABI)", stderr);
-
-/* Default to armv5t so that thumb shared libraries work.
-   The ARM10TDMI core is the default for armv5t, so set
-   SUBTARGET_CPU_DEFAULT to achieve this.  */
-#undef  SUBTARGET_CPU_DEFAULT
-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+#define TARGET_VERSION fputs (" (NetBSD/earm ELF)", stderr);
 
 /* This defaults us to little-endian.  */
 #ifndef TARGET_ENDIAN_DEFAULT
@@ -44,12 +38,6 @@
 
 #undef MULTILIB_DEFAULTS
 
-/* Default it to use ATPCS with soft-VFP.  */
-#undef TARGET_DEFAULT
-#define TARGET_DEFAULT                 \
-  (MASK_APCS_FRAME                     \
-   | TARGET_ENDIAN_DEFAULT)
-
 #undef ARM_DEFAULT_ABI
 #define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
 
@@ -57,7 +45,8 @@
 #define TARGET_OS_CPP_BUILTINS()       \
   do                                   \
     {                                  \
-      TARGET_BPABI_CPP_BUILTINS();     \
+      if (TARGET_AAPCS_BASED)          \
+       TARGET_BPABI_CPP_BUILTINS();    \
       NETBSD_OS_CPP_BUILTINS_ELF();    \
     }                                  \
   while (0)
@@ -65,6 +54,18 @@
 #undef SUBTARGET_CPP_SPEC
 #define SUBTARGET_CPP_SPEC NETBSD_CPP_SPEC
 
+/*
+ * Override AAPCS types to remain compatible the existing NetBSD types.
+ */
+#undef WCHAR_TYPE
+#define WCHAR_TYPE "int"
+
+#undef SIZE_TYPE
+#define SIZE_TYPE "long unsigned int"
+ 
+#undef PTRDIFF_TYPE
+#define PTRDIFF_TYPE "long int"
+
 #undef SUBTARGET_EXTRA_ASM_SPEC
 #define SUBTARGET_EXTRA_ASM_SPEC       \
   "-matpcs %{!mabi=*|mabi=aapcs*:-meabi=4} %{fpic|fpie:-k} %{fPIC|fPIE:-k}"