diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2011-07-29 22:26:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-15 15:26:17 +0100 |
commit | fb2dfe7ac8e70d2969ebe14995900217e54716f6 (patch) | |
tree | fb5d68f641ca6d06d40e59217ea4d3bd000256db /meta/recipes-core/eglibc/eglibc-ld.inc | |
parent | 375cf1561c0c9356a629495256423b44ddced9b6 (diff) | |
download | poky-fb2dfe7ac8e70d2969ebe14995900217e54716f6.tar.gz |
eglibc: Modify ldd script according to multilib config.
Bug fixing [YOCTO #1236].
1. Collect all the values for RTLDLIST for the current multilib
configuration to modify the ldd scripts.
2. Collect all the values for KNOWN_INTERPRETER_NAMES for the current
multilib configuration. Set the correct ld.so names for ldconfig to deal
with the multilib configuration.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-ld.inc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-ld.inc | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-ld.inc b/meta/recipes-core/eglibc/eglibc-ld.inc new file mode 100644 index 0000000000..b3eb46e160 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-ld.inc | |||
@@ -0,0 +1,54 @@ | |||
1 | def ld_append_if_tune_exists(d, infos, dict): | ||
2 | tune = d.getVar("DEFAULTTUNE", True) or "" | ||
3 | libdir = d.getVar("base_libdir", True) or "" | ||
4 | if dict.has_key(tune): | ||
5 | infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }') | ||
6 | infos['lddrewrite'].add(libdir+'/'+dict[tune][0]) | ||
7 | |||
8 | def eglibc_dl_info(d): | ||
9 | ld_info_all = { | ||
10 | "mips": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
11 | "mips64-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
12 | "mips64": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
13 | "mipsel": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
14 | "mips64el-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
15 | "mips64el": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
16 | "mips-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
17 | "mips64-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
18 | "mips64-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
19 | "mips64el-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
20 | "mips64el-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
21 | "powerpc": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
22 | "powerpc-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], | ||
23 | "powerpc64": ["ld64.so.1", "FLAG_ELF_LIBC6"], | ||
24 | "powerpc64-nf": ["ld64.so.1", "FLAG_ELF_LIBC6"], | ||
25 | "core2": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], | ||
26 | "core2-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"], | ||
27 | "x86": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], | ||
28 | "x86-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"], | ||
29 | "i586": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], | ||
30 | } | ||
31 | |||
32 | infos = {'ldconfig':set(), 'lddrewrite':set()} | ||
33 | ld_append_if_tune_exists(d, infos, ld_info_all) | ||
34 | |||
35 | #DEFAULTTUNE_MULTILIB_ORIGINAL | ||
36 | original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True) | ||
37 | if original_tune: | ||
38 | localdata = bb.data.createCopy(d) | ||
39 | localdata.setVar("DEFAULTTUNE", original_tune) | ||
40 | ld_append_if_tune_exists(localdata, infos, ld_info_all) | ||
41 | |||
42 | variants = d.getVar("MULTILIB_VARIANTS", True) or "" | ||
43 | for item in variants.split(): | ||
44 | localdata = bb.data.createCopy(d) | ||
45 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | ||
46 | localdata.setVar("OVERRIDES", overrides) | ||
47 | bb.data.update_data(localdata) | ||
48 | ld_append_if_tune_exists(localdata, infos, ld_info_all) | ||
49 | infos['ldconfig'] = ','.join(infos['ldconfig']) | ||
50 | infos['lddrewrite'] = ' '.join(infos['lddrewrite']) | ||
51 | return infos | ||
52 | |||
53 | EGLIBC_KNOWN_INTERPRETER_NAMES = "${@eglibc_dl_info(d)['ldconfig']}" | ||
54 | RTLDLIST = "${@eglibc_dl_info(d)['lddrewrite']}" | ||