aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois-Xavier Coudert <fxcoudert@gcc.gnu.org>2023-10-30 12:41:17 +0100
committerIain Sandoe <iain@sandoe.co.uk>2024-04-27 17:20:05 +0100
commit293140dfc6dbe7ab70c1f031f0dac6939bb084d6 (patch)
tree81050ab7eb7fd88bcd8a9362e1d546815ecbe657
parent65f028e25fd0239b0b2ba6485653fd4dce131da8 (diff)
downloadgcc-upstream-293140dfc6dbe7ab70c1f031f0dac6939bb084d6.tar.gz
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 <iain@sandoe.co.uk>
-rw-r--r--gcc/config/darwin.c2
-rw-r--r--gcc/testsuite/gcc.dg/pie-2.c1
2 files changed, 2 insertions, 1 deletions
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!