* [PATCH 1/2] uclibc: no need for CONFIG_MIPS_ISA_xxx config options @ 2016-06-10 15:12 André Draszik 2016-06-10 15:12 ` [PATCH 2/2] uclibc: never build with SSP André Draszik 0 siblings, 1 reply; 6+ messages in thread From: André Draszik @ 2016-06-10 15:12 UTC (permalink / raw) To: openembedded-core From: André Draszik <adraszik@tycoint.com> The config option for the mips ISA have been completely removed from uclibc-ng. uclibc doesn't add gcc options based on those config options anymore. Hence we don't need to create them here either. Signed-off-by: André Draszik <adraszik@tycoint.com> --- meta/recipes-core/uclibc/uclibc.inc | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index 1d42284..71d4bdd 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc @@ -88,16 +88,6 @@ python () { if "${OE_DEL}": d.setVar('configmangle_append', "${OE_DEL}" + "\n") - # by default uclibc uses mips1 ISA for o32 ABI - # if we use TARGET_CC_ARCH="-march=mips32" we end up - # with conflicting march options to gcc. Here we - # ask for MIPS32 ISA to match the chosen arch - tune = d.getVar("DEFAULTTUNE", True) - if tune.startswith('mips32'): - import re - tune = re.sub('(el)*(-nf)*', '', tune) - d.setVar('configmangle_append', - "/^### MIPS32_CHECK$/a\\\nCONFIG_MIPS_ISA_%s=y\n\n" % (tune.upper())) if "${OE_FEATURES}": d.setVar('configmangle_append', "/^### DISTRO FEATURES$/a\\\n%s\n\n" % @@ -146,7 +136,6 @@ do_configure() { echo "### FPU" >>${S}/merged.config echo "### ABI" >>${S}/merged.config echo "### DISTRO FEATURES" >>${S}/merged.config - echo "### MIPS32_CHECK" >>${S}/merged.config # Mangle the resulting .config depending on OE variables sed -i -e '${configmangle}' ${S}/merged.config -- 2.8.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] uclibc: never build with SSP 2016-06-10 15:12 [PATCH 1/2] uclibc: no need for CONFIG_MIPS_ISA_xxx config options André Draszik @ 2016-06-10 15:12 ` André Draszik 2016-06-16 0:20 ` Khem Raj 0 siblings, 1 reply; 6+ messages in thread From: André Draszik @ 2016-06-10 15:12 UTC (permalink / raw) To: openembedded-core From: André Draszik <adraszik@tycoint.com> This doesn't work, as the initial gcc that is used for compiling uclibc doesn't have support for SSP yet (since that will only be available once uclibc has been compiled). Since during that same compilation step uclibc is trying to build its own utils those are failing to compile with SSP enabled as the initial gcc doesn't have access to the required libraries, yet. We never used to set UCLIBC_BUILD_SSP in the past, this was only changed as part of the upgrade to uclibc-ng in commit 63bdadc (uclibc: Switch to using uclibc-ng), so here we now simply restore the previous behaviour. Note that we still enable SSP support inside uclibc for everybody else to use, though. Signed-off-by: André Draszik <adraszik@tycoint.com> --- meta/recipes-core/uclibc/uclibc-config.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/meta/recipes-core/uclibc/uclibc-config.inc index ed7b522..8b9e41c 100644 --- a/meta/recipes-core/uclibc/uclibc-config.inc +++ b/meta/recipes-core/uclibc/uclibc-config.inc @@ -119,7 +119,6 @@ def features_to_uclibc_settings(d): uclibc_cfg('thumb-interwork', distro_features,'USE_BX', cnf, rem) uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem) uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem) - uclibc_cfg('ssp', distro_features, 'UCLIBC_BUILD_SSP', cnf, rem) uclibc_cfg('argp', distro_features, 'UCLIBC_HAS_ARGP', cnf, rem) uclibc_cfg('libc-posix-clang-wchar', distro_features,'UCLIBC_HAS_WCHAR', cnf, rem) return "\n".join(cnf), "\n".join(rem) -- 2.8.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] uclibc: never build with SSP 2016-06-10 15:12 ` [PATCH 2/2] uclibc: never build with SSP André Draszik @ 2016-06-16 0:20 ` Khem Raj 2016-06-20 14:48 ` André Draszik 0 siblings, 1 reply; 6+ messages in thread From: Khem Raj @ 2016-06-16 0:20 UTC (permalink / raw) To: André Draszik; +Cc: Patches and discussions about the oe-core layer On Fri, Jun 10, 2016 at 8:12 AM, André Draszik <git@andred.net> wrote: > From: André Draszik <adraszik@tycoint.com> > > This doesn't work, as the initial gcc that is used for compiling > uclibc doesn't have support for SSP yet (since that will only > be available once uclibc has been compiled). Since during that > same compilation step uclibc is trying to build its own utils > those are failing to compile with SSP enabled as the > initial gcc doesn't have access to the required libraries, > yet. Please look at how we do this for glibc based systems. This patch is not something we need. > > We never used to set UCLIBC_BUILD_SSP in the past, this was > only changed as part of the upgrade to uclibc-ng in > commit 63bdadc (uclibc: Switch to using uclibc-ng), so here > we now simply restore the previous behaviour. > > Note that we still enable SSP support inside uclibc for > everybody else to use, though. > > Signed-off-by: André Draszik <adraszik@tycoint.com> > --- > meta/recipes-core/uclibc/uclibc-config.inc | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/meta/recipes-core/uclibc/uclibc-config.inc > index ed7b522..8b9e41c 100644 > --- a/meta/recipes-core/uclibc/uclibc-config.inc > +++ b/meta/recipes-core/uclibc/uclibc-config.inc > @@ -119,7 +119,6 @@ def features_to_uclibc_settings(d): > uclibc_cfg('thumb-interwork', distro_features,'USE_BX', cnf, rem) > uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem) > uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem) > - uclibc_cfg('ssp', distro_features, 'UCLIBC_BUILD_SSP', cnf, rem) > uclibc_cfg('argp', distro_features, 'UCLIBC_HAS_ARGP', cnf, rem) > uclibc_cfg('libc-posix-clang-wchar', distro_features,'UCLIBC_HAS_WCHAR', cnf, rem) > return "\n".join(cnf), "\n".join(rem) > -- > 2.8.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] uclibc: never build with SSP 2016-06-16 0:20 ` Khem Raj @ 2016-06-20 14:48 ` André Draszik 2016-06-20 15:21 ` André Draszik 2016-06-21 16:12 ` Khem Raj 0 siblings, 2 replies; 6+ messages in thread From: André Draszik @ 2016-06-20 14:48 UTC (permalink / raw) To: Khem Raj; +Cc: Patches and discussions about the oe-core layer Hi Khem, On Mi, 2016-06-15 at 17:20 -0700, Khem Raj wrote: > On Fri, Jun 10, 2016 at 8:12 AM, André Draszik <git@andred.net> wrote: > > From: André Draszik <adraszik@tycoint.com> > > > > This doesn't work, as the initial gcc that is used for compiling > > uclibc doesn't have support for SSP yet (since that will only > > be available once uclibc has been compiled). Since during that > > same compilation step uclibc is trying to build its own utils > > those are failing to compile with SSP enabled as the > > initial gcc doesn't have access to the required libraries, > > yet. > > Please look at how we do this for glibc based systems. Are you saying glibc is compiled *with* SSP enabled? I can't seem to find anything relevant. The only thing I can find seems to result in glibc and (and glibc-initial) and all glibc executables (!) being compiled without stack protector. As you seem to have something in mind, can you please be more specific and give me a pointer? > This patch is > not something we need. This patch fixes uclibc builds when SSP has been enabled by including security_flags.inc in distro.conf. Why is it not needed? Can you be more specific please? Cheers, Andre ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] uclibc: never build with SSP 2016-06-20 14:48 ` André Draszik @ 2016-06-20 15:21 ` André Draszik 2016-06-21 16:12 ` Khem Raj 1 sibling, 0 replies; 6+ messages in thread From: André Draszik @ 2016-06-20 15:21 UTC (permalink / raw) To: Khem Raj; +Cc: Patches and discussions about the oe-core layer On Mo, 2016-06-20 at 15:48 +0100, André Draszik wrote: > This patch fixes uclibc builds when SSP has been enabled by including > security_flags.inc in distro.conf Should read: This patch fixes uclibc builds when SSP has been enabled by including security_flags.inc in distro.conf and adding "ssp" to DISTRO_FEATURES. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] uclibc: never build with SSP 2016-06-20 14:48 ` André Draszik 2016-06-20 15:21 ` André Draszik @ 2016-06-21 16:12 ` Khem Raj 1 sibling, 0 replies; 6+ messages in thread From: Khem Raj @ 2016-06-21 16:12 UTC (permalink / raw) To: André Draszik; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 1652 bytes --] > On Jun 20, 2016, at 7:48 AM, André Draszik <git@andred.net> wrote: > > Hi Khem, > > On Mi, 2016-06-15 at 17:20 -0700, Khem Raj wrote: >> On Fri, Jun 10, 2016 at 8:12 AM, André Draszik <git@andred.net> wrote: >>> From: André Draszik <adraszik@tycoint.com> >>> >>> This doesn't work, as the initial gcc that is used for compiling >>> uclibc doesn't have support for SSP yet (since that will only >>> be available once uclibc has been compiled). Since during that >>> same compilation step uclibc is trying to build its own utils >>> those are failing to compile with SSP enabled as the >>> initial gcc doesn't have access to the required libraries, >>> yet. >> >> Please look at how we do this for glibc based systems. > > Are you saying glibc is compiled *with* SSP enabled? We set the ssp variables manually (gcc_cv_libc_provides_ssp=yes), when building gcc initial. which should suffice for building core libraries. If uclibc build extra utils then lets spin that via a separate recipe something like uclibc-utils or some such which is built later than uclibc. > > I can't seem to find anything relevant. The only thing I can find seems to > result in glibc and (and glibc-initial) and all glibc executables (!) being > compiled without stack protector. As you seem to have something in mind, can > you please be more specific and give me a pointer? > > >> This patch is >> not something we need. > > This patch fixes uclibc builds when SSP has been enabled by including > security_flags.inc in distro.conf. Why is it not needed? Can you be more > specific please? > > > Cheers, > Andre [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 211 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-21 16:12 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-06-10 15:12 [PATCH 1/2] uclibc: no need for CONFIG_MIPS_ISA_xxx config options André Draszik 2016-06-10 15:12 ` [PATCH 2/2] uclibc: never build with SSP André Draszik 2016-06-16 0:20 ` Khem Raj 2016-06-20 14:48 ` André Draszik 2016-06-20 15:21 ` André Draszik 2016-06-21 16:12 ` Khem Raj
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox