diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-02-06 11:38:04 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-15 20:06:41 -0800 |
commit | cf6c8a94a40080154fd2a2b32250799397a47a1f (patch) | |
tree | ded97c6247bd4842b6a8424ccabab522cf63e2b4 /meta/recipes-core/glibc/glibc | |
parent | 36f6e71ccbba456e706dd7723cb0e69990b6b552 (diff) | |
download | poky-cf6c8a94a40080154fd2a2b32250799397a47a1f.tar.gz |
glibc: Update to 2.25 release
(From OE-Core rev: dc55d982aa3d35fa08749b817dbfd87e499d01ab)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0028-Revert-Check-IFUNC-definition-in-unrelocated-shared-.patch | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/meta/recipes-core/glibc/glibc/0028-Revert-Check-IFUNC-definition-in-unrelocated-shared-.patch b/meta/recipes-core/glibc/glibc/0028-Revert-Check-IFUNC-definition-in-unrelocated-shared-.patch deleted file mode 100644 index 8c146c0f60..0000000000 --- a/meta/recipes-core/glibc/glibc/0028-Revert-Check-IFUNC-definition-in-unrelocated-shared-.patch +++ /dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | From ee65c9dde382e0235b6b53fa847b23d0097f554f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 12 Jan 2017 12:13:32 -0800 | ||
4 | Subject: [PATCH 28/28] Revert "Check IFUNC definition in unrelocated shared | ||
5 | library [BZ #20019]" | ||
6 | |||
7 | This reverts commit 0e6d3adc60d8073397af6a320e594d98d7fbedde. | ||
8 | |||
9 | Causes regression in OE a new tracker to fix it has been opened | ||
10 | |||
11 | https://sourceware.org/bugzilla/show_bug.cgi?id=21041 | ||
12 | --- | ||
13 | Upstream-Status: Inappropriate | ||
14 | |||
15 | ChangeLog | 7 ------- | ||
16 | sysdeps/i386/dl-machine.h | 18 +----------------- | ||
17 | sysdeps/x86_64/dl-machine.h | 18 +----------------- | ||
18 | 3 files changed, 2 insertions(+), 41 deletions(-) | ||
19 | |||
20 | diff --git a/ChangeLog b/ChangeLog | ||
21 | index f06c02a3c6..11d718d561 100644 | ||
22 | --- a/ChangeLog | ||
23 | +++ b/ChangeLog | ||
24 | @@ -4396,13 +4396,6 @@ | ||
25 | |||
26 | * math/test-nan-overflow.c: Include stdlib.h for malloc. | ||
27 | |||
28 | -2016-10-28 H.J. Lu <hongjiu.lu@intel.com> | ||
29 | - | ||
30 | - [BZ #20019] | ||
31 | - * sysdeps/i386/dl-machine.h (elf_machine_rel): Check IFUNC | ||
32 | - definition in unrelocated shared library. | ||
33 | - * sysdeps/x86_64/dl-machine.h (elf_machine_rela): Likewise. | ||
34 | - | ||
35 | 2016-10-28 Florian Weimer <fweimer@redhat.com> | ||
36 | |||
37 | [BZ #20729] | ||
38 | diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h | ||
39 | index 6eca69d567..a9edb41aa6 100644 | ||
40 | --- a/sysdeps/i386/dl-machine.h | ||
41 | +++ b/sysdeps/i386/dl-machine.h | ||
42 | @@ -321,23 +321,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, | ||
43 | 0) | ||
44 | && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1) | ||
45 | && __builtin_expect (!skip_ifunc, 1)) | ||
46 | - { | ||
47 | -# ifndef RTLD_BOOTSTRAP | ||
48 | - if (sym_map != map | ||
49 | - && sym_map->l_type != lt_executable | ||
50 | - && !sym_map->l_relocated) | ||
51 | - { | ||
52 | - const char *strtab | ||
53 | - = (const char *) D_PTR (map, l_info[DT_STRTAB]); | ||
54 | - _dl_fatal_printf ("\ | ||
55 | -%s: Relink `%s' with `%s' for IFUNC symbol `%s'\n", | ||
56 | - RTLD_PROGNAME, map->l_name, | ||
57 | - sym_map->l_name, | ||
58 | - strtab + refsym->st_name); | ||
59 | - } | ||
60 | -# endif | ||
61 | - value = ((Elf32_Addr (*) (void)) value) (); | ||
62 | - } | ||
63 | + value = ((Elf32_Addr (*) (void)) value) (); | ||
64 | |||
65 | switch (r_type) | ||
66 | { | ||
67 | diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h | ||
68 | index 3e7ae22c67..b3eb33f036 100644 | ||
69 | --- a/sysdeps/x86_64/dl-machine.h | ||
70 | +++ b/sysdeps/x86_64/dl-machine.h | ||
71 | @@ -331,23 +331,7 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, | ||
72 | 0) | ||
73 | && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1) | ||
74 | && __builtin_expect (!skip_ifunc, 1)) | ||
75 | - { | ||
76 | -# ifndef RTLD_BOOTSTRAP | ||
77 | - if (sym_map != map | ||
78 | - && sym_map->l_type != lt_executable | ||
79 | - && !sym_map->l_relocated) | ||
80 | - { | ||
81 | - const char *strtab | ||
82 | - = (const char *) D_PTR (map, l_info[DT_STRTAB]); | ||
83 | - _dl_fatal_printf ("\ | ||
84 | -%s: Relink `%s' with `%s' for IFUNC symbol `%s'\n", | ||
85 | - RTLD_PROGNAME, map->l_name, | ||
86 | - sym_map->l_name, | ||
87 | - strtab + refsym->st_name); | ||
88 | - } | ||
89 | -# endif | ||
90 | - value = ((ElfW(Addr) (*) (void)) value) (); | ||
91 | - } | ||
92 | + value = ((ElfW(Addr) (*) (void)) value) (); | ||
93 | |||
94 | switch (r_type) | ||
95 | { | ||
96 | -- | ||
97 | 2.11.0 | ||
98 | |||