diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-08-28 06:00:54 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 18:02:21 +0100 |
commit | 54a3375a1084f02ebd95886739e951228e945c57 (patch) | |
tree | fe139449256b0ed85504b896a9782bccd8a9d3a1 /meta/recipes-core/glibc/glibc-ld.inc | |
parent | 954e45bc7464573ed4776dbcd72eb76d4fca0b3d (diff) | |
download | poky-54a3375a1084f02ebd95886739e951228e945c57.tar.gz |
glibc: Migrate eglibc 2.19 -> glibc 2.20
- This is a big swoop change where we switch to using glibc
- option-groups are forward ported
- cross-localedef is extracted out from eglibc and hosted
at github.com/kraj/localedef, its used for cross-localedef
recipe
- Other non ported patches from eglibc are forward ported
ppc8xx cache line workaround
SH fpcr values
dynamic resolver
installing PIC archives is there but is not applied
libc header bootstrap
- Delete eglibc recipes we moved back to using glibc now
- Fix ppc/e500 build
- Fix crypt module build when options are used
- Fix fnmatch build when options OPTION_EGLIBC_LOCALE_CODE is unset
HAVE_MBSTATE_T and HAVE_MBSRTOWCS should be defined conditionally
based upon OPTION_EGLIBC_LOCALE_CODE being set/unset
- Move the ports/ patches to relevant files now that ports is gone
(From OE-Core rev: 1027c535ea753e63d9ffe469a423e04467cf8940)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc-ld.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-ld.inc | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc new file mode 100644 index 0000000000..962d666885 --- /dev/null +++ b/meta/recipes-core/glibc/glibc-ld.inc | |||
@@ -0,0 +1,56 @@ | |||
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 tune in dict: | ||
5 | infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }') | ||
6 | infos['lddrewrite'].add(libdir+'/'+dict[tune][0]) | ||
7 | |||
8 | def glibc_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-32": ["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 | "corei7-32": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], | ||
31 | "corei7-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"], | ||
32 | } | ||
33 | |||
34 | infos = {'ldconfig':set(), 'lddrewrite':set()} | ||
35 | ld_append_if_tune_exists(d, infos, ld_info_all) | ||
36 | |||
37 | #DEFAULTTUNE_MULTILIB_ORIGINAL | ||
38 | original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True) | ||
39 | if original_tune: | ||
40 | localdata = bb.data.createCopy(d) | ||
41 | localdata.setVar("DEFAULTTUNE", original_tune) | ||
42 | ld_append_if_tune_exists(localdata, infos, ld_info_all) | ||
43 | |||
44 | variants = d.getVar("MULTILIB_VARIANTS", True) or "" | ||
45 | for item in variants.split(): | ||
46 | localdata = bb.data.createCopy(d) | ||
47 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | ||
48 | localdata.setVar("OVERRIDES", overrides) | ||
49 | bb.data.update_data(localdata) | ||
50 | ld_append_if_tune_exists(localdata, infos, ld_info_all) | ||
51 | infos['ldconfig'] = ','.join(infos['ldconfig']) | ||
52 | infos['lddrewrite'] = ' '.join(infos['lddrewrite']) | ||
53 | return infos | ||
54 | |||
55 | EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}" | ||
56 | RTLDLIST = "${@glibc_dl_info(d)['lddrewrite']}" | ||