diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-03-22 19:56:57 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-28 17:04:51 +0100 |
commit | 016cf3fc0b34844d1a3bb1745366b5870ad1aa1c (patch) | |
tree | 8f4aecbb93408cbb6469c665e5280bac0eb266b7 /meta/recipes-core/eglibc/eglibc-2.15 | |
parent | 241140d0eb6b31d831530d772ee2776325a01384 (diff) | |
download | poky-016cf3fc0b34844d1a3bb1745366b5870ad1aa1c.tar.gz |
eglibc-2.15: Update SRCREV
Get new patches and remove the one that got merged upstream
(From OE-Core rev: 0e1a843a1f0c54f00736170de39a8a8f62d26879)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-2.15')
3 files changed, 128 insertions, 25 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.15/GLRO_dl_debug_mask.patch b/meta/recipes-core/eglibc/eglibc-2.15/GLRO_dl_debug_mask.patch new file mode 100644 index 0000000000..b8995625aa --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.15/GLRO_dl_debug_mask.patch | |||
@@ -0,0 +1,108 @@ | |||
1 | Its controlled by __OPTION_EGLIBC_RTLD_DEBUG | ||
2 | so we should use GLRO_dl_debug_mask | ||
3 | |||
4 | Singed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Index: libc/elf/dl-open.c | ||
8 | =================================================================== | ||
9 | --- libc.orig/elf/dl-open.c 2012-03-09 08:54:34.691443995 -0800 | ||
10 | +++ libc/elf/dl-open.c 2012-03-09 08:55:31.275446730 -0800 | ||
11 | @@ -154,7 +154,7 @@ | ||
12 | ns->_ns_main_searchlist->r_list[new_nlist++] = map; | ||
13 | |||
14 | /* We modify the global scope. Report this. */ | ||
15 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0)) | ||
16 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0)) | ||
17 | _dl_debug_printf ("\nadd %s [%lu] to global scope\n", | ||
18 | map->l_name, map->l_ns); | ||
19 | } | ||
20 | @@ -294,7 +294,7 @@ | ||
21 | _dl_debug_state (); | ||
22 | |||
23 | /* Print scope information. */ | ||
24 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0)) | ||
25 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0)) | ||
26 | _dl_show_scope (new, 0); | ||
27 | |||
28 | /* Only do lazy relocation if `LD_BIND_NOW' is not set. */ | ||
29 | @@ -438,7 +438,7 @@ | ||
30 | } | ||
31 | |||
32 | /* Print scope information. */ | ||
33 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0)) | ||
34 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0)) | ||
35 | _dl_show_scope (imap, from_scope); | ||
36 | } | ||
37 | |||
38 | Index: libc/ports/sysdeps/mips/dl-lookup.c | ||
39 | =================================================================== | ||
40 | --- libc.orig/ports/sysdeps/mips/dl-lookup.c 2012-03-09 08:54:34.707443996 -0800 | ||
41 | +++ libc/ports/sysdeps/mips/dl-lookup.c 2012-03-09 09:02:36.903467324 -0800 | ||
42 | @@ -111,7 +111,7 @@ | ||
43 | continue; | ||
44 | |||
45 | /* Print some debugging info if wanted. */ | ||
46 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0)) | ||
47 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SYMBOLS, 0)) | ||
48 | _dl_debug_printf ("symbol=%s; lookup in file=%s [%lu]\n", | ||
49 | undef_name, | ||
50 | map->l_name[0] ? map->l_name : rtld_progname, | ||
51 | @@ -432,7 +432,7 @@ | ||
52 | hash table. */ | ||
53 | if (__builtin_expect (tab->size, 0)) | ||
54 | { | ||
55 | - assert (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK); | ||
56 | + assert (GLRO_dl_debug_mask & DL_DEBUG_PRELINK); | ||
57 | __rtld_lock_unlock_recursive (tab->lock); | ||
58 | goto success; | ||
59 | } | ||
60 | @@ -681,7 +681,7 @@ | ||
61 | } | ||
62 | |||
63 | /* Display information if we are debugging. */ | ||
64 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) | ||
65 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0)) | ||
66 | _dl_debug_printf ("\ | ||
67 | \nfile=%s [%lu]; needed by %s [%lu] (relocation dependency)\n\n", | ||
68 | map->l_name[0] ? map->l_name : rtld_progname, | ||
69 | @@ -860,7 +860,7 @@ | ||
70 | if (__builtin_expect (current_value.m->l_used == 0, 0)) | ||
71 | current_value.m->l_used = 1; | ||
72 | |||
73 | - if (__builtin_expect (GLRO(dl_debug_mask) | ||
74 | + if (__builtin_expect (GLRO_dl_debug_mask | ||
75 | & (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0)) | ||
76 | _dl_debug_bindings (undef_name, undef_map, ref, | ||
77 | ¤t_value, version, type_class, protected); | ||
78 | @@ -925,7 +925,7 @@ | ||
79 | { | ||
80 | const char *reference_name = undef_map->l_name; | ||
81 | |||
82 | - if (GLRO(dl_debug_mask) & DL_DEBUG_BINDINGS) | ||
83 | + if (GLRO_dl_debug_mask & DL_DEBUG_BINDINGS) | ||
84 | { | ||
85 | _dl_debug_printf ("binding file %s [%lu] to %s [%lu]: %s symbol `%s'", | ||
86 | (reference_name[0] | ||
87 | @@ -941,7 +941,7 @@ | ||
88 | _dl_debug_printf_c ("\n"); | ||
89 | } | ||
90 | #ifdef SHARED | ||
91 | - if (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK) | ||
92 | + if (GLRO_dl_debug_mask & DL_DEBUG_PRELINK) | ||
93 | { | ||
94 | int conflict = 0; | ||
95 | struct sym_val val = { NULL, NULL }; | ||
96 | Index: libc/elf/rtld.c | ||
97 | =================================================================== | ||
98 | --- libc.orig/elf/rtld.c 2012-03-09 09:01:35.159464344 -0800 | ||
99 | +++ libc/elf/rtld.c 2012-03-09 09:01:56.247465364 -0800 | ||
100 | @@ -2198,7 +2198,7 @@ | ||
101 | GLRO(dl_init_all_dirs) = GL(dl_all_dirs); | ||
102 | |||
103 | /* Print scope information. */ | ||
104 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0)) | ||
105 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0)) | ||
106 | { | ||
107 | _dl_debug_printf ("\nInitial object scopes\n"); | ||
108 | |||
diff --git a/meta/recipes-core/eglibc/eglibc-2.15/armv4-eabi-compile-fix.patch b/meta/recipes-core/eglibc/eglibc-2.15/armv4-eabi-compile-fix.patch deleted file mode 100644 index c2407eea09..0000000000 --- a/meta/recipes-core/eglibc/eglibc-2.15/armv4-eabi-compile-fix.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | Source: http://sourceware.org/bugzilla/show_bug.cgi?id=12097 | ||
2 | Upstream-Status: Submitted | ||
3 | |||
4 | The patch should be merged into glibc-ports | ||
5 | |||
6 | -Khem | ||
7 | Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S | ||
8 | =================================================================== | ||
9 | --- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S | ||
10 | +++ libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S | ||
11 | @@ -16,6 +16,8 @@ | ||
12 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA | ||
13 | 02111-1307 USA. */ | ||
14 | |||
15 | +#if defined(__thumb__) | ||
16 | + | ||
17 | #include <sysdep.h> | ||
18 | |||
19 | /* Out-of-line syscall stub. We expect the system call number in ip | ||
20 | @@ -41,3 +43,5 @@ ENTRY (__libc_do_syscall) | ||
21 | pop {r7, pc} | ||
22 | .fnend | ||
23 | END (__libc_do_syscall) | ||
24 | + | ||
25 | +#endif /* __thumb__ */ | ||
diff --git a/meta/recipes-core/eglibc/eglibc-2.15/initgroups_keys.patch b/meta/recipes-core/eglibc/eglibc-2.15/initgroups_keys.patch new file mode 100644 index 0000000000..be29856b03 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.15/initgroups_keys.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | This is needed since initgroups belongs to NET group | ||
2 | so when NET is disabled in eglibc build then it reports | ||
3 | as undefined symbol | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: libc/nss/getent.c | ||
9 | =================================================================== | ||
10 | --- libc.orig/nss/getent.c 2012-03-09 09:41:57.099581559 -0800 | ||
11 | +++ libc/nss/getent.c 2012-03-09 09:42:13.095582334 -0800 | ||
12 | @@ -898,7 +898,7 @@ | ||
13 | D(group) | ||
14 | D(gshadow) | ||
15 | DN(hosts) | ||
16 | -D(initgroups) | ||
17 | +DN(initgroups) | ||
18 | DN(netgroup) | ||
19 | DN(networks) | ||
20 | D(passwd) | ||