diff options
| author | Kewen Lin <linkw@linux.ibm.com> | 2024-07-23 00:48:14 -0500 |
|---|---|---|
| committer | Kewen Lin <linkw@gcc.gnu.org> | 2024-07-23 00:50:59 -0500 |
| commit | f4062e361cccc5a32597afdb6c8066c87f680276 (patch) | |
| tree | d28366bee4689501d412f5f3b81f413b0c9dd42e | |
| parent | e6db8848d956f5e712dd621d33630b799ff60a72 (diff) | |
| download | gcc-f4062e361cccc5a32597afdb6c8066c87f680276.zip gcc-f4062e361cccc5a32597afdb6c8066c87f680276.tar.gz gcc-f4062e361cccc5a32597afdb6c8066c87f680276.tar.bz2 | |
rs6000: Update option set in rs6000_inner_target_options [PR115713]
When function rs6000_inner_target_options parsing target
options, it updates the explicit option set information for
rs6000_opt_masks by rs6000_isa_flags_explicit, but it misses
to update that information for rs6000_opt_vars, and it can
result in some unexpected consequence as the associated test
case shows. This patch is to fix rs6000_inner_target_options
to update the option set for rs6000_opt_vars as well.
PR target/115713
gcc/ChangeLog:
* config/rs6000/rs6000.cc (rs6000_inner_target_options): Update option
set information for rs6000_opt_vars.
gcc/testsuite/ChangeLog:
* gcc.target/powerpc/pr115713-2.c: New test.
| -rw-r--r-- | gcc/config/rs6000/rs6000.cc | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/powerpc/pr115713-2.c | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index ce888d3..8521156 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -24694,7 +24694,8 @@ rs6000_inner_target_options (tree args, bool attr_p) if (strcmp (r, rs6000_opt_vars[i].name) == 0) { size_t j = rs6000_opt_vars[i].global_offset; - *((int *) ((char *)&global_options + j)) = !invert; + *((int *) ((char *) &global_options + j)) = !invert; + *((int *) ((char *) &global_options_set + j)) = 1; error_p = false; not_valid_p = false; break; diff --git a/gcc/testsuite/gcc.target/powerpc/pr115713-2.c b/gcc/testsuite/gcc.target/powerpc/pr115713-2.c new file mode 100644 index 0000000..47b39c0 --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr115713-2.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* Force power7 to avoid possible error message on AltiVec ABI change. */ +/* { dg-options "-mdejagnu-cpu=power7" } */ + +/* Verify there is an error message for -mvsx incompatible with + -mavoid-indexed-addresses even when they are specified by + target attributes. */ + +int __attribute__ ((target ("avoid-indexed-addresses,vsx"))) +test1 (void) +{ + /* { dg-error "'-mvsx' and '-mavoid-indexed-addresses' are incompatible" "" { target *-*-* } .-1 } */ + return 0; +} + +int __attribute__ ((target ("vsx,avoid-indexed-addresses"))) +test2 (void) +{ + /* { dg-error "'-mvsx' and '-mavoid-indexed-addresses' are incompatible" "" { target *-*-* } .-1 } */ + return 0; +} + |