diff options
| author | Jason Merrill <jason@redhat.com> | 2010-11-01 23:29:52 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2010-11-01 23:32:03 -0400 |
| commit | d29b209e37cb85fdf1cb1d8e0ae263cc3c59312b (patch) | |
| tree | 0e6b797a6c1a23c50603805706926a5eaa2184f1 /gcc/config/mips | |
| parent | 2450a78a38a727e7ec673b132315c8379db3b27d (diff) | |
| parent | c0000147b2aef6b69e2c6b6d29a9963910f6da98 (diff) | |
| download | gcc-constexpr.tar.gz | |
Merge remote branch 'trunk' into constexprconstexpr
Diffstat (limited to 'gcc/config/mips')
| -rw-r--r-- | gcc/config/mips/iris6.h | 4 | ||||
| -rw-r--r-- | gcc/config/mips/mips.h | 6 | ||||
| -rw-r--r-- | gcc/config/mips/netbsd.h | 12 | ||||
| -rw-r--r-- | gcc/config/mips/vxworks.h | 12 |
4 files changed, 3 insertions, 31 deletions
diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h index 6fa8ffc0616..dd8eb1158af 100644 --- a/gcc/config/mips/iris6.h +++ b/gcc/config/mips/iris6.h @@ -146,10 +146,6 @@ along with GCC; see the file COPYING3. If not see #undef DEFAULT_SIGNED_CHAR #define DEFAULT_SIGNED_CHAR 0 -#define WORD_SWITCH_TAKES_ARG(STR) \ - (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) \ - || strcmp (STR, "rpath") == 0) - #define TARGET_OS_CPP_BUILTINS() \ do \ { \ diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index d6d909b7756..a3675039462 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -1075,12 +1075,6 @@ enum mips_code_readable_setting { /* The CACHE instruction is available. */ #define ISA_HAS_CACHE (TARGET_CACHE_BUILTIN && !TARGET_MIPS16) -/* Add -G xx support. */ - -#undef SWITCH_TAKES_ARG -#define SWITCH_TAKES_ARG(CHAR) \ - (DEFAULT_SWITCH_TAKES_ARG (CHAR) || (CHAR) == 'G') - #define CONDITIONAL_REGISTER_USAGE mips_conditional_register_usage () /* Tell collect what flags to pass to nm. */ diff --git a/gcc/config/mips/netbsd.h b/gcc/config/mips/netbsd.h index 636e3ade6cc..ff328580181 100644 --- a/gcc/config/mips/netbsd.h +++ b/gcc/config/mips/netbsd.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler, for MIPS NetBSD systems. Copyright (C) 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, - 2007 Free Software Foundation, Inc. + 2007, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -170,16 +170,6 @@ along with GCC; see the file COPYING3. If not see #define MIPS_DEFAULT_GVALUE 0 -/* This defines which switch letters take arguments. -G is a MIPS - special. */ - -#undef SWITCH_TAKES_ARG -#define SWITCH_TAKES_ARG(CHAR) \ - (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ - || (CHAR) == 'R' \ - || (CHAR) == 'G') - - #undef ASM_FINAL_SPEC #undef SET_ASM_OP diff --git a/gcc/config/mips/vxworks.h b/gcc/config/mips/vxworks.h index f77d62b2be5..3c2d94fe104 100644 --- a/gcc/config/mips/vxworks.h +++ b/gcc/config/mips/vxworks.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1999, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2003, 2004, 2007, 2008, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -19,15 +20,6 @@ along with GCC; see the file COPYING3. If not see #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (MIPS, VxWorks syntax)"); -/* Combination of mips.h and svr4.h. */ -#undef SWITCH_TAKES_ARG -#define SWITCH_TAKES_ARG(CHAR) \ - (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ - || (CHAR) == 'G' \ - || (CHAR) == 'h' \ - || (CHAR) == 'x' \ - || (CHAR) == 'z') - #undef ASM_SPEC #define ASM_SPEC "\ %{!G:-G 0} %{G*} %(endian_spec) %{mips1} %{mips2} %{mips3} %{mips4} \ |