diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-31 11:38:24 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-31 15:15:13 +0100 |
| commit | fe26f809aaad5d5d608e841c99b817316c5a59a0 (patch) | |
| tree | 73f70f0fce69a1214c8796510b259de8f131d84e | |
| parent | da5d21c3a1ae5d4767b803ba05dcce2f1b3d3808 (diff) | |
| download | openembedded-core-contrib-fe26f809aaad5d5d608e841c99b817316c5a59a0.tar.gz | |
cross-canadian/gcc: Various mips64 fixes
"n32" is a mips64 variant we need to consider when processing the TARGET_OS
extensions. Also add the multilib extensions for mips64.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/cross-canadian.bbclass | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-multilib-config.inc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index dca0b38d2b..80fb472b42 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -31,7 +31,7 @@ python () { tos = d.getVar("TARGET_OS", True) whitelist = [] - for variant in ["", "spe", "x32", "eabi"]: + for variant in ["", "spe", "x32", "eabi", "n32"]: for libc in ["", "uclibc", "musl"]: entry = "linux" if variant and libc: @@ -62,6 +62,8 @@ python () { d.setVar("LIBCEXTENSION", "") d.setVar("ABIEXTENSION", "") d.appendVar("CANADIANEXTRAOS", " linux-gnuspe linux-uclibcspe linux-muslspe") + elif tarch == "mips64": + d.appendVar("CANADIANEXTRAOS", " linux-gnun32 linux-uclibcn32 linux-musln32") if tarch == "arm": d.setVar("TARGET_OS", "linux-gnueabi") else: diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc index 67c33f8a96..cfad50fe1f 100644 --- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc @@ -123,6 +123,7 @@ python gcc_multilib_setup() { 'i586' : ['gcc/config/i386/t-linux64'], 'i686' : ['gcc/config/i386/t-linux64'], 'mips' : ['gcc/config/mips/t-linux64'], + 'mips64' : ['gcc/config/mips/t-linux64'], 'powerpc' : ['gcc/config/rs6000/t-linux64'], 'powerpc64' : ['gcc/config/rs6000/t-linux64'], } @@ -132,6 +133,7 @@ python gcc_multilib_setup() { 'i586' : ['gcc/config/i386/linux64.h'], 'i686' : ['gcc/config/i386/linux64.h'], 'mips' : ['gcc/config/mips/linux64.h'], + 'mips64' : ['gcc/config/mips/linux64.h'], 'powerpc' : ['gcc/config/rs6000/linux64.h'], 'powerpc64' : ['gcc/config/rs6000/linux64.h'], } |