diff options
| -rw-r--r-- | gcc/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 3 | ||||
| -rw-r--r-- | gcc/config/i386/i386.h | 6 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.c | 3 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.h | 14 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.opt | 7 |
6 files changed, 35 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 18f2ce2..7d984df 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2019-07-31 Peter Bergner <bergner@linux.ibm.com> + + PR target/91050 + * config/rs6000/rs6000.opt (mdejagnu-cpu=): Delete option. + * config/rs6000/rs6000.c (rs6000_option_override_internal): Remove + use of deleted rs6000_dejagnu_cpu_index variable. + * config/rs6000/rs6000.h (DRIVER_SELF_SPECS): Define. + (SUBTARGET_DRIVER_SELF_SPECS): Likewise. + * config/darwin.h (DRIVER_SELF_SPECS): Rename from this ... + (SUBTARGET_DRIVER_SELF_SPECS): ...to this. + * config/i386/i386.h (DRIVER_SELF_SPECS): Define. + (SUBTARGET_DRIVER_SELF_SPECS): Likewise. + 2019-07-31 Richard Biener <rguenther@suse.de> PR tree-optimization/91280 diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index ed87984..ab5ad03 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -125,7 +125,8 @@ extern GTY(()) int darwin_ms_struct; However, a few can be handled and we can elide options that are silently- ignored defaults, plus warn on obsolete ones that no longer function. */ -#define DRIVER_SELF_SPECS \ +#undef SUBTARGET_DRIVER_SELF_SPECS +#define SUBTARGET_DRIVER_SELF_SPECS \ "%{fapple-kext|mkernel:-static}", \ "%{gfull:-g -fno-eliminate-unused-debug-symbols} %<gfull", \ "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} \ diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index a2fcdd4..fba015c 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -677,6 +677,12 @@ extern tree x86_mfence; with the rounding mode forced to 53 bits. */ #define TARGET_96_ROUND_53_LONG_DOUBLE 0 +#ifndef SUBTARGET_DRIVER_SELF_SPECS +# define SUBTARGET_DRIVER_SELF_SPECS "" +#endif + +#define DRIVER_SELF_SPECS SUBTARGET_DRIVER_SELF_SPECS + /* -march=native handling only makes sense with compiler running on an x86 or x86_64 chip. If changing this condition, also change the condition in driver-i386.c. */ diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index edd8f2b..4080c82 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -3489,9 +3489,6 @@ rs6000_option_override_internal (bool global_init_p) /* Don't override by the processor default if given explicitly. */ set_masks &= ~rs6000_isa_flags_explicit; - if (global_init_p && rs6000_dejagnu_cpu_index >= 0) - rs6000_cpu_index = rs6000_dejagnu_cpu_index; - /* Process the -mcpu=<xxx> and -mtune=<xxx> argument. If the user changed the cpu in a target attribute or pragma, but did not specify a tuning option, use the cpu for the tuning option rather than the option specified diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h index 6c24b48..9c11a3e 100644 --- a/gcc/config/rs6000/rs6000.h +++ b/gcc/config/rs6000/rs6000.h @@ -77,6 +77,20 @@ #define PPC405_ERRATUM77 0 #endif +#ifndef SUBTARGET_DRIVER_SELF_SPECS +# define SUBTARGET_DRIVER_SELF_SPECS "" +#endif + +/* Only for use in the testsuite: -mdejagnu-cpu= simply overrides -mcpu=. + With older versions of Dejagnu the command line arguments you set in + RUNTESTFLAGS override those set in the testcases; with this option, + the testcase will always win. Ditto for -mdejagnu-tune=. */ +#define DRIVER_SELF_SPECS \ + "%{mdejagnu-cpu=*: %<mcpu=* -mcpu=%*}", \ + "%{mdejagnu-tune=*: %<mtune=* -mtune=%*}", \ + "%{mdejagnu-*: %<mdejagnu-*}", \ + SUBTARGET_DRIVER_SELF_SPECS + #if CHECKING_P #define ASM_OPT_ANY "" #else diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt index 342a349..1b69507 100644 --- a/gcc/config/rs6000/rs6000.opt +++ b/gcc/config/rs6000/rs6000.opt @@ -388,13 +388,6 @@ mtune= Target RejectNegative Joined Var(rs6000_tune_index) Init(-1) Enum(rs6000_cpu_opt_value) Save -mtune= Schedule code for given CPU. -; Only for use in the testsuite. This simply overrides -mcpu=. With older -; versions of Dejagnu the command line arguments you set in RUNTESTFLAGS -; override those set in the testcases; with this option, the testcase will -; always win. -mdejagnu-cpu= -Target Undocumented RejectNegative Joined Var(rs6000_dejagnu_cpu_index) Init(-1) Enum(rs6000_cpu_opt_value) Save - mtraceback= Target RejectNegative Joined Enum(rs6000_traceback_type) Var(rs6000_traceback) -mtraceback=[full,part,no] Select type of traceback table. |