sol2-64.h: Move ...

	* 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.

From-SVN: r178558

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab45df421144a71046e573e7fb830fb9a88cc85a..b8c0c4ecfade0f92d166af64393f8d5269390ae1 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 abc5d9948a040fc05572eeb5d115ff0733ac2ebf..e442fa77f9b18b9ffed589171c322d44c9628d33 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/default-64.h b/gcc/config/sparc/default-64.h
new file mode 100644 (file)
index 0000000..ae884ea
--- /dev/null
+++ b/gcc/config/sparc/default-64.h
@@ -0,0 +1,22 @@
+/* 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.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#define TARGET_64BIT_DEFAULT 1

diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
index c4997bb29b4c4e05b013b1b125e91475a36d3ae8..3c83d2d0a6e66f3d5fc324d72341b0dbfba54b8e 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

diff --git a/gcc/config/sparc/sol2-64.h b/gcc/config/sparc/sol2-64.h
deleted file mode 100644 (file)
index 41e2281..0000000
--- a/gcc/config/sparc/sol2-64.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Definitions of target machine for GCC, for bi-arch SPARC
-   running Solaris 2, defaulting to 64-bit code generation.
-
-   Copyright (C) 1999, 2010, 2011 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-#define TARGET_64BIT_DEFAULT 1