diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-28 15:59:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-30 16:51:15 +0100 |
commit | b6253350fb86d8e54792905342a5892af570d526 (patch) | |
tree | c678c28bb301380d6c14c25cdc769515cc3f0603 /meta/classes | |
parent | e0e8cd039cc760b6eb24a6d52e7d7bf09aef0abc (diff) | |
download | poky-b6253350fb86d8e54792905342a5892af570d526.tar.gz |
cross-canadian/libgcc-common: Fixes for arm multilib
Arm is unusual in that we force it to "linux-gnueabi" and "linux" doesn't
build. This was causing problems for multilib configurations which were assuming
"linux" was the default compiler rather than linux-gnueabi.
This change does two things, ensures symlinks are generated for linux-gnueabi
and also adapts the libgcc code to account for the difference on arm.
It still needs to immediately expand/save TARGET_VENDOR but we defer
deciding what TARGET_OS should be until we know TARGET_ARCH (which the
multilib code may change).
[YOCTO #8642]
Note that sanity tests of a 32 bit arm multilib still break due to issues
with the kernel headers on a mixed bit system. This looks to be a general
headers issue for the platform though and a different type of bug.
(From OE-Core rev: bcddc3e7eff138add031bc9c9728be5a42fa62ef)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/cross-canadian.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 099c0daf42..21921b3dd0 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass | |||
@@ -80,7 +80,7 @@ python () { | |||
80 | for extraos in d.getVar("BASECANADIANEXTRAOS", True).split(): | 80 | for extraos in d.getVar("BASECANADIANEXTRAOS", True).split(): |
81 | d.appendVar("CANADIANEXTRAOS", " " + extraos + "n32") | 81 | d.appendVar("CANADIANEXTRAOS", " " + extraos + "n32") |
82 | if tarch == "arm" or tarch == "armeb": | 82 | if tarch == "arm" or tarch == "armeb": |
83 | d.appendVar("CANADIANEXTRAOS", " linux-musleabi linux-uclibceabi") | 83 | d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi linux-uclibceabi") |
84 | d.setVar("TARGET_OS", "linux-gnueabi") | 84 | d.setVar("TARGET_OS", "linux-gnueabi") |
85 | else: | 85 | else: |
86 | d.setVar("TARGET_OS", "linux") | 86 | d.setVar("TARGET_OS", "linux") |