| Message ID | 6137_1552392582_5C87A186_6137_469_1_14193bcc-af2f-41d0-987f-c3154c37b38c@OPEXCLILM6F.corporate.adroot.infra.ftgroup |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/5,v2] toolchain: prepare to pass more additional CFLAGS via the wrapper | expand |
Yann, On Tue, Mar 12, 2019 at 7:10 AM <yann.morin@orange.com> wrote: > > From: "Yann E. MORIN" <yann.morin@orange.com> > > Currently, we repeat all the SSP level selection deep down to the > toolchain wrapper itself, where we eventually translate it to the > actual SSP option to use. This is a bit redundant. > > Additionally, we will want to check that the toolchain actually > supports that option (for those toolchain where it was backported). > > So, move the translation into kconfig, and add the qstrip'ed value > to the additional flags passed to the wrapper. Add it before > user-supplied opitons, to keep the previous behaviour (and allow > anyone crazy-enough to override it with BR2_TARGET_OPTIMIZATION). > > Signed-off-by: "Yann E. MORIN" <yann.morin@orange.com> > Cc: Matt Weber <matthew.weber@rockwellcollins.com> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> > > --- > Changes v1 -> v2: > - use TOOLCHAIN_WRAPPER_OPTS (Arnout) > --- > Config.in | 6 ++++++ > toolchain/toolchain-wrapper.c | 9 --------- > toolchain/toolchain-wrapper.mk | 9 +-------- > 3 files changed, 7 insertions(+), 17 deletions(-) > > diff --git a/Config.in b/Config.in > index d58d8dc04a..757ad1ca40 100644 > --- a/Config.in > +++ b/Config.in > @@ -764,6 +764,12 @@ config BR2_SSP_ALL > > endchoice > > +config BR2_SSP_OPTION > + string > + default "-fstack-protector" if BR2_SSP_REGULAR > + default "-fstack-protector-strong" if BR2_SSP_STRONG > + default "-fstack-protector-all" if BR2_SSP_ALL > + > comment "Stack Smashing Protection needs a toolchain w/ SSP" > depends on !BR2_TOOLCHAIN_HAS_SSP > Much cleaner then when I pulled SSP into the wrapper :-) Reviewed-by: Matthew Weber <matthew.weber@rockwellcollins.com>
On 12/03/2019 13:09, yann.morin@orange.com wrote: > From: "Yann E. MORIN" <yann.morin@orange.com> > > Currently, we repeat all the SSP level selection deep down to the > toolchain wrapper itself, where we eventually translate it to the > actual SSP option to use. This is a bit redundant. > > Additionally, we will want to check that the toolchain actually > supports that option (for those toolchain where it was backported). > > So, move the translation into kconfig, and add the qstrip'ed value > to the additional flags passed to the wrapper. Add it before > user-supplied opitons, to keep the previous behaviour (and allow > anyone crazy-enough to override it with BR2_TARGET_OPTIMIZATION). > > Signed-off-by: "Yann E. MORIN" <yann.morin@orange.com> > Cc: Matt Weber <matthew.weber@rockwellcollins.com> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Applied to master, thanks. Regards, Arnout > > --- > Changes v1 -> v2: > - use TOOLCHAIN_WRAPPER_OPTS (Arnout) > --- > Config.in | 6 ++++++ > toolchain/toolchain-wrapper.c | 9 --------- > toolchain/toolchain-wrapper.mk | 9 +-------- > 3 files changed, 7 insertions(+), 17 deletions(-) > > diff --git a/Config.in b/Config.in > index d58d8dc04a..757ad1ca40 100644 > --- a/Config.in > +++ b/Config.in > @@ -764,6 +764,12 @@ config BR2_SSP_ALL > > endchoice > > +config BR2_SSP_OPTION > + string > + default "-fstack-protector" if BR2_SSP_REGULAR > + default "-fstack-protector-strong" if BR2_SSP_STRONG > + default "-fstack-protector-all" if BR2_SSP_ALL > + > comment "Stack Smashing Protection needs a toolchain w/ SSP" > depends on !BR2_TOOLCHAIN_HAS_SSP > > diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c > index e9c5cd9d32..c73a0cc079 100644 > --- a/toolchain/toolchain-wrapper.c > +++ b/toolchain/toolchain-wrapper.c > @@ -98,15 +98,6 @@ static char *predef_args[] = { > #if defined(BR_MIPS_TARGET_BIG_ENDIAN) || defined(BR_ARC_TARGET_BIG_ENDIAN) > "-EB", > #endif > -#ifdef BR_SSP_REGULAR > - "-fstack-protector", > -#endif > -#ifdef BR_SSP_STRONG > - "-fstack-protector-strong", > -#endif > -#ifdef BR_SSP_ALL > - "-fstack-protector-all", > -#endif > #ifdef BR_ADDITIONAL_CFLAGS > BR_ADDITIONAL_CFLAGS > #endif > diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk > index c9e6fd3f3d..ca66fa7ba4 100644 > --- a/toolchain/toolchain-wrapper.mk > +++ b/toolchain/toolchain-wrapper.mk > @@ -17,6 +17,7 @@ TOOLCHAIN_WRAPPER_ARGS = $($(PKG)_TOOLCHAIN_WRAPPER_ARGS) > TOOLCHAIN_WRAPPER_ARGS += -DBR_SYSROOT='"$(STAGING_SUBDIR)"' > > TOOLCHAIN_WRAPPER_OPTS = \ > + $(call qstrip,$(BR2_SSP_OPTION)) \ > $(call qstrip,$(BR2_TARGET_OPTIMIZATION)) > > # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a > @@ -53,14 +54,6 @@ else ifeq ($(BR2_RELRO_FULL),y) > TOOLCHAIN_WRAPPER_ARGS += -DBR2_RELRO_FULL > endif > > -ifeq ($(BR2_SSP_REGULAR),y) > -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_REGULAR > -else ifeq ($(BR2_SSP_STRONG),y) > -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_STRONG > -else ifeq ($(BR2_SSP_ALL),y) > -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_ALL > -endif > - > define TOOLCHAIN_WRAPPER_BUILD > $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \ > -s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \ >
diff --git a/Config.in b/Config.in index d58d8dc04a..757ad1ca40 100644 --- a/Config.in +++ b/Config.in @@ -764,6 +764,12 @@ config BR2_SSP_ALL endchoice +config BR2_SSP_OPTION + string + default "-fstack-protector" if BR2_SSP_REGULAR + default "-fstack-protector-strong" if BR2_SSP_STRONG + default "-fstack-protector-all" if BR2_SSP_ALL + comment "Stack Smashing Protection needs a toolchain w/ SSP" depends on !BR2_TOOLCHAIN_HAS_SSP diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index e9c5cd9d32..c73a0cc079 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -98,15 +98,6 @@ static char *predef_args[] = { #if defined(BR_MIPS_TARGET_BIG_ENDIAN) || defined(BR_ARC_TARGET_BIG_ENDIAN) "-EB", #endif -#ifdef BR_SSP_REGULAR - "-fstack-protector", -#endif -#ifdef BR_SSP_STRONG - "-fstack-protector-strong", -#endif -#ifdef BR_SSP_ALL - "-fstack-protector-all", -#endif #ifdef BR_ADDITIONAL_CFLAGS BR_ADDITIONAL_CFLAGS #endif diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index c9e6fd3f3d..ca66fa7ba4 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -17,6 +17,7 @@ TOOLCHAIN_WRAPPER_ARGS = $($(PKG)_TOOLCHAIN_WRAPPER_ARGS) TOOLCHAIN_WRAPPER_ARGS += -DBR_SYSROOT='"$(STAGING_SUBDIR)"' TOOLCHAIN_WRAPPER_OPTS = \ + $(call qstrip,$(BR2_SSP_OPTION)) \ $(call qstrip,$(BR2_TARGET_OPTIMIZATION)) # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a @@ -53,14 +54,6 @@ else ifeq ($(BR2_RELRO_FULL),y) TOOLCHAIN_WRAPPER_ARGS += -DBR2_RELRO_FULL endif -ifeq ($(BR2_SSP_REGULAR),y) -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_REGULAR -else ifeq ($(BR2_SSP_STRONG),y) -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_STRONG -else ifeq ($(BR2_SSP_ALL),y) -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_ALL -endif - define TOOLCHAIN_WRAPPER_BUILD $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \ -s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \