https://gcc.gnu.org/g:293140dfc6dbe7ab70c1f031f0dac6939bb084d6
commit r11-11382-g293140dfc6dbe7ab70c1f031f0dac6939bb084d6 Author: Francois-Xavier Coudert <fxcoud...@gcc.gnu.org> Date: Mon Oct 30 12:41:17 2023 +0100 Testsuite, Darwin: Adjust handling of PIE test gcc/ChangeLog: * config/darwin.c (darwin_override_options): Cannot use OPTION_SET_P here. gcc/testsuite/ChangeLog: * gcc.dg/pie-2.c: Skip test on darwin. (cherry picked from commit a0c557690c8d5327deda6e21f8d1deca8451a4cb) Co-authored-by: Iain Sandoe <i...@sandoe.co.uk> Diff: --- gcc/config/darwin.c | 2 +- gcc/testsuite/gcc.dg/pie-2.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 61f04a1b209..2a3de33ee95 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -3455,7 +3455,7 @@ darwin_override_options (void) && write_symbols == DWARF2_DEBUG) flag_var_tracking_uninit = flag_var_tracking; - if (OPTION_SET_P (flag_pie) && flag_pie) + if (global_options_set.x_flag_pie && flag_pie) { /* This is a little complicated, to match Xcode tools. For Darwin, PIE requires PIC codegen, but otherwise is only a link- diff --git a/gcc/testsuite/gcc.dg/pie-2.c b/gcc/testsuite/gcc.dg/pie-2.c index 1838745a11a..0a1cc27a503 100644 --- a/gcc/testsuite/gcc.dg/pie-2.c +++ b/gcc/testsuite/gcc.dg/pie-2.c @@ -2,6 +2,7 @@ /* { dg-options "-fPIE" } */ /* { dg-require-effective-target pie } */ /* { dg-skip-if "__PIC__ is always 1 for MIPS" { mips*-*-* } } */ +/* { dg-skip-if "__PIE__ is often not defined on darwin" { *-*-darwin* } } */ #if __PIC__ != 2 # error __PIC__ is not 2!