aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-12-22 08:35:04 -0800
committerArmin Kuster <akuster808@gmail.com>2018-12-30 09:50:41 -0800
commit50ed37995f68c99e98768f24f77ff0b8745a2fa7 (patch)
treed50f7faa31dadf27aa083c5bc9b96eecf17b1aa6
parentcaa776bdcf8ea34c857f45970370bf771075f4bc (diff)
downloadopenembedded-core-contrib-50ed37995f68c99e98768f24f77ff0b8745a2fa7.tar.gz
ilp32 work:
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/classes/siteinfo.bbclass6
-rw-r--r--meta/recipes-devtools/gcc/gcc-multilib-config.inc3
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 411e70478e..b18eb6b6ff 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -20,6 +20,8 @@ def siteinfo_data_for_machine(arch, os, d):
"allarch": "endian-little bit-32", # bogus, but better than special-casing the checks below for allarch
"aarch64": "endian-little bit-64 arm-common arm-64",
"aarch64_be": "endian-big bit-64 arm-common arm-64",
+ "aarch64_ilp32": "endian-little bit-32 arm-common arm-32",
+ "aarch64_be_ilp32": "endian-big bit-32 arm-common arm-32",
"arc": "endian-little bit-32 arc-common",
"arceb": "endian-big bit-32 arc-common",
"arm": "endian-little bit-32 arm-common arm-32",
@@ -80,8 +82,8 @@ def siteinfo_data_for_machine(arch, os, d):
targetinfo = {
"aarch64-linux-gnu": "aarch64-linux",
"aarch64_be-linux-gnu": "aarch64_be-linux",
- "aarch64-linux-gnu_ilp32": "bit-32 aarch64_be-linux arm-32",
- "aarch64_be-linux-gnu_ilp32": "bit-32 aarch64_be-linux arm-32",
+ "aarch64_ilp32-linux-gnu": "bit-32 aarch64-linux arm-32",
+ "aarch64_be_ilp32-linux-gnu": "bit-32 aarch64_be-linux arm-32",
"aarch64-linux-musl": "aarch64-linux",
"aarch64_be-linux-musl": "aarch64_be-linux",
"arm-linux-gnueabi": "arm-linux",
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index 31b8619be3..dbea114d6f 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -153,6 +153,7 @@ python gcc_multilib_setup() {
libdir64 = 'SYSTEMLIBS_DIR'
libdirx32 = 'SYSTEMLIBS_DIR'
libdirn32 = 'SYSTEMLIBS_DIR'
+ libdirilp32 = 'SYSTEMLIBS_DIR'
target_arch = (d.getVar('TARGET_ARCH_MULTILIB_ORIGINAL') if mlprefix
@@ -207,6 +208,8 @@ python gcc_multilib_setup() {
libdirn32 = tune_baselib
elif tune_baselib == 'lib':
libdir32 = tune_baselib
+ elif tune_baselib == 'libilp32':
+ libdirilp32 = tune_baselib
else:
bb.error('Unknown libdir (%s) of the tune : %s' % (tune_baselib, tune))