diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-28 17:50:50 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-28 17:50:50 +0000 |
| commit | 94bbf49527a6dc8f36a24a97fa3ea21cbd1633bf (patch) | |
| tree | f03e6c31bea87e13e4751b460e170d69badd6dc2 | |
| parent | 90336809fc0d2f5971957b8062a1da210e814322 (diff) | |
| download | gcc-94bbf49527a6dc8f36a24a97fa3ea21cbd1633bf.tar.gz | |
* config/sparc/sol2-64.h (TARGET_DEFAULT): Remove.
(TARGET_64BIT_DEFAULT): Define.
* config.gcc (sparc*-*-solaris2*): Move sparc/sol2-64.h to front
of tm_file.
* config/sparc/sol2.h [TARGET_64BIT_DEFAULT] (TARGET_DEFAULT): Define.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@175593 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config.gcc | 2 | ||||
| -rw-r--r-- | gcc/config/sparc/sol2-64.h | 7 | ||||
| -rw-r--r-- | gcc/config/sparc/sol2.h | 8 |
4 files changed, 18 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2422d34c52c..00991f77d93 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-06-28 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * config/sparc/sol2-64.h (TARGET_DEFAULT): Remove. + (TARGET_64BIT_DEFAULT): Define. + * config.gcc (sparc*-*-solaris2*): Move sparc/sol2-64.h to front + of tm_file. + * config/sparc/sol2.h [TARGET_64BIT_DEFAULT] (TARGET_DEFAULT): Define. + 2011-06-28 Joseph Myers <joseph@codesourcery.com> * common.opt (in_lto_p): New Variable entry. diff --git a/gcc/config.gcc b/gcc/config.gcc index 37dd5cd705c..73c47d72efe 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2482,7 +2482,7 @@ sparc*-*-solaris2*) tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sol2-bi.h" case ${target} in sparc64-*-* | sparcv9-*-*) - tm_file="${tm_file} sparc/sol2-64.h" + tm_file="sparc/sol2-64.h ${tm_file}" ;; *) test x$with_cpu != x || with_cpu=v9 diff --git a/gcc/config/sparc/sol2-64.h b/gcc/config/sparc/sol2-64.h index cf0bbff1ec6..41e228114a6 100644 --- a/gcc/config/sparc/sol2-64.h +++ b/gcc/config/sparc/sol2-64.h @@ -1,7 +1,7 @@ /* Definitions of target machine for GCC, for bi-arch SPARC running Solaris 2, defaulting to 64-bit code generation. - Copyright (C) 1999, 2010 Free Software Foundation, Inc. + Copyright (C) 1999, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -19,7 +19,4 @@ 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/>. */ -#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) +#define TARGET_64BIT_DEFAULT 1 diff --git a/gcc/config/sparc/sol2.h b/gcc/config/sparc/sol2.h index 627b05e92ab..24c7ade0177 100644 --- a/gcc/config/sparc/sol2.h +++ b/gcc/config/sparc/sol2.h @@ -20,11 +20,17 @@ 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/>. */ +#undef TARGET_DEFAULT +#ifdef TARGET_64BIT_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) +#else /* Solaris allows 64 bit out and global registers in 32 bit mode. sparc_override_options will disable V8+ if not generating V9 code. */ -#undef TARGET_DEFAULT #define TARGET_DEFAULT (MASK_V8PLUS + MASK_APP_REGS + MASK_FPU \ + MASK_LONG_DOUBLE_128) +#endif /* The default code model used to be CM_MEDANY on Solaris but even Sun eventually found it to be quite wasteful |