diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-12-05 21:21:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-06 14:38:43 +0000 |
commit | a5f9706bd5db9c22e8d9895d07c15eb157640d15 (patch) | |
tree | 278fd9ee5b30656fa0587802a49f5e31c2307546 /meta/recipes-core | |
parent | bf6be18e9f4f36e4fea67b40bd9851ace53fc9fb (diff) | |
download | poky-a5f9706bd5db9c22e8d9895d07c15eb157640d15.tar.gz |
eglibc: Update 2.14 recipes to latest SVN tip
Adjust patches to apply on new sourcebase
(From OE-Core rev: 66af81c8b8a1d5279430ef2ce62d36641002c000)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch | 66 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.14.bb | 2 |
2 files changed, 35 insertions, 33 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch b/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch index e1f135c424..1c30c9d833 100644 --- a/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch +++ b/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch | |||
@@ -12,11 +12,11 @@ http://mailman.archlinux.org/pipermail/arch-commits/2011-June/137142.html | |||
12 | http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/glibc/current/SOURCES/glibc-2.14-libdl-crash.patch?view=markup&pathrev=691343 | 12 | http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/glibc/current/SOURCES/glibc-2.14-libdl-crash.patch?view=markup&pathrev=691343 |
13 | http://repos.archlinuxppc.org/wsvn/filedetails.php?repname=packages&path=%2Fglibc%2Ftrunk%2Fglibc-2.14-libdl-crash.patch | 13 | http://repos.archlinuxppc.org/wsvn/filedetails.php?repname=packages&path=%2Fglibc%2Ftrunk%2Fglibc-2.14-libdl-crash.patch |
14 | 14 | ||
15 | diff --git a/elf/dl-close.c b/elf/dl-close.c | 15 | Index: libc/elf/dl-close.c |
16 | index 73b2a2f..9bd91e3 100644 | 16 | =================================================================== |
17 | --- a/elf/dl-close.c | 17 | --- libc.orig/elf/dl-close.c 2011-12-05 20:16:38.000000000 -0800 |
18 | +++ b/elf/dl-close.c | 18 | +++ libc/elf/dl-close.c 2011-12-05 20:17:15.863326893 -0800 |
19 | @@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) | 19 | @@ -119,17 +119,8 @@ |
20 | if (map->l_direct_opencount > 0 || map->l_type != lt_loaded | 20 | if (map->l_direct_opencount > 0 || map->l_type != lt_loaded |
21 | || dl_close_state != not_pending) | 21 | || dl_close_state != not_pending) |
22 | { | 22 | { |
@@ -35,12 +35,12 @@ index 73b2a2f..9bd91e3 100644 | |||
35 | + dl_close_state = rerun; | 35 | + dl_close_state = rerun; |
36 | 36 | ||
37 | /* There are still references to this object. Do nothing more. */ | 37 | /* There are still references to this object. Do nothing more. */ |
38 | if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) | 38 | if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0)) |
39 | diff --git a/elf/dl-deps.c b/elf/dl-deps.c | 39 | Index: libc/elf/dl-deps.c |
40 | index 9e30594..3890d00 100644 | 40 | =================================================================== |
41 | --- a/elf/dl-deps.c | 41 | --- libc.orig/elf/dl-deps.c 2011-12-05 20:16:38.000000000 -0800 |
42 | +++ b/elf/dl-deps.c | 42 | +++ libc/elf/dl-deps.c 2011-12-05 20:19:33.179326877 -0800 |
43 | @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, | 43 | @@ -478,6 +478,7 @@ |
44 | nneeded * sizeof needed[0]); | 44 | nneeded * sizeof needed[0]); |
45 | atomic_write_barrier (); | 45 | atomic_write_barrier (); |
46 | l->l_initfini = l_initfini; | 46 | l->l_initfini = l_initfini; |
@@ -48,7 +48,7 @@ index 9e30594..3890d00 100644 | |||
48 | } | 48 | } |
49 | 49 | ||
50 | /* If we have no auxiliary objects just go on to the next map. */ | 50 | /* If we have no auxiliary objects just go on to the next map. */ |
51 | @@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); | 51 | @@ -678,6 +679,7 @@ |
52 | l_initfini[nlist] = NULL; | 52 | l_initfini[nlist] = NULL; |
53 | atomic_write_barrier (); | 53 | atomic_write_barrier (); |
54 | map->l_initfini = l_initfini; | 54 | map->l_initfini = l_initfini; |
@@ -56,18 +56,20 @@ index 9e30594..3890d00 100644 | |||
56 | if (l_reldeps != NULL) | 56 | if (l_reldeps != NULL) |
57 | { | 57 | { |
58 | atomic_write_barrier (); | 58 | atomic_write_barrier (); |
59 | @@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); | 59 | @@ -686,7 +688,7 @@ |
60 | _dl_scope_free (old_l_reldeps); | 60 | _dl_scope_free (old_l_reldeps); |
61 | } | 61 | } |
62 | if (old_l_initfini != NULL) | 62 | if (old_l_initfini != NULL) |
63 | - map->l_orig_initfini = old_l_initfini; | 63 | - map->l_orig_initfini = old_l_initfini; |
64 | + _dl_scope_free (old_l_initfini); | 64 | + _dl_scope_free (old_l_initfini); |
65 | } | 65 | |
66 | diff --git a/elf/dl-libc.c b/elf/dl-libc.c | 66 | if (errno_reason) |
67 | index 7be9483..a13fce3 100644 | 67 | _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, |
68 | --- a/elf/dl-libc.c | 68 | Index: libc/elf/dl-libc.c |
69 | +++ b/elf/dl-libc.c | 69 | =================================================================== |
70 | @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) | 70 | --- libc.orig/elf/dl-libc.c 2011-10-22 09:34:03.000000000 -0700 |
71 | +++ libc/elf/dl-libc.c 2011-12-05 20:17:15.863326893 -0800 | ||
72 | @@ -265,13 +265,13 @@ | ||
71 | 73 | ||
72 | for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) | 74 | for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) |
73 | { | 75 | { |
@@ -82,7 +84,7 @@ index 7be9483..a13fce3 100644 | |||
82 | while (lnp != NULL) | 84 | while (lnp != NULL) |
83 | { | 85 | { |
84 | struct libname_list *old = lnp; | 86 | struct libname_list *old = lnp; |
85 | @@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) | 87 | @@ -279,6 +279,10 @@ |
86 | if (! old->dont_free) | 88 | if (! old->dont_free) |
87 | free (old); | 89 | free (old); |
88 | } | 90 | } |
@@ -93,11 +95,11 @@ index 7be9483..a13fce3 100644 | |||
93 | } | 95 | } |
94 | 96 | ||
95 | if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 | 97 | if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 |
96 | diff --git a/elf/rtld.c b/elf/rtld.c | 98 | Index: libc/elf/rtld.c |
97 | index 4a9109e..617e30e 100644 | 99 | =================================================================== |
98 | --- a/elf/rtld.c | 100 | --- libc.orig/elf/rtld.c 2011-10-22 09:34:03.000000000 -0700 |
99 | +++ b/elf/rtld.c | 101 | +++ libc/elf/rtld.c 2011-12-05 20:17:15.863326893 -0800 |
100 | @@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", | 102 | @@ -2264,6 +2264,7 @@ |
101 | lnp->dont_free = 1; | 103 | lnp->dont_free = 1; |
102 | lnp = lnp->next; | 104 | lnp = lnp->next; |
103 | } | 105 | } |
@@ -105,11 +107,11 @@ index 4a9109e..617e30e 100644 | |||
105 | 107 | ||
106 | if (l != &GL(dl_rtld_map)) | 108 | if (l != &GL(dl_rtld_map)) |
107 | _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, | 109 | _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, |
108 | diff --git a/include/link.h b/include/link.h | 110 | Index: libc/include/link.h |
109 | index e877104..051b99a 100644 | 111 | =================================================================== |
110 | --- a/include/link.h | 112 | --- libc.orig/include/link.h 2011-10-22 09:32:35.000000000 -0700 |
111 | +++ b/include/link.h | 113 | +++ libc/include/link.h 2011-12-05 20:17:15.863326893 -0800 |
112 | @@ -192,6 +192,9 @@ struct link_map | 114 | @@ -192,6 +192,9 @@ |
113 | during LD_TRACE_PRELINKING=1 | 115 | during LD_TRACE_PRELINKING=1 |
114 | contains any DT_SYMBOLIC | 116 | contains any DT_SYMBOLIC |
115 | libraries. */ | 117 | libraries. */ |
@@ -119,7 +121,7 @@ index e877104..051b99a 100644 | |||
119 | 121 | ||
120 | /* Collected information about own RPATH directories. */ | 122 | /* Collected information about own RPATH directories. */ |
121 | struct r_search_path_struct l_rpath_dirs; | 123 | struct r_search_path_struct l_rpath_dirs; |
122 | @@ -240,9 +243,6 @@ struct link_map | 124 | @@ -240,9 +243,6 @@ |
123 | 125 | ||
124 | /* List of object in order of the init and fini calls. */ | 126 | /* List of object in order of the init and fini calls. */ |
125 | struct link_map **l_initfini; | 127 | struct link_map **l_initfini; |
diff --git a/meta/recipes-core/eglibc/eglibc_2.14.bb b/meta/recipes-core/eglibc/eglibc_2.14.bb index 501987525e..fd384f4705 100644 --- a/meta/recipes-core/eglibc/eglibc_2.14.bb +++ b/meta/recipes-core/eglibc/eglibc_2.14.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require eglibc.inc | 1 | require eglibc.inc |
2 | 2 | ||
3 | SRCREV = "15225" | 3 | SRCREV = "15870" |
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
6 | PR = "r1" | 6 | PR = "r1" |