* config/sparc/sol2-64.h: Move ...

	* config/sparc/default-64.h: ... to here.  Update comment.
	* config.gcc: Update Solaris sparc to use default-64.h, also
	prefix this header into the list on sparc64-*-linux.
	* config/sparc/linux64.h (TARGET_DEFAULT): Only override if
	TARGET_64BIT_DEFAULT is defined.  Remove commented out reference
	to MASK_HARD_QUAD.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab45df4..b8c0c4e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -67,6 +67,14 @@
        * config.gcc: Recognize niagara3 and niagara4 in --with-cpu
        and --with-tune options.
 
+       * config/sparc/sol2-64.h: Move ...
+       * config/sparc/default-64.h: ... to here.  Update comment.
+       * config.gcc: Update Solaris sparc to use default-64.h, also
+       prefix this header into the list on sparc64-*-linux.
+       * config/sparc/linux64.h (TARGET_DEFAULT): Only override if
+       TARGET_64BIT_DEFAULT is defined.  Remove commented out reference
+       to MASK_HARD_QUAD.
+
 2011-09-05  Georg-Johann Lay  <avr@gjlay.de>
 
        PR target/50289

diff --git a/gcc/config.gcc b/gcc/config.gcc
index abc5d99..e442fa7 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2501,7 +2501,7 @@ sparc*-*-solaris2*)
        tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sol2-bi.h"
        case ${target} in
            sparc64-*-* | sparcv9-*-*)
-               tm_file="sparc/sol2-64.h ${tm_file}"
+               tm_file="sparc/default-64.h ${tm_file}"
                ;;
            *)
                test x$with_cpu != x || with_cpu=v9
@@ -2523,7 +2523,7 @@ sparc64-*-rtems*)
        tmake_file="${tmake_file} t-rtems"
        ;;
 sparc64-*-linux*)
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/linux64.h"
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default-64.h sparc/linux64.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64"
        extra_parts="${extra_parts} crtfastmath.o"

diff --git a/gcc/config/sparc/sol2-64.h b/gcc/config/sparc/default-64.h
similarity index 85%
rename from gcc/config/sparc/sol2-64.h
rename to gcc/config/sparc/default-64.h
index 41e2281..ae884ea 100644 (file)
--- a/gcc/config/sparc/sol2-64.h
+++ b/gcc/config/sparc/default-64.h
@@ -1,5 +1,5 @@
-/* Definitions of target machine for GCC, for bi-arch SPARC
-   running Solaris 2, defaulting to 64-bit code generation.
+/* Definitions of target machine for GCC, for bi-arch SPARC,
+   defaulting to 64-bit code generation.
 
    Copyright (C) 1999, 2010, 2011 Free Software Foundation, Inc.
 

diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
index c4997bb..3c83d2d 100644 (file)
--- a/gcc/config/sparc/linux64.h
+++ b/gcc/config/sparc/linux64.h
@@ -31,20 +31,11 @@ along with GCC; see the file COPYING3.  If not see
     }                                          \
   while (0)
 
-#if TARGET_CPU_DEFAULT == TARGET_CPU_v9 \
-    || TARGET_CPU_DEFAULT == TARGET_CPU_ultrasparc \
-    || TARGET_CPU_DEFAULT == TARGET_CPU_ultrasparc3 \
-    || TARGET_CPU_DEFAULT == TARGET_CPU_niagara \
-    || TARGET_CPU_DEFAULT == TARGET_CPU_niagara2 \
-    || TARGET_CPU_DEFAULT == TARGET_CPU_niagara3 \
-    || TARGET_CPU_DEFAULT == TARGET_CPU_niagara4
-/* A 64 bit v9 compiler with stack-bias,
-   in a Medium/Low code model environment.  */
-
+#ifdef TARGET_64BIT_DEFAULT
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT \
-  (MASK_V9 + MASK_PTR64 + MASK_64BIT /* + MASK_HARD_QUAD */ \
-   + MASK_STACK_BIAS + MASK_APP_REGS + MASK_FPU + MASK_LONG_DOUBLE_128)
+  (MASK_V9 + MASK_PTR64 + MASK_64BIT + MASK_STACK_BIAS + \
+   MASK_APP_REGS + MASK_FPU + MASK_LONG_DOUBLE_128)
 #endif
 
 /* This must be v9a not just v9 because by default we enable