diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-02-08 03:44:32 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-18 08:38:51 +0000 |
commit | 2e7dd298b17446708fa77a80e6ed2460ed98b059 (patch) | |
tree | 022b213dfe1d34bd8418d884155307922ff10feb /meta/recipes-core/eglibc/eglibc-2.18/GLRO_dl_debug_mask.patch | |
parent | 07f49c397864d34725d7ac3708b345934d5f0d49 (diff) | |
download | poky-2e7dd298b17446708fa77a80e6ed2460ed98b059.tar.gz |
eglibc: Upgrade from 2.18 -> 2.19
License formatting and address for FSF in the COPYING and COPYING.LIB
has changed.
Dropped patched already upstream and patches that were workarounds for
older glibc and busybox
for e500 we have should pass --without-fp to eglibc/glibc 2.19 onwards
the code is merged from eglibc into glibc upstream under nofpu/ pretext
(From OE-Core rev: 875df27e56b82fcf970410b6d78e3672471c336a)
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.18/GLRO_dl_debug_mask.patch')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.18/GLRO_dl_debug_mask.patch | 143 |
1 files changed, 0 insertions, 143 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/GLRO_dl_debug_mask.patch b/meta/recipes-core/eglibc/eglibc-2.18/GLRO_dl_debug_mask.patch deleted file mode 100644 index 7258c82418..0000000000 --- a/meta/recipes-core/eglibc/eglibc-2.18/GLRO_dl_debug_mask.patch +++ /dev/null | |||
@@ -1,143 +0,0 @@ | |||
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-10-25 10:18:12.000000000 -0700 | ||
10 | +++ libc/elf/dl-open.c 2013-01-09 11:49:02.635577870 -0800 | ||
11 | @@ -155,7 +155,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 | @@ -298,7 +298,7 @@ | ||
21 | LIBC_PROBE (map_complete, 3, args->nsid, r, new); | ||
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 | @@ -515,7 +515,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-08-17 12:39:53.000000000 -0700 | ||
41 | +++ libc/ports/sysdeps/mips/dl-lookup.c 2013-01-09 11:49:02.635577870 -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 | @@ -788,7 +788,7 @@ | ||
70 | { | ||
71 | if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK) | ||
72 | && skip_map == NULL | ||
73 | - && !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED)) | ||
74 | + && !(GLRO_dl_debug_mask & DL_DEBUG_UNUSED)) | ||
75 | { | ||
76 | /* We could find no value for a strong reference. */ | ||
77 | const char *reference_name = undef_map ? undef_map->l_name : ""; | ||
78 | @@ -861,7 +861,7 @@ | ||
79 | if (__builtin_expect (current_value.m->l_used == 0, 0)) | ||
80 | current_value.m->l_used = 1; | ||
81 | |||
82 | - if (__builtin_expect (GLRO(dl_debug_mask) | ||
83 | + if (__builtin_expect (GLRO_dl_debug_mask | ||
84 | & (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0)) | ||
85 | _dl_debug_bindings (undef_name, undef_map, ref, | ||
86 | ¤t_value, version, type_class, protected); | ||
87 | @@ -926,7 +926,7 @@ | ||
88 | { | ||
89 | const char *reference_name = undef_map->l_name; | ||
90 | |||
91 | - if (GLRO(dl_debug_mask) & DL_DEBUG_BINDINGS) | ||
92 | + if (GLRO_dl_debug_mask & DL_DEBUG_BINDINGS) | ||
93 | { | ||
94 | _dl_debug_printf ("binding file %s [%lu] to %s [%lu]: %s symbol `%s'", | ||
95 | (reference_name[0] | ||
96 | @@ -942,7 +942,7 @@ | ||
97 | _dl_debug_printf_c ("\n"); | ||
98 | } | ||
99 | #ifdef SHARED | ||
100 | - if (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK) | ||
101 | + if (GLRO_dl_debug_mask & DL_DEBUG_PRELINK) | ||
102 | { | ||
103 | int conflict = 0; | ||
104 | struct sym_val val = { NULL, NULL }; | ||
105 | Index: libc/elf/rtld.c | ||
106 | =================================================================== | ||
107 | --- libc.orig/elf/rtld.c 2012-10-10 08:35:46.000000000 -0700 | ||
108 | +++ libc/elf/rtld.c 2013-01-09 11:49:02.635577870 -0800 | ||
109 | @@ -2118,7 +2118,7 @@ | ||
110 | GLRO(dl_init_all_dirs) = GL(dl_all_dirs); | ||
111 | |||
112 | /* Print scope information. */ | ||
113 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0)) | ||
114 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0)) | ||
115 | { | ||
116 | _dl_debug_printf ("\nInitial object scopes\n"); | ||
117 | |||
118 | Index: libc/elf/dl-lookup.c | ||
119 | =================================================================== | ||
120 | --- libc.orig/elf/dl-lookup.c 2012-08-17 12:39:53.000000000 -0700 | ||
121 | +++ libc/elf/dl-lookup.c 2013-01-09 11:49:02.635577870 -0800 | ||
122 | @@ -771,7 +771,7 @@ | ||
123 | { | ||
124 | if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK) | ||
125 | && skip_map == NULL | ||
126 | - && !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED)) | ||
127 | + && !(GLRO_dl_debug_mask & DL_DEBUG_UNUSED)) | ||
128 | { | ||
129 | /* We could find no value for a strong reference. */ | ||
130 | const char *reference_name = undef_map ? undef_map->l_name : ""; | ||
131 | Index: libc/elf/get-dynamic-info.h | ||
132 | =================================================================== | ||
133 | --- libc.orig/elf/get-dynamic-info.h 2012-12-02 13:11:45.000000000 -0800 | ||
134 | +++ libc/elf/get-dynamic-info.h 2013-01-09 12:53:51.015657653 -0800 | ||
135 | @@ -157,7 +157,7 @@ | ||
136 | them. Therefore to avoid breaking existing applications the | ||
137 | best we can do is add a warning during debugging with the | ||
138 | intent of notifying the user of the problem. */ | ||
139 | - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0) | ||
140 | + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0) | ||
141 | && l->l_flags_1 & ~DT_1_SUPPORTED_MASK) | ||
142 | _dl_debug_printf ("\nWARNING: Unsupported flag value(s) of 0x%x in DT_FLAGS_1.\n", | ||
143 | l->l_flags_1 & ~DT_1_SUPPORTED_MASK); | ||