mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-09 02:03:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

glibc.inc: improve optimisation level sanity checking

Browse Source 
- Avoid code duplication to handle -O, -O1 and -Os cases

- Consider the effective optimisation level only (avoids spurious
  warnings if multiple optimisation flags are present).

- Prefix warnings with PN instead of hardcoding "glibc" (avoids
  confusing warnings since the test is also applied to glibc-initial,
  nativesdk-glibc, nativesdk-glibc-initial, etc, and each could
  potentually have different optimisation flags).

(From OE-Core rev: 9d72015e3458c78a9f0d20ad3dc27c8a9bb1069c)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy
2016-02-24 14:39:33 -08:00
committed by Richard Purdie
parent 04c4719012
commit 77cfa2bcd7
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/recipes-core/glibc/glibc.inc
View File

@@ -8,19 +8,15 @@ PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
# glibc can't be built without optimization, if someone tries to compile an
# entire image as -O0, break with fatal.
python () {
if bb.utils.contains("SELECTED_OPTIMIZATION", "-O", "x", "", d) == "x":
bb.note("glibc can't be built with -O, -O -Wno-error will be used instead.")
d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error")
elif bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
bb.fatal("glibc can't be built with -O0, using -O1 -Wno-error or -O1 instead.")
elif bb.utils.contains("SELECTED_OPTIMIZATION", "-Os", "x", "", d) == "x":
bb.note("glibc can't be built with -Os, -Os -Wno-error will be used instead.")
d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error")
elif bb.utils.contains("SELECTED_OPTIMIZATION", "-O1", "x", "", d) == "x":
bb.note("glibc can't be built with -O1, -O1 -Wno-error will be used instead.")
opt_effective = "-O"
for opt in d.getVar('SELECTED_OPTIMIZATION', True).split():
if opt in ("-O0", "-O", "-O1", "-O2", "-O3", "-Os"):
opt_effective = opt
if opt_effective == "-O0":
bb.fatal("%s can't be built with %s, try -O1 instead" % (d.getVar('PN', True), opt_effective))
if opt_effective in ("-O", "-O1", "-Os"):
bb.note("%s doesn't build cleanly with %s, adding -Wno-error to SELECTED_OPTIMIZATION" % (d.getVar('PN', True), opt_effective))
d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error")
}