diff options
| -rw-r--r-- | gcc/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/config/alpha/alpha.h | 25 | ||||
| -rw-r--r-- | gcc/config/alpha/freebsd.h | 11 | ||||
| -rw-r--r-- | gcc/config/alpha/linux-elf.h | 4 | ||||
| -rw-r--r-- | gcc/config/alpha/linux.h | 1 | ||||
| -rw-r--r-- | gcc/config/alpha/netbsd.h | 10 | ||||
| -rw-r--r-- | gcc/config/alpha/osf.h | 8 |
7 files changed, 29 insertions, 42 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3d5a29c0ef9..d208773855d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2007-04-20 Richard Henderson <rth@redhat.com> + + * config/alpha/alpha.h (CPP_SPEC, CPP_SUBTARGET_SPEC): Remove. + (EXTRA_SPECS, SUBTARGET_EXTRA_SPECS): Remove. + * config/alpha/linux.h (CPP_SPEC): Undef before redefine. + * config/alpha/linux-elf.h (EXTRA_SPECS): Rename SUBTARGET_EXTRA_SPECS. + * config/alpha/freebsd.h (EXTRA_SPECS): Rename SUBTARGET_EXTRA_SPECS. + (CPP_SPEC): Don't include %(cpp_subtarget). + * config/alpha/netbsd.h (CPP_SPEC): Rename CPP_SUBTARGET_SPEC. + (EXTRA_SPECS): Rename SUBTARGET_EXTRA_SPECS. + * config/alpha/osf.h (CPP_SPEC, EXTRA_SPECS): Similarly. + 2007-04-20 Jakub Jelinek <jakub@redhat.com> * config/i386/i386.c (bdesc_2arg): Use ORDERED rather than UNORDERED diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h index a52ae2c5727..6e30d7b3658 100644 --- a/gcc/config/alpha/alpha.h +++ b/gcc/config/alpha/alpha.h @@ -96,12 +96,6 @@ Boston, MA 02110-1301, USA. */ while (0) #endif -#define CPP_SPEC "%(cpp_subtarget)" - -#ifndef CPP_SUBTARGET_SPEC -#define CPP_SUBTARGET_SPEC "" -#endif - #define WORD_SWITCH_TAKES_ARG(STR) \ (!strcmp (STR, "rpath") || DEFAULT_WORD_SWITCH_TAKES_ARG(STR)) @@ -215,25 +209,6 @@ extern enum alpha_fp_trap_mode alpha_fptm; {"cpu", "%{!mcpu=*:-mcpu=%(VALUE)}" }, \ {"tune", "%{!mtune=*:-mtune=%(VALUE)}" } -/* This macro defines names of additional specifications to put in the - specs that can be used in various specifications like CC1_SPEC. Its - definition is an initializer with a subgrouping for each command option. - - Each subgrouping contains a string constant, that defines the - specification name, and a string constant that used by the GCC driver - program. - - Do not define this macro if it does not need to do anything. */ - -#ifndef SUBTARGET_EXTRA_SPECS -#define SUBTARGET_EXTRA_SPECS -#endif - -#define EXTRA_SPECS \ - { "cpp_subtarget", CPP_SUBTARGET_SPEC }, \ - SUBTARGET_EXTRA_SPECS - - /* Sometimes certain combinations of command options do not make sense on a particular target machine. You can define a macro `OVERRIDE_OPTIONS' to take account of this. This macro, if diff --git a/gcc/config/alpha/freebsd.h b/gcc/config/alpha/freebsd.h index ca49a8bb0cd..e8f8bfa8bdd 100644 --- a/gcc/config/alpha/freebsd.h +++ b/gcc/config/alpha/freebsd.h @@ -20,16 +20,15 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#undef SUBTARGET_EXTRA_SPECS -#define SUBTARGET_EXTRA_SPECS \ +#undef EXTRA_SPECS +#define EXTRA_SPECS \ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } -/* Provide a CPP_SPEC appropriate for FreeBSD/alpha. Besides the - dealing with the GCC option `-posix', we must deal with the Alpha's - FP issues. */ +/* Provide a CPP_SPEC appropriate for FreeBSD/alpha -- dealing with + the GCC option `-posix'. */ #undef CPP_SPEC -#define CPP_SPEC "%(cpp_subtarget) %{posix:-D_POSIX_SOURCE}" +#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}" #define LINK_SPEC "%{G*} %{relax:-relax} \ %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h index 565cd7ef918..ff31da822c6 100644 --- a/gcc/config/alpha/linux-elf.h +++ b/gcc/config/alpha/linux-elf.h @@ -24,8 +24,8 @@ Boston, MA 02110-1301, USA. */ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (Alpha GNU/Linux for ELF)"); -#undef SUBTARGET_EXTRA_SPECS -#define SUBTARGET_EXTRA_SPECS \ +#undef EXTRA_SPECS +#define EXTRA_SPECS \ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h index e1036269989..da9608bb606 100644 --- a/gcc/config/alpha/linux.h +++ b/gcc/config/alpha/linux.h @@ -44,6 +44,7 @@ Boston, MA 02110-1301, USA. */ %{shared:-lc} \ %{!shared: %{profile:-lc_p}%{!profile:-lc}}" +#undef CPP_SPEC #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" /* Show that we need a GP when profiling. */ diff --git a/gcc/config/alpha/netbsd.h b/gcc/config/alpha/netbsd.h index 614b92b7ab3..63ff8375ec7 100644 --- a/gcc/config/alpha/netbsd.h +++ b/gcc/config/alpha/netbsd.h @@ -38,14 +38,14 @@ Boston, MA 02110-1301, USA. */ #define TARGET_PROFILING_NEEDS_GP 1 -/* Provide a CPP_SUBTARGET_SPEC appropriate for NetBSD/alpha. We use +/* Provide a CPP_SPEC appropriate for NetBSD/alpha. We use this to pull in CPP specs that all NetBSD configurations need. */ -#undef CPP_SUBTARGET_SPEC -#define CPP_SUBTARGET_SPEC NETBSD_CPP_SPEC +#undef CPP_SPEC +#define CPP_SPEC NETBSD_CPP_SPEC -#undef SUBTARGET_EXTRA_SPECS -#define SUBTARGET_EXTRA_SPECS \ +#undef EXTRA_SPECS +#define EXTRA_SPECS \ { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \ { "netbsd_entry_point", NETBSD_ENTRY_POINT }, \ { "netbsd_endfile_spec", NETBSD_ENDFILE_SPEC }, diff --git a/gcc/config/alpha/osf.h b/gcc/config/alpha/osf.h index f7aaf4d4606..5bc829dd93c 100644 --- a/gcc/config/alpha/osf.h +++ b/gcc/config/alpha/osf.h @@ -61,8 +61,8 @@ Boston, MA 02110-1301, USA. */ instead of PTHREAD_USE_D4 since both have the same effect and the former doesn't invade the users' namespace. */ -#undef CPP_SUBTARGET_SPEC -#define CPP_SUBTARGET_SPEC \ +#undef CPP_SPEC +#define CPP_SPEC \ "%{pthread|threads:-D_REENTRANT} %{threads:-D_PTHREAD_USE_D4}" /* Under OSF4, -p and -pg require -lprof1, and -lprof1 requires -lpdf. */ @@ -134,8 +134,8 @@ Boston, MA 02110-1301, USA. */ #endif -#undef SUBTARGET_EXTRA_SPECS -#define SUBTARGET_EXTRA_SPECS { "asm_oldas", ASM_OLDAS_SPEC } +#undef EXTRA_SPECS +#define EXTRA_SPECS { "asm_oldas", ASM_OLDAS_SPEC } /* Indicate that we have a stamp.h to use. */ #ifndef CROSS_DIRECTORY_STRUCTURE |