diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2020-01-14 08:24:39 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-19 13:24:31 +0000 |
| commit | 9ff90bf04a4c422feaea25180155e4954648f68c (patch) | |
| tree | 72b9b917b2b15dd23b451d3e7a3ce5a2cd3d2a1c /meta | |
| parent | 9d7a5219713af8117eda145052c6d9abdf577d8f (diff) | |
| download | openembedded-core-contrib-9ff90bf04a4c422feaea25180155e4954648f68c.tar.gz | |
mips: Enable gnu-hash-style on glibc
latest glibc 2.31 [1] and binutils [2] has finally added the needed support for
gnu hash-style, which brings mips into same fold as other architectures
Fix check for MIPS specific section for gnu hash information
[1] https://sourceware.org/ml/libc-alpha/2019-06/msg00456.html
[2] https://sourceware.org/ml/binutils/2019-07/msg00098.html
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/insane.bbclass | 5 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 723348fc8e..60b5599b86 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -373,11 +373,10 @@ def package_qa_hash_style(path, name, d, elf, messages): for line in phdrs.split("\n"): if "SYMTAB" in line: has_syms = True - if "GNU_HASH" in line: + if "GNU_HASH" or "DT_MIPS_XHASH" in line: sane = True - if "[mips32]" in line or "[mips64]" in line: + if ("[mips32]" in line or "[mips64]" in line) and d.getVar('TCLIBC') == "musl": sane = True - if has_syms and not sane: package_qa_add_message(messages, "ldflags", "No GNU_HASH in the ELF binary %s, didn't pass LDFLAGS?" % path) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 62b5466b71..8c44f27751 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -586,8 +586,6 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ BUILDSDK_LDFLAGS = "-Wl,-O1" LINKER_HASH_STYLE ??= "gnu" -# mips does not support GNU hash style therefore we override -LINKER_HASH_STYLE_mipsarch = "sysv" TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE') != 'gnu']}" @@ -595,6 +593,8 @@ ASNEEDED ?= "-Wl,--as-needed" export LDFLAGS = "${TARGET_LDFLAGS}" TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE} ${ASNEEDED}" +# mips does not support GNU hash style therefore we override +LINKER_HASH_STYLE_mipsarch_libc-musl = "sysv" # Pass parallel make options to the compile task EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} " |