On Mon, Jul 31, 2017 at 08:04:13AM -0700, H.J. Lu wrote: > On Mon, Jul 24, 2017 at 10:24 AM, H.J. Lu <hjl.to...@gmail.com> wrote: > > On Sun, Jul 23, 2017 at 8:14 AM, H.J. Lu <hjl.to...@gmail.com> wrote: > >> -static and -pie together behave differently depending on whether GCC is > >> configured with --enable-default-pie. On x86, "-static -pie" fails to > >> create executable when --enable-default-pie isn't used, but creates a > >> static executable when --enable-default-pie is used. This patch makes > >> -static completely override -pie to create a static executable, regardless > >> if --enable-default-pie is used to configure GCC. > >> > >> OK for master? > >> > >> H.J. > >> -- > >> 2017-07-23 Alan Modra <amo...@gmail.com> > >> H.J. Lu <hongjiu...@intel.com> > >> > >> gcc/ > >> > >> PR driver/81523 > >> * gcc.c (NO_PIE_SPEC): Delete. > >> (PIE_SPEC): Define as !no-pie/pie. Move static|shared|r > >> exclusion.. > >> (LINK_PIE_SPEC): ..to here. > >> * config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Correct > >> chain of crtbegin*.o selection, update for PIE_SPEC changes and > >> format. > >> (GNU_USER_TARGET_ENDFILE_SPEC): Similarly. > >> * config/sol2.h (STARTFILE_CRTBEGIN_SPEC): Similarly. > >> (ENDFILE_CRTEND_SPEC): Similarly. > >> > > > > We need to add %{no-pie:} to LINK_COMMAND_SPEC to prevent an error > > message when PIE isn't enabled by default. Here is the updated patch with > > a testcase. > > > > PING. I am enclosing the patch here.
For anyone looking at this, the patch enclosed here is mine from https://gcc.gnu.org/ml/gcc-patches/2017-06/msg01678.html minus some PR numbers and the powerpc specific part, plus testsuite (which looks to me like HJ copied pie-static-1.c to pie-static-2.c then forgot to change the order of -pie and -static), plus a tweak to LINK_COMMAND_SPEC. The LINK_COMMAND_SPEC change looks good to me, except for the comment which doesn't exactly match the code. That change is necessary because I ignorantly removed %{no-pie:} from LINK_PIE_SPEC without adding it back elsewhere. > > Thanks. > > > -- > H.J. > From ea702c99286ab92a4b94f676d2340ce55fd173c3 Mon Sep 17 00:00:00 2001 > From: Alan Modra <amo...@gmail.com> > Date: Thu, 20 Jul 2017 09:57:36 -0700 > Subject: [PATCH] PR driver/81523: Make -static override -pie > > -static and -pie together behave differently depending on whether GCC is > configured with --enable-default-pie. On x86, "-static -pie" fails to > create executable when --enable-default-pie isn't used, but creates a > static executable when --enable-default-pie is used. This patch makes > -static completely override -pie to create a static executable, regardless > if --enable-default-pie is used to configure GCC. > > 2017-07-24 Alan Modra <amo...@gmail.com> > H.J. Lu <hongjiu...@intel.com> > > gcc/ > > PR driver/81523 > * gcc.c (NO_PIE_SPEC): Delete. > (PIE_SPEC): Define as !no-pie/pie. Move static|shared|r > exclusion.. > (LINK_PIE_SPEC): ..to here. > (LINK_COMMAND_SPEC): Support -no-pie. > * config/gnu-user.h (GNU_USER_TARGET_STARTFILE_SPEC): Correct > chain of crtbegin*.o selection, update for PIE_SPEC changes and > format. > (GNU_USER_TARGET_ENDFILE_SPEC): Similarly. > * config/sol2.h (STARTFILE_CRTBEGIN_SPEC): Similarly. > (ENDFILE_CRTEND_SPEC): Similarly. > > gcc/testsuite/ > > PR driver/81523 > * gcc.dg/pie-7.c: New test. > * gcc.dg/pie-static-1.c: Likewise. > * gcc.dg/pie-static-2.c: Likewise. > --- > gcc/config/gnu-user.h | 34 ++++++++++++++++++++++++---------- > gcc/config/sol2.h | 12 ++++++------ > gcc/gcc.c | 10 +++++----- > gcc/testsuite/gcc.dg/pie-7.c | 7 +++++++ > gcc/testsuite/gcc.dg/pie-static-1.c | 7 +++++++ > gcc/testsuite/gcc.dg/pie-static-2.c | 7 +++++++ > 6 files changed, 56 insertions(+), 21 deletions(-) > create mode 100644 gcc/testsuite/gcc.dg/pie-7.c > create mode 100644 gcc/testsuite/gcc.dg/pie-static-1.c > create mode 100644 gcc/testsuite/gcc.dg/pie-static-2.c > > diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h > index 2787a3d16be..de605b0c466 100644 > --- a/gcc/config/gnu-user.h > +++ b/gcc/config/gnu-user.h > @@ -50,19 +50,28 @@ see the files COPYING3 and COPYING.RUNTIME respectively. > If not, see > > #if defined HAVE_LD_PIE > #define GNU_USER_TARGET_STARTFILE_SPEC \ > - "%{!shared: %{pg|p|profile:gcrt1.o%s;: \ > - %{" PIE_SPEC ":Scrt1.o%s} %{" NO_PIE_SPEC ":crt1.o%s}}} \ > - crti.o%s %{static:crtbeginT.o%s;: %{shared:crtbeginS.o%s} \ > - %{" PIE_SPEC ":crtbeginS.o%s} \ > - %{" NO_PIE_SPEC ":crtbegin.o%s}} \ > + "%{shared:; \ > + pg|p|profile:gcrt1.o%s; \ > + static:crt1.o%s; \ > + " PIE_SPEC ":Scrt1.o%s; \ > + :crt1.o%s} \ > + crti.o%s \ > + %{static:crtbeginT.o%s; \ > + shared|" PIE_SPEC ":crtbeginS.o%s; \ > + :crtbegin.o%s} \ > %{fvtable-verify=none:%s; \ > fvtable-verify=preinit:vtv_start_preinit.o%s; \ > fvtable-verify=std:vtv_start.o%s} \ > " CRTOFFLOADBEGIN > #else > #define GNU_USER_TARGET_STARTFILE_SPEC \ > - "%{!shared: %{pg|p|profile:gcrt1.o%s;:crt1.o%s}} \ > - crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \ > + "%{shared:; \ > + pg|p|profile:gcrt1.o%s; \ > + :crt1.o%s} \ > + crti.o%s \ > + %{static:crtbeginT.o%s; \ > + shared|pie:crtbeginS.o%s; \ > + :crtbegin.o%s} \ > %{fvtable-verify=none:%s; \ > fvtable-verify=preinit:vtv_start_preinit.o%s; \ > fvtable-verify=std:vtv_start.o%s} \ > @@ -82,15 +91,20 @@ see the files COPYING3 and COPYING.RUNTIME respectively. > If not, see > "%{fvtable-verify=none:%s; \ > fvtable-verify=preinit:vtv_end_preinit.o%s; \ > fvtable-verify=std:vtv_end.o%s} \ > - %{shared:crtendS.o%s;: %{" PIE_SPEC ":crtendS.o%s} \ > - %{" NO_PIE_SPEC ":crtend.o%s}} crtn.o%s \ > + %{static:crtend.o%s; \ > + shared|" PIE_SPEC ":crtendS.o%s; \ > + :crtend.o%s} \ > + crtn.o%s \ > " CRTOFFLOADEND > #else > #define GNU_USER_TARGET_ENDFILE_SPEC \ > "%{fvtable-verify=none:%s; \ > fvtable-verify=preinit:vtv_end_preinit.o%s; \ > fvtable-verify=std:vtv_end.o%s} \ > - %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s \ > + %{static:crtend.o%s; \ > + shared|pie:crtendS.o%s; \ > + :crtend.o%s} \ > + crtn.o%s \ > " CRTOFFLOADEND > #endif > #undef ENDFILE_SPEC > diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h > index b8398d082a9..bf5203b8c16 100644 > --- a/gcc/config/sol2.h > +++ b/gcc/config/sol2.h > @@ -174,9 +174,9 @@ along with GCC; see the file COPYING3. If not see > %{!ansi:values-Xa.o%s}" > > #if defined(HAVE_LD_PIE) && defined(HAVE_SOLARIS_CRTS) > -#define STARTFILE_CRTBEGIN_SPEC "%{shared:crtbeginS.o%s} \ > - %{" PIE_SPEC ":crtbeginS.o%s} \ > - %{" NO_PIE_SPEC ":crtbegin.o%s}" > +#define STARTFILE_CRTBEGIN_SPEC "%{static:crtbegin.o%s; \ > + shared|" PIE_SPEC ":crtbeginS.o%s; \ > + :crtbegin.o%s}" > #else > #define STARTFILE_CRTBEGIN_SPEC "crtbegin.o%s" > #endif > @@ -224,9 +224,9 @@ along with GCC; see the file COPYING3. If not see > #endif > > #if defined(HAVE_LD_PIE) && defined(HAVE_SOLARIS_CRTS) > -#define ENDFILE_CRTEND_SPEC "%{shared:crtendS.o%s;: \ > - %{" PIE_SPEC ":crtendS.o%s} \ > - %{" NO_PIE_SPEC ":crtend.o%s}}" > +#define ENDFILE_CRTEND_SPEC "%{static:crtend.o%s; \ > + shared|" PIE_SPEC ":crtendS.o%s; \ > + :crtend.o%s}" > #else > #define ENDFILE_CRTEND_SPEC "crtend.o%s" > #endif > diff --git a/gcc/gcc.c b/gcc/gcc.c > index d8c5260e36b..7cb2dba89a5 100644 > --- a/gcc/gcc.c > +++ b/gcc/gcc.c > @@ -878,8 +878,7 @@ proper position among the other output files. */ > #endif > > #ifdef ENABLE_DEFAULT_PIE > -#define NO_PIE_SPEC "no-pie|static" > -#define PIE_SPEC NO_PIE_SPEC "|r|shared:;" > +#define PIE_SPEC "!no-pie" > #define NO_FPIE1_SPEC "fno-pie" > #define FPIE1_SPEC NO_FPIE1_SPEC ":;" > #define NO_FPIE2_SPEC "fno-PIE" > @@ -900,7 +899,6 @@ proper position among the other output files. */ > #define FPIE_OR_FPIC_SPEC NO_FPIE_AND_FPIC_SPEC ":;" > #else > #define PIE_SPEC "pie" > -#define NO_PIE_SPEC PIE_SPEC "|r|shared:;" > #define FPIE1_SPEC "fpie" > #define NO_FPIE1_SPEC FPIE1_SPEC ":;" > #define FPIE2_SPEC "fPIE" > @@ -929,7 +927,7 @@ proper position among the other output files. */ > #else > #define LD_PIE_SPEC "" > #endif > -#define LINK_PIE_SPEC "%{no-pie:} " "%{" PIE_SPEC ":" LD_PIE_SPEC "} " > +#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} " > #endif > > #ifndef LINK_BUILDID_SPEC > @@ -1019,6 +1017,8 @@ proper position among the other output files. */ > /* -u* was put back because both BSD and SysV seem to support it. */ > /* %{static:} simply prevents an error message if the target machine > doesn't handle -static. */ > +/* %{no-pie:} simply prevents an error message when PIE isn't enabled > + by default. */ > /* We want %{T*} after %{L*} and %D so that it can be used to specify linker > scripts which exist in user specified directories, or in standard > directories. */ > @@ -1035,7 +1035,7 @@ proper position among the other output files. */ > "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ > "%X %{o*} %{e*} %{N} %{n} %{r}\ > %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} \ > - %{static:} %{L*} %(mfwrap) %(link_libgcc) " \ > + %{static|no-pie:} %{L*} %(mfwrap) %(link_libgcc) " \ > VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o " CHKP_SPEC " \ > %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ > %:include(libgomp.spec)%(link_gomp)}\ > diff --git a/gcc/testsuite/gcc.dg/pie-7.c b/gcc/testsuite/gcc.dg/pie-7.c > new file mode 100644 > index 00000000000..e118a98bafd > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/pie-7.c > @@ -0,0 +1,7 @@ > +/* { dg-do run { target pie } } */ > +/* { dg-options "-fno-pie -no-pie" } */ > + > +int main(void) > +{ > + return 0; > +} > diff --git a/gcc/testsuite/gcc.dg/pie-static-1.c > b/gcc/testsuite/gcc.dg/pie-static-1.c > new file mode 100644 > index 00000000000..f3580efdfe6 > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/pie-static-1.c > @@ -0,0 +1,7 @@ > +/* { dg-do run { target pie } } */ > +/* { dg-options "-static -fpie -pie" } */ > + > +int main(void) > +{ > + return 0; > +} > diff --git a/gcc/testsuite/gcc.dg/pie-static-2.c > b/gcc/testsuite/gcc.dg/pie-static-2.c > new file mode 100644 > index 00000000000..f3580efdfe6 > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/pie-static-2.c > @@ -0,0 +1,7 @@ > +/* { dg-do run { target pie } } */ > +/* { dg-options "-static -fpie -pie" } */ > + > +int main(void) > +{ > + return 0; > +} > -- > 2.13.3 > -- Alan Modra Australia Development Lab, IBM