diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2015-07-01 17:02:22 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-01 07:34:05 +0100 |
| commit | 7b56b2cf617ed3de3639347ca87b8f669ecaf2ae (patch) | |
| tree | fda83da28fd003d7a0804ded760490621a089a1a | |
| parent | 05879d6cef190bc824b62722f505d89e19120799 (diff) | |
| download | poky-7b56b2cf617ed3de3639347ca87b8f669ecaf2ae.tar.gz | |
glibc: don't override TUNE_CCARGS for MIPS
Overriding TUNE_CCARGS this way breaks MULTILIB setup for MIPS. This
override disables multilib handling of tunes for TUNE_CCARGS, thus
enforcing glibc's TUNE_CCARGS to the TUNE_CCARGS of main DEFAULTTUNE.
Glibc perfectly build without this override for both simple and multilib
cases.
(From OE-Core rev: da5d21c3a1ae5d4767b803ba05dcce2f1b3d3808)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/glibc/glibc_2.21.bb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb index 30f19376e8..55424bfaac 100644 --- a/meta/recipes-core/glibc/glibc_2.21.bb +++ b/meta/recipes-core/glibc/glibc_2.21.bb | |||
| @@ -95,16 +95,6 @@ do_patch_append() { | |||
| 95 | bb.build.exec_func('do_fix_readlib_c', d) | 95 | bb.build.exec_func('do_fix_readlib_c', d) |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | # for mips glibc now builds syscall tables for all abi's | ||
| 99 | # so we make sure that we choose right march option which is | ||
| 100 | # compatible with o32,n32 and n64 abi's | ||
| 101 | # e.g. -march=mips32 is not compatible with n32 and n64 therefore | ||
| 102 | # we filter it out in such case -march=from-abi which will be | ||
| 103 | # mips1 when using o32 and mips3 when using n32/n64 | ||
| 104 | |||
| 105 | TUNE_CCARGS_mips := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}" | ||
| 106 | TUNE_CCARGS_mipsel := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}" | ||
| 107 | |||
| 108 | do_fix_readlib_c () { | 98 | do_fix_readlib_c () { |
| 109 | sed -i -e 's#OECORE_KNOWN_INTERPRETER_NAMES#${EGLIBC_KNOWN_INTERPRETER_NAMES}#' ${S}/elf/readlib.c | 99 | sed -i -e 's#OECORE_KNOWN_INTERPRETER_NAMES#${EGLIBC_KNOWN_INTERPRETER_NAMES}#' ${S}/elf/readlib.c |
| 110 | } | 100 | } |
