OSDN Git Service

Merge remote-tracking branch 'gnu/gcc-4_6-branch' into rework
authorMasaki Muranaka <monaka@monami-ya.jp>
Wed, 14 May 2014 06:31:34 +0000 (15:31 +0900)
committerMasaki Muranaka <monaka@monami-ya.jp>
Wed, 14 May 2014 06:31:34 +0000 (15:31 +0900)
gcc/config.gcc
gcc/config/arm/t-arm-elf
gcc/config/avr/libgcc.S
gcc/config/i386/driver-i386.c
gcc/config/mips/toppers.h [new file with mode: 0644]
gcc/config/rs6000/rs6000.h
libgcc/config.host

index 6dc2427..acdaa8d 100644 (file)
@@ -2008,6 +2008,11 @@ mips-*-elf* | mipsel-*-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
        tmake_file="mips/t-elf mips/t-libgcc-mips16"
        ;;
+mips64-*-toppers* | mips64el-*-toppers*)
+       tm_file="elfos.h ${tm_file} mips/elf.h mips/toppers.h"
+       tmake_file="mips/t-elf mips/t-libgcc-mips16"
+       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
+       ;;
 mips64-*-elf* | mips64el-*-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
        tmake_file="mips/t-elf mips/t-libgcc-mips16"
index 38c2918..3378611 100644 (file)
@@ -63,16 +63,16 @@ MULTILIB_EXCEPTIONS    += *mthumb/*mfloat-abi=hard*
 # MULTILIB_DIRNAMES   += ep9312
 # MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312*
 #      
-MULTILIB_OPTIONS     += mlittle-endian/mbig-endian
-MULTILIB_DIRNAMES    += le be
-MULTILIB_MATCHES     += mbig-endian=mbe mlittle-endian=mle
+MULTILIB_OPTIONS     += mlittle-endian/mbig-endian
+MULTILIB_DIRNAMES    += le be
+MULTILIB_MATCHES     += mbig-endian=mbe mlittle-endian=mle
 # 
-MULTILIB_OPTIONS    += mhard-float/msoft-float
-MULTILIB_DIRNAMES   += fpu soft
-MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
+MULTILIB_OPTIONS    += mhard-float/msoft-float
+MULTILIB_DIRNAMES   += fpu soft
+MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
 # 
-MULTILIB_OPTIONS    += mno-thumb-interwork/mthumb-interwork
-MULTILIB_DIRNAMES   += normal interwork
+MULTILIB_OPTIONS    += mno-thumb-interwork/mthumb-interwork
+MULTILIB_DIRNAMES   += normal interwork
 # 
 # MULTILIB_OPTIONS    += fno-leading-underscore/fleading-underscore
 # MULTILIB_DIRNAMES   += elf under
index ac8e5cd..44aa7bb 100644 (file)
@@ -647,10 +647,10 @@ _exit:
        .weak   exit
 exit:
        .endfunc
-
        /* Code from .fini8 ... .fini1 sections inserted by ld script.  */
 
        .section .fini0,"ax",@progbits
+       .func   __stop_program
        cli
 __stop_program:
        rjmp    __stop_program
index 69128c5..60dfcd6 100644 (file)
@@ -24,7 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 
 const char *host_detect_local_cpu (int argc, const char **argv);
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
 #include "cpuid.h"
 
 struct cache_desc
diff --git a/gcc/config/mips/toppers.h b/gcc/config/mips/toppers.h
new file mode 100644 (file)
index 0000000..bb01f5f
--- /dev/null
@@ -0,0 +1,13 @@
+/* Specify predefined symbols in preprocessor.  */
+
+#define TARGET_OS_CPP_BUILTINS()       \
+do {                                   \
+  builtin_define ("__toppers__");      \
+} while (0)
+
+/* No sdata.
+ * The TOPPERS BSPs expect -G0
+ */
+#undef MIPS_DEFAULT_GVALUE
+#define MIPS_DEFAULT_GVALUE 0
+
index 0eae326..e3a6a2a 100644 (file)
 /* -mcpu=native handling only makes sense with compiler running on
    an PowerPC chip.  If changing this condition, also change
    the condition in driver-rs6000.c.  */
-#if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
+#if 0 /* defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX) */
 /* In driver-rs6000.c.  */
 extern const char *host_detect_local_cpu (int argc, const char **argv);
 #define EXTRA_SPEC_FUNCTIONS \
index 25e949e..721970e 100644 (file)
@@ -434,6 +434,8 @@ mips*-*-rtems*)
        ;;
 mips-wrs-vxworks)
        ;;
+mips*-*-toppers*)
+       ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
        ;;
 mmix-knuth-mmixware)