summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-01 18:26:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-01 22:18:46 +0000
commitbcdfc5c99351f888f71c603667b0bbf5340f5a13 (patch)
tree5ee30812cb81552b86356a18295b2e153cc91a55 /meta
parent2d3e09949732ed48c8c9a328d9ab6ebbf6889b13 (diff)
downloadpoky-bcdfc5c99351f888f71c603667b0bbf5340f5a13.tar.gz
glibc: Upgrade to 2.27 release
(From OE-Core rev: 7c9faaee307585dbab569b4aa0a386658372af4e) 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')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.27.bb (renamed from meta/recipes-core/glibc/cross-localedef-native_2.26.bb)4
-rw-r--r--meta/recipes-core/glibc/glibc-initial_2.27.bb (renamed from meta/recipes-core/glibc/glibc-initial_2.26.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-locale_2.27.bb (renamed from meta/recipes-core/glibc/glibc-locale_2.26.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-mtrace_2.27.bb (renamed from meta/recipes-core/glibc/glibc-mtrace_2.26.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-scripts_2.27.bb (renamed from meta/recipes-core/glibc/glibc-scripts_2.26.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch12
-rw-r--r--meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch10
-rw-r--r--meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch28
-rw-r--r--meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch10
-rw-r--r--meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch10
-rw-r--r--meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch10
-rw-r--r--meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch10
-rw-r--r--meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch20
-rw-r--r--meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch90
-rw-r--r--meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch8
-rw-r--r--meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch10
-rw-r--r--meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch6
-rw-r--r--meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch (renamed from meta/recipes-core/glibc/glibc/0027-glibc-reset-dl-load-write-lock-after-forking.patch)29
-rw-r--r--meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch (renamed from meta/recipes-core/glibc/glibc/0028-Bug-4578-add-ld.so-lock-while-fork.patch)27
-rw-r--r--meta/recipes-core/glibc/glibc_2.27.bb (renamed from meta/recipes-core/glibc/glibc_2.26.bb)10
34 files changed, 200 insertions, 188 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 075d2c5b24..87a5920cad 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -26,7 +26,7 @@ GCCVERSION ?= "7.%"
26SDKGCCVERSION ?= "${GCCVERSION}" 26SDKGCCVERSION ?= "${GCCVERSION}"
27BINUVERSION ?= "2.30%" 27BINUVERSION ?= "2.30%"
28GDBVERSION ?= "8.0%" 28GDBVERSION ?= "8.0%"
29GLIBCVERSION ?= "2.26%" 29GLIBCVERSION ?= "2.27%"
30LINUXLIBCVERSION ?= "4.15%" 30LINUXLIBCVERSION ?= "4.15%"
31 31
32PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 32PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.26.bb b/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
index af02a0ce1d..d633e9bc37 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.26.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
@@ -21,8 +21,8 @@ SRCBRANCH ?= "release/${PV}/master"
21GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 21GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
22UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" 22UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
23 23
24SRCREV_glibc ?= "d300041c533a3d837c9f37a099bcc95466860e98" 24SRCREV_glibc ?= "23158b08a0908f381459f273a984c6fd328363cb"
25SRCREV_localedef ?= "dfb4afe551c6c6e94f9cc85417bd1f582168c843" 25SRCREV_localedef ?= "de5bdbd5e76b5403a4151b9b9f958b6cca36b3e7"
26 26
27SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 27SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
28 git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ 28 git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
diff --git a/meta/recipes-core/glibc/glibc-initial_2.26.bb b/meta/recipes-core/glibc/glibc-initial_2.27.bb
index e86770e12d..e86770e12d 100644
--- a/meta/recipes-core/glibc/glibc-initial_2.26.bb
+++ b/meta/recipes-core/glibc/glibc-initial_2.27.bb
diff --git a/meta/recipes-core/glibc/glibc-locale_2.26.bb b/meta/recipes-core/glibc/glibc-locale_2.27.bb
index f7702e0358..f7702e0358 100644
--- a/meta/recipes-core/glibc/glibc-locale_2.26.bb
+++ b/meta/recipes-core/glibc/glibc-locale_2.27.bb
diff --git a/meta/recipes-core/glibc/glibc-mtrace_2.26.bb b/meta/recipes-core/glibc/glibc-mtrace_2.27.bb
index 0b69bad46a..0b69bad46a 100644
--- a/meta/recipes-core/glibc/glibc-mtrace_2.26.bb
+++ b/meta/recipes-core/glibc/glibc-mtrace_2.27.bb
diff --git a/meta/recipes-core/glibc/glibc-scripts_2.26.bb b/meta/recipes-core/glibc/glibc-scripts_2.27.bb
index 5a89bd8022..5a89bd8022 100644
--- a/meta/recipes-core/glibc/glibc-scripts_2.26.bb
+++ b/meta/recipes-core/glibc/glibc-scripts_2.27.bb
diff --git a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
index 19c1d9bf14..86234c9d2e 100644
--- a/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
+++ b/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
@@ -1,7 +1,7 @@
1From 81346b2f7735698078d5bf919a78b6c0269d6fee Mon Sep 17 00:00:00 2001 1From bd91b60ce6ff01f49b173b6b45e23ce94911b2a6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:48:24 +0000 3Date: Wed, 18 Mar 2015 01:48:24 +0000
4Subject: [PATCH 01/25] nativesdk-glibc: Look for host system ld.so.cache as 4Subject: [PATCH 01/27] nativesdk-glibc: Look for host system ld.so.cache as
5 well 5 well
6 6
7Upstream-Status: Inappropriate [embedded specific] 7Upstream-Status: Inappropriate [embedded specific]
@@ -31,10 +31,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
31 1 file changed, 8 insertions(+), 8 deletions(-) 31 1 file changed, 8 insertions(+), 8 deletions(-)
32 32
33diff --git a/elf/dl-load.c b/elf/dl-load.c 33diff --git a/elf/dl-load.c b/elf/dl-load.c
34index c1b6d4ba0f..d7af9ebcbc 100644 34index 7554a99b5a..a73d11a62f 100644
35--- a/elf/dl-load.c 35--- a/elf/dl-load.c
36+++ b/elf/dl-load.c 36+++ b/elf/dl-load.c
37@@ -2054,6 +2054,14 @@ _dl_map_object (struct link_map *loader, const char *name, 37@@ -2007,6 +2007,14 @@ _dl_map_object (struct link_map *loader, const char *name,
38 } 38 }
39 } 39 }
40 40
@@ -49,7 +49,7 @@ index c1b6d4ba0f..d7af9ebcbc 100644
49 #ifdef USE_LDCONFIG 49 #ifdef USE_LDCONFIG
50 if (fd == -1 50 if (fd == -1
51 && (__glibc_likely ((mode & __RTLD_SECURE) == 0) 51 && (__glibc_likely ((mode & __RTLD_SECURE) == 0)
52@@ -2112,14 +2120,6 @@ _dl_map_object (struct link_map *loader, const char *name, 52@@ -2065,14 +2073,6 @@ _dl_map_object (struct link_map *loader, const char *name,
53 } 53 }
54 #endif 54 #endif
55 55
@@ -65,5 +65,5 @@ index c1b6d4ba0f..d7af9ebcbc 100644
65 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) 65 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
66 _dl_debug_printf ("\n"); 66 _dl_debug_printf ("\n");
67-- 67--
682.13.2 682.16.1
69 69
diff --git a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch b/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
index 2ce240be6f..899481f057 100644
--- a/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
+++ b/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
@@ -1,7 +1,7 @@
1From 82f2e910ec0e2de6a9e2b007825bddfc5850575d Mon Sep 17 00:00:00 2001 1From 50736f7fc1fdc9e1f7c05f1fec75c977d9be9228 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:50:00 +0000 3Date: Wed, 18 Mar 2015 01:50:00 +0000
4Subject: [PATCH 02/25] nativesdk-glibc: Fix buffer overrun with a relocated 4Subject: [PATCH 02/27] nativesdk-glibc: Fix buffer overrun with a relocated
5 SDK 5 SDK
6 6
7When ld-linux-*.so.2 is relocated to a path that is longer than the 7When ld-linux-*.so.2 is relocated to a path that is longer than the
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 1 file changed, 12 insertions(+) 22 1 file changed, 12 insertions(+)
23 23
24diff --git a/elf/dl-load.c b/elf/dl-load.c 24diff --git a/elf/dl-load.c b/elf/dl-load.c
25index d7af9ebcbc..19c1db9948 100644 25index a73d11a62f..62e3eee478 100644
26--- a/elf/dl-load.c 26--- a/elf/dl-load.c
27+++ b/elf/dl-load.c 27+++ b/elf/dl-load.c
28@@ -1753,7 +1753,19 @@ open_path (const char *name, size_t namelen, int mode, 28@@ -1707,7 +1707,19 @@ open_path (const char *name, size_t namelen, int mode,
29 given on the command line when rtld is run directly. */ 29 given on the command line when rtld is run directly. */
30 return -1; 30 return -1;
31 31
@@ -46,5 +46,5 @@ index d7af9ebcbc..19c1db9948 100644
46 { 46 {
47 struct r_search_path_elem *this_dir = *dirs; 47 struct r_search_path_elem *this_dir = *dirs;
48-- 48--
492.13.2 492.16.1
50 50
diff --git a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
index 397e8b3169..03f99916fa 100644
--- a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
+++ b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
@@ -1,7 +1,7 @@
1From 490a0eb4da1af726ea5d68e3efc0d18ba94c4054 Mon Sep 17 00:00:00 2001 1From 695e1cbff6ee6db3435c33e55311c67adf44476d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:51:38 +0000 3Date: Wed, 18 Mar 2015 01:51:38 +0000
4Subject: [PATCH 03/25] nativesdk-glibc: Raise the size of arrays containing dl 4Subject: [PATCH 03/27] nativesdk-glibc: Raise the size of arrays containing dl
5 paths 5 paths
6 6
7This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings 7This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26 7 files changed, 14 insertions(+), 10 deletions(-) 26 7 files changed, 14 insertions(+), 10 deletions(-)
27 27
28diff --git a/elf/dl-cache.c b/elf/dl-cache.c 28diff --git a/elf/dl-cache.c b/elf/dl-cache.c
29index e9632da0b3..4de529d2cf 100644 29index 6ee5153ff9..37a5f701fa 100644
30--- a/elf/dl-cache.c 30--- a/elf/dl-cache.c
31+++ b/elf/dl-cache.c 31+++ b/elf/dl-cache.c
32@@ -133,6 +133,10 @@ do \ 32@@ -133,6 +133,10 @@ do \
@@ -38,14 +38,14 @@ index e9632da0b3..4de529d2cf 100644
38+ 38+
39+ 39+
40 int 40 int
41 internal_function
42 _dl_cache_libcmp (const char *p1, const char *p2) 41 _dl_cache_libcmp (const char *p1, const char *p2)
42 {
43diff --git a/elf/dl-load.c b/elf/dl-load.c 43diff --git a/elf/dl-load.c b/elf/dl-load.c
44index 19c1db9948..70c259b400 100644 44index 62e3eee478..6ddba73650 100644
45--- a/elf/dl-load.c 45--- a/elf/dl-load.c
46+++ b/elf/dl-load.c 46+++ b/elf/dl-load.c
47@@ -106,8 +106,8 @@ static size_t max_capstrlen attribute_relro; 47@@ -109,8 +109,8 @@ static size_t max_capstrlen attribute_relro;
48 /* Get the generated information about the trusted directories. */ 48 gen-trusted-dirs.awk. */
49 #include "trusted-dirs.h" 49 #include "trusted-dirs.h"
50 50
51-static const char system_dirs[] = SYSTEM_DIRS; 51-static const char system_dirs[] = SYSTEM_DIRS;
@@ -56,7 +56,7 @@ index 19c1db9948..70c259b400 100644
56 SYSTEM_DIRS_LEN 56 SYSTEM_DIRS_LEN
57 }; 57 };
58diff --git a/elf/interp.c b/elf/interp.c 58diff --git a/elf/interp.c b/elf/interp.c
59index b6e8f04444..47c20415bc 100644 59index 9cd50c7291..fc2f39d73c 100644
60--- a/elf/interp.c 60--- a/elf/interp.c
61+++ b/elf/interp.c 61+++ b/elf/interp.c
62@@ -18,5 +18,5 @@ 62@@ -18,5 +18,5 @@
@@ -67,7 +67,7 @@ index b6e8f04444..47c20415bc 100644
67+const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) 67+const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp")))
68 = RUNTIME_LINKER; 68 = RUNTIME_LINKER;
69diff --git a/elf/ldconfig.c b/elf/ldconfig.c 69diff --git a/elf/ldconfig.c b/elf/ldconfig.c
70index 99caf9e9bb..36ea5df5f1 100644 70index fbdd814edf..9f4d8d69b1 100644
71--- a/elf/ldconfig.c 71--- a/elf/ldconfig.c
72+++ b/elf/ldconfig.c 72+++ b/elf/ldconfig.c
73@@ -168,6 +168,9 @@ static struct argp argp = 73@@ -168,6 +168,9 @@ static struct argp argp =
@@ -81,7 +81,7 @@ index 99caf9e9bb..36ea5df5f1 100644
81 a platform. */ 81 a platform. */
82 static int 82 static int
83diff --git a/elf/rtld.c b/elf/rtld.c 83diff --git a/elf/rtld.c b/elf/rtld.c
84index 65647fb1c8..cd8381cb33 100644 84index 453f56eb15..08e0c4c94b 100644
85--- a/elf/rtld.c 85--- a/elf/rtld.c
86+++ b/elf/rtld.c 86+++ b/elf/rtld.c
87@@ -128,6 +128,7 @@ dso_name_valid_for_suid (const char *p) 87@@ -128,6 +128,7 @@ dso_name_valid_for_suid (const char *p)
@@ -92,7 +92,7 @@ index 65647fb1c8..cd8381cb33 100644
92 92
93 /* LD_AUDIT variable contents. Must be processed before the 93 /* LD_AUDIT variable contents. Must be processed before the
94 audit_list below. */ 94 audit_list below. */
95@@ -999,12 +1000,12 @@ of this helper program; chances are you did not intend to run this program.\n\ 95@@ -1000,12 +1001,12 @@ of this helper program; chances are you did not intend to run this program.\n\
96 --list list all dependencies and how they are resolved\n\ 96 --list list all dependencies and how they are resolved\n\
97 --verify verify that given object really is a dynamically linked\n\ 97 --verify verify that given object really is a dynamically linked\n\
98 object we can handle\n\ 98 object we can handle\n\
@@ -108,7 +108,7 @@ index 65647fb1c8..cd8381cb33 100644
108 ++_dl_skip_args; 108 ++_dl_skip_args;
109 --_dl_argc; 109 --_dl_argc;
110diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c 110diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
111index 5aa055de6e..b9a14b9bd3 100644 111index d6cf9d2a3e..9fcf970144 100644
112--- a/iconv/gconv_conf.c 112--- a/iconv/gconv_conf.c
113+++ b/iconv/gconv_conf.c 113+++ b/iconv/gconv_conf.c
114@@ -36,7 +36,7 @@ 114@@ -36,7 +36,7 @@
@@ -121,7 +121,7 @@ index 5aa055de6e..b9a14b9bd3 100644
121 /* The path elements, as determined by the __gconv_get_path function. 121 /* The path elements, as determined by the __gconv_get_path function.
122 All path elements end in a slash. */ 122 All path elements end in a slash. */
123diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h 123diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h
124index 1f0b8f629d..acbe68399d 100644 124index cf43f1cf3b..7f07adde53 100644
125--- a/sysdeps/generic/dl-cache.h 125--- a/sysdeps/generic/dl-cache.h
126+++ b/sysdeps/generic/dl-cache.h 126+++ b/sysdeps/generic/dl-cache.h
127@@ -27,10 +27,6 @@ 127@@ -27,10 +27,6 @@
@@ -136,5 +136,5 @@ index 1f0b8f629d..acbe68399d 100644
136 # define add_system_dir(dir) add_dir (dir) 136 # define add_system_dir(dir) add_dir (dir)
137 #endif 137 #endif
138-- 138--
1392.13.2 1392.16.1
140 140
diff --git a/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch b/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
index 8db47bca78..f9d70c2a09 100644
--- a/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
+++ b/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
@@ -1,7 +1,7 @@
1From 8fe1b56180c30d237cc2ab9a5a9c97a0311f41da Mon Sep 17 00:00:00 2001 1From 2bafdbd7067794c6a24e5e85608c0ec4638c5667 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 14:35:35 -0800 3Date: Thu, 31 Dec 2015 14:35:35 -0800
4Subject: [PATCH 04/25] nativesdk-glibc: Allow 64 bit atomics for x86 4Subject: [PATCH 04/27] nativesdk-glibc: Allow 64 bit atomics for x86
5 5
6The fix consist of allowing 64bit atomic ops for x86. 6The fix consist of allowing 64bit atomic ops for x86.
7This should be safe for i586 and newer CPUs. 7This should be safe for i586 and newer CPUs.
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/sysdeps/i386/atomic-machine.h b/sysdeps/i386/atomic-machine.h 19diff --git a/sysdeps/i386/atomic-machine.h b/sysdeps/i386/atomic-machine.h
20index 0e24200617..1532f52dec 100644 20index 272da5dd8f..409c759f14 100644
21--- a/sysdeps/i386/atomic-machine.h 21--- a/sysdeps/i386/atomic-machine.h
22+++ b/sysdeps/i386/atomic-machine.h 22+++ b/sysdeps/i386/atomic-machine.h
23@@ -54,7 +54,7 @@ typedef uintmax_t uatomic_max_t; 23@@ -54,7 +54,7 @@ typedef uintmax_t uatomic_max_t;
@@ -30,5 +30,5 @@ index 0e24200617..1532f52dec 100644
30 #define ATOMIC_EXCHANGE_USES_CAS 0 30 #define ATOMIC_EXCHANGE_USES_CAS 0
31 31
32-- 32--
332.13.2 332.16.1
34 34
diff --git a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
index 956b2aae7a..ad9106eefa 100644
--- a/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
+++ b/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
@@ -1,7 +1,7 @@
1From b9edcc845641956b7286c60c833f05a9f70cfab9 Mon Sep 17 00:00:00 2001 1From 661adfe9c220d10617bf6bb283827471c3956b01 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:01:50 +0000 3Date: Wed, 18 Mar 2015 00:01:50 +0000
4Subject: [PATCH 05/25] fsl e500/e5500/e6500/603e fsqrt implementation 4Subject: [PATCH 05/27] fsl e500/e5500/e6500/603e fsqrt implementation
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Edmar Wienskoski <edmar@freescale.com> 7Signed-off-by: Edmar Wienskoski <edmar@freescale.com>
@@ -1580,5 +1580,5 @@ index 0000000000..04ff8cc181
1580@@ -0,0 +1 @@ 1580@@ -0,0 +1 @@
1581+powerpc/powerpc64/e6500/fpu 1581+powerpc/powerpc64/e6500/fpu
1582-- 1582--
15832.13.2 15832.16.1
1584 1584
diff --git a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
index c74fead625..a3d50fd054 100644
--- a/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
+++ b/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
@@ -1,7 +1,7 @@
1From 324202488a1c2439be345745722f5cb04c0e0847 Mon Sep 17 00:00:00 2001 1From 615598fcca64461a71d84f756d75374f02d914ad Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:11:22 +0000 3Date: Wed, 18 Mar 2015 00:11:22 +0000
4Subject: [PATCH 06/25] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known 4Subject: [PATCH 06/27] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known
5 names 5 names
6 6
7This bolts in a hook for OE to pass its own version of interpreter 7This bolts in a hook for OE to pass its own version of interpreter
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 1 insertion(+) 17 1 file changed, 1 insertion(+)
18 18
19diff --git a/elf/readlib.c b/elf/readlib.c 19diff --git a/elf/readlib.c b/elf/readlib.c
20index d278a189b2..a84cb85158 100644 20index 573c01476c..d8c7412287 100644
21--- a/elf/readlib.c 21--- a/elf/readlib.c
22+++ b/elf/readlib.c 22+++ b/elf/readlib.c
23@@ -51,6 +51,7 @@ static struct known_names interpreters[] = 23@@ -51,6 +51,7 @@ static struct known_names interpreters[] =
@@ -29,5 +29,5 @@ index d278a189b2..a84cb85158 100644
29 29
30 static struct known_names known_libs[] = 30 static struct known_names known_libs[] =
31-- 31--
322.13.2 322.16.1
33 33
diff --git a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
index b64327667c..1234df0a09 100644
--- a/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
+++ b/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
@@ -1,7 +1,7 @@
1From cf00bf9de8128171e79a019de809e35f3aeed281 Mon Sep 17 00:00:00 2001 1From 804b73ae295bdfda29341e89f2d0c1b99492dc9a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:15:07 +0000 3Date: Wed, 18 Mar 2015 00:15:07 +0000
4Subject: [PATCH 07/25] ppc/sqrt: Fix undefined reference to `__sqrt_finite' 4Subject: [PATCH 07/27] ppc/sqrt: Fix undefined reference to `__sqrt_finite'
5 5
6on ppc fixes the errors like below 6on ppc fixes the errors like below
7| ./.libs/libpulsecore-1.1.so: undefined reference to `__sqrt_finite' 7| ./.libs/libpulsecore-1.1.so: undefined reference to `__sqrt_finite'
@@ -204,5 +204,5 @@ index 26fa067abf..9d175122a8 100644
204 } 204 }
205+strong_alias (__ieee754_sqrtf, __sqrtf_finite) 205+strong_alias (__ieee754_sqrtf, __sqrtf_finite)
206-- 206--
2072.13.2 2072.16.1
208 208
diff --git a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index 3aeec5288b..1b43647514 100644
--- a/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
@@ -1,7 +1,7 @@
1From babe311deca9ee2730278f13b061b914b5286dc3 Mon Sep 17 00:00:00 2001 1From 1a53084249d9dae1ef4281246efc899c8f9d63ed Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:16:38 +0000 3Date: Wed, 18 Mar 2015 00:16:38 +0000
4Subject: [PATCH 08/25] __ieee754_sqrt{,f} are now inline functions and call 4Subject: [PATCH 08/27] __ieee754_sqrt{,f} are now inline functions and call
5 out __slow versions 5 out __slow versions
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -383,5 +383,5 @@ index 9d175122a8..10de1f0cc3 100644
383+ 383+
384 strong_alias (__ieee754_sqrtf, __sqrtf_finite) 384 strong_alias (__ieee754_sqrtf, __sqrtf_finite)
385-- 385--
3862.13.2 3862.16.1
387 387
diff --git a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
index 7d5c2e31f5..ea498569b3 100644
--- a/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
+++ b/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
@@ -1,7 +1,7 @@
1From 93b5d6bed19939039031c45b777d29619db06184 Mon Sep 17 00:00:00 2001 1From 48262b6dda935278a40374ddf0080ab6cc999582 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:20:09 +0000 3Date: Wed, 18 Mar 2015 00:20:09 +0000
4Subject: [PATCH 09/25] Quote from bug 1443 which explains what the patch does 4Subject: [PATCH 09/27] Quote from bug 1443 which explains what the patch does
5 : 5 :
6 6
7 We build some random program and link it with -lust. When we run it, 7 We build some random program and link it with -lust. When we run it,
@@ -45,10 +45,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
45 1 file changed, 1 insertion(+), 1 deletion(-) 45 1 file changed, 1 insertion(+), 1 deletion(-)
46 46
47diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h 47diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
48index 7053ead16e..0b1e1716b0 100644 48index 8a00eab5e3..623edcb1bd 100644
49--- a/sysdeps/arm/dl-machine.h 49--- a/sysdeps/arm/dl-machine.h
50+++ b/sysdeps/arm/dl-machine.h 50+++ b/sysdeps/arm/dl-machine.h
51@@ -500,7 +500,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, 51@@ -510,7 +510,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
52 52
53 case R_ARM_TLS_DTPOFF32: 53 case R_ARM_TLS_DTPOFF32:
54 if (sym != NULL) 54 if (sym != NULL)
@@ -58,5 +58,5 @@ index 7053ead16e..0b1e1716b0 100644
58 58
59 case R_ARM_TLS_TPOFF32: 59 case R_ARM_TLS_TPOFF32:
60-- 60--
612.13.2 612.16.1
62 62
diff --git a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
index 7275c3e96d..17513185da 100644
--- a/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
+++ b/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
@@ -1,7 +1,7 @@
1From 1a6e0f4ee8584b04226156df1a3de3e467f0ef6f Mon Sep 17 00:00:00 2001 1From 72ea5410909aef6b6aee70e7f9a88d534583aa00 Mon Sep 17 00:00:00 2001
2From: Ting Liu <b28495@freescale.com> 2From: Ting Liu <b28495@freescale.com>
3Date: Wed, 19 Dec 2012 04:39:57 -0600 3Date: Wed, 19 Dec 2012 04:39:57 -0600
4Subject: [PATCH 10/25] eglibc: run libm-err-tab.pl with specific dirs in ${S} 4Subject: [PATCH 10/27] eglibc: run libm-err-tab.pl with specific dirs in ${S}
5 5
6libm-err-tab.pl will parse all the files named "libm-test-ulps" 6libm-err-tab.pl will parse all the files named "libm-test-ulps"
7in the given dir recursively. To avoid parsing the one in 7in the given dir recursively. To avoid parsing the one in
@@ -18,10 +18,10 @@ Signed-off-by: Ting Liu <b28495@freescale.com>
18 1 file changed, 2 insertions(+), 1 deletion(-) 18 1 file changed, 2 insertions(+), 1 deletion(-)
19 19
20diff --git a/manual/Makefile b/manual/Makefile 20diff --git a/manual/Makefile b/manual/Makefile
21index 4ed63a8ef3..e89919eb19 100644 21index c2756640a7..1b5bb16a96 100644
22--- a/manual/Makefile 22--- a/manual/Makefile
23+++ b/manual/Makefile 23+++ b/manual/Makefile
24@@ -105,7 +105,8 @@ $(objpfx)libm-err.texi: $(objpfx)stamp-libm-err 24@@ -102,7 +102,8 @@ $(objpfx)libm-err.texi: $(objpfx)stamp-libm-err
25 $(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ 25 $(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
26 $(dir)/libm-test-ulps)) 26 $(dir)/libm-test-ulps))
27 pwd=`pwd`; \ 27 pwd=`pwd`; \
@@ -32,5 +32,5 @@ index 4ed63a8ef3..e89919eb19 100644
32 touch $@ 32 touch $@
33 33
34-- 34--
352.13.2 352.16.1
36 36
diff --git a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index 84f2ca5234..1e70b2a30e 100644
--- a/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
@@ -1,7 +1,7 @@
1From 9b2af6cbf68d3353d72519e7f6c46becb7bd1d0f Mon Sep 17 00:00:00 2001 1From 8ae998a10b24545e0c12f1f3d8be97b191178204 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:24:46 +0000 3Date: Wed, 18 Mar 2015 00:24:46 +0000
4Subject: [PATCH 11/25] __ieee754_sqrt{,f} are now inline functions and call 4Subject: [PATCH 11/27] __ieee754_sqrt{,f} are now inline functions and call
5 out __slow versions 5 out __slow versions
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -57,5 +57,5 @@ index 812653558f..10de1f0cc3 100644
57 #endif 57 #endif
58 { 58 {
59-- 59--
602.13.2 602.16.1
61 61
diff --git a/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
index 2bf6b23ad1..c35b759a28 100644
--- a/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
+++ b/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
@@ -1,7 +1,7 @@
1From ffd3c5a04d8f2f26fea71fed4ce41e88b6f51086 Mon Sep 17 00:00:00 2001 1From 4f9f39761909e67bd6d29b970b7165863e33e565 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:27:10 +0000 3Date: Wed, 18 Mar 2015 00:27:10 +0000
4Subject: [PATCH 12/25] sysdeps/gnu/configure.ac: handle correctly 4Subject: [PATCH 12/27] sysdeps/gnu/configure.ac: handle correctly
5 $libc_cv_rootsbindir 5 $libc_cv_rootsbindir
6 6
7Upstream-Status:Pending 7Upstream-Status:Pending
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 2 insertions(+), 2 deletions(-) 14 2 files changed, 2 insertions(+), 2 deletions(-)
15 15
16diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure 16diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure
17index 71243ad0c6..f578187576 100644 17index c15d1087e8..37cc983f2a 100644
18--- a/sysdeps/gnu/configure 18--- a/sysdeps/gnu/configure
19+++ b/sysdeps/gnu/configure 19+++ b/sysdeps/gnu/configure
20@@ -32,6 +32,6 @@ case "$prefix" in 20@@ -32,6 +32,6 @@ case "$prefix" in
@@ -38,5 +38,5 @@ index 634fe4de2a..3db1697f4f 100644
38 ;; 38 ;;
39 esac 39 esac
40-- 40--
412.13.2 412.16.1
42 42
diff --git a/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch b/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch
index 099fe50ee2..62c65253dd 100644
--- a/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch
+++ b/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch
@@ -1,7 +1,7 @@
1From 049cce82f35e0d864d98075b83888dbba4d68afd Mon Sep 17 00:00:00 2001 1From bba7a647b636618d5fd083e904f995f7736b9168 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:28:41 +0000 3Date: Wed, 18 Mar 2015 00:28:41 +0000
4Subject: [PATCH 13/25] Add unused attribute 4Subject: [PATCH 13/27] Add unused attribute
5 5
6Helps in avoiding gcc warning when header is is included in 6Helps in avoiding gcc warning when header is is included in
7a source file which does not use both functions 7a source file which does not use both functions
@@ -17,7 +17,7 @@ Upstream-Status: Pending
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h 19diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
20index 18d8bd6ae7..eb729da5d3 100644 20index 123e2a62ce..63cc83ec84 100644
21--- a/iconv/gconv_charset.h 21--- a/iconv/gconv_charset.h
22+++ b/iconv/gconv_charset.h 22+++ b/iconv/gconv_charset.h
23@@ -21,7 +21,7 @@ 23@@ -21,7 +21,7 @@
@@ -30,5 +30,5 @@ index 18d8bd6ae7..eb729da5d3 100644
30 { 30 {
31 int slash_count = 0; 31 int slash_count = 0;
32-- 32--
332.13.2 332.16.1
34 34
diff --git a/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch b/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch
index ddc70e0e60..66911285a9 100644
--- a/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch
+++ b/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch
@@ -1,7 +1,7 @@
1From 3b904bee81a1cfe81e3f437b5f3296efd54a51ac Mon Sep 17 00:00:00 2001 1From 62f44ce3dd01a257cf67116e355492cb1659a917 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:31:06 +0000 3Date: Wed, 18 Mar 2015 00:31:06 +0000
4Subject: [PATCH 14/25] 'yes' within the path sets wrong config variables 4Subject: [PATCH 14/27] 'yes' within the path sets wrong config variables
5 5
6It seems that the 'AC_EGREP_CPP(yes...' example is quite popular 6It seems that the 'AC_EGREP_CPP(yes...' example is quite popular
7but being such a short word to grep it is likely to produce 7but being such a short word to grep it is likely to produce
@@ -165,7 +165,7 @@ index f05f43802b..dc8639902d 100644
165 ], libc_cv_nios2_be=yes, libc_cv_nios2_be=no)]) 165 ], libc_cv_nios2_be=yes, libc_cv_nios2_be=no)])
166 if test $libc_cv_nios2_be = yes; then 166 if test $libc_cv_nios2_be = yes; then
167diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure 167diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure
168index a5513fad48..283b293ff3 100644 168index 1ee7f41a36..77e38bebde 100644
169--- a/sysdeps/unix/sysv/linux/mips/configure 169--- a/sysdeps/unix/sysv/linux/mips/configure
170+++ b/sysdeps/unix/sysv/linux/mips/configure 170+++ b/sysdeps/unix/sysv/linux/mips/configure
171@@ -414,11 +414,11 @@ else 171@@ -414,11 +414,11 @@ else
@@ -199,7 +199,7 @@ index 9147aa4582..7898e24738 100644
199 199
200 libc_mips_nan= 200 libc_mips_nan=
201diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure 201diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
202index 4e7fcf1d97..44a9cb3791 100644 202index ae7f254da4..874519000b 100644
203--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure 203--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
204+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure 204+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
205@@ -155,12 +155,12 @@ else 205@@ -155,12 +155,12 @@ else
@@ -259,5 +259,5 @@ index f9cba6e15d..b21f72f1e4 100644
259 ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)]) 259 ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)])
260 if test $libc_cv_ppc64_def_call_elf = no; then 260 if test $libc_cv_ppc64_def_call_elf = no; then
261-- 261--
2622.13.2 2622.16.1
263 263
diff --git a/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch b/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch
index b5feffa06a..66bf4fdabd 100644
--- a/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch
+++ b/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch
@@ -1,7 +1,7 @@
1From b8cb8cb242cb751d888feb1ada5c4d0f05cbc1d7 Mon Sep 17 00:00:00 2001 1From ac240fb01f6470ac207968adfbe20ccc93b16f8b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:33:03 +0000 3Date: Wed, 18 Mar 2015 00:33:03 +0000
4Subject: [PATCH 15/25] timezone: re-written tzselect as posix sh 4Subject: [PATCH 15/27] timezone: re-written tzselect as posix sh
5 5
6To avoid the bash dependency. 6To avoid the bash dependency.
7 7
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 2 files changed, 2 insertions(+), 2 deletions(-) 15 2 files changed, 2 insertions(+), 2 deletions(-)
16 16
17diff --git a/timezone/Makefile b/timezone/Makefile 17diff --git a/timezone/Makefile b/timezone/Makefile
18index d6cc7ba357..e4ead6e1a7 100644 18index 0194aba4a1..58e5405a05 100644
19--- a/timezone/Makefile 19--- a/timezone/Makefile
20+++ b/timezone/Makefile 20+++ b/timezone/Makefile
21@@ -122,7 +122,7 @@ $(testdata)/XT%: testdata/XT% 21@@ -122,7 +122,7 @@ $(testdata)/XT%: testdata/XT%
@@ -41,5 +41,5 @@ index d2c3a6d1dd..089679f306 100755
41 # Output one argument as-is to standard output. 41 # Output one argument as-is to standard output.
42 # Safer than 'echo', which can mishandle '\' or leading '-'. 42 # Safer than 'echo', which can mishandle '\' or leading '-'.
43-- 43--
442.13.2 442.16.1
45 45
diff --git a/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch b/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch
index 1d9983b8e5..0b1ee96871 100644
--- a/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch
+++ b/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch
@@ -1,7 +1,7 @@
1From 69d378001adfe9a359d2f4b069c1ed2d36de4480 Mon Sep 17 00:00:00 2001 1From 790b133ff2bc5b77ed8533b8999abc65ed0da02b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 14:33:02 -0800 3Date: Thu, 31 Dec 2015 14:33:02 -0800
4Subject: [PATCH 16/25] Remove bash dependency for nscd init script 4Subject: [PATCH 16/27] Remove bash dependency for nscd init script
5 5
6The nscd init script uses #! /bin/bash but only really uses one bashism 6The nscd init script uses #! /bin/bash but only really uses one bashism
7(translated strings), so remove them and switch the shell to #!/bin/sh. 7(translated strings), so remove them and switch the shell to #!/bin/sh.
@@ -71,5 +71,5 @@ index a882da7d8b..b02986ec15 100644
71 ;; 71 ;;
72 esac 72 esac
73-- 73--
742.13.2 742.16.1
75 75
diff --git a/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch b/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch
index 3e39d7458c..fd821323d7 100644
--- a/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch
+++ b/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch
@@ -1,7 +1,7 @@
1From cdc88dffa226815e3a218604655459e33dc86483 Mon Sep 17 00:00:00 2001 1From 897430bbb65a0f22284d7957206b5fd4efd6607f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:42:58 +0000 3Date: Wed, 18 Mar 2015 00:42:58 +0000
4Subject: [PATCH 17/25] eglibc: Cross building and testing instructions 4Subject: [PATCH 17/27] eglibc: Cross building and testing instructions
5 5
6Ported from eglibc 6Ported from eglibc
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -615,5 +615,5 @@ index 0000000000..b67b468466
615+ simply place copies of these libraries in the top GLIBC build 615+ simply place copies of these libraries in the top GLIBC build
616+ directory. 616+ directory.
617-- 617--
6182.13.2 6182.16.1
619 619
diff --git a/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch b/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch
index 02f35f4e7b..80d547c80d 100644
--- a/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch
+++ b/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch
@@ -1,7 +1,7 @@
1From 1161cd1c683547d29a03626d9d7de7f9cc03b74a Mon Sep 17 00:00:00 2001 1From fcfa19b69e8749477022161a808a201807ef72ec Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:49:28 +0000 3Date: Wed, 18 Mar 2015 00:49:28 +0000
4Subject: [PATCH 18/25] eglibc: Help bootstrap cross toolchain 4Subject: [PATCH 18/27] eglibc: Help bootstrap cross toolchain
5 5
6Taken from EGLIBC, r1484 + r1525 6Taken from EGLIBC, r1484 + r1525
7 7
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
29 create mode 100644 include/stubs-bootstrap.h 29 create mode 100644 include/stubs-bootstrap.h
30 30
31diff --git a/Makefile b/Makefile 31diff --git a/Makefile b/Makefile
32index 3e0ae6f43b..24dc66d17c 100644 32index bea4e27f8d..8c83cfadc6 100644
33--- a/Makefile 33--- a/Makefile
34+++ b/Makefile 34+++ b/Makefile
35@@ -70,9 +70,18 @@ subdir-dirs = include 35@@ -70,9 +70,18 @@ subdir-dirs = include
@@ -96,5 +96,5 @@ index 0000000000..1d2b669aff
96+ EGLIBC subdir 'stubs' make targets, on every .o file in EGLIBC, but 96+ EGLIBC subdir 'stubs' make targets, on every .o file in EGLIBC, but
97+ an empty stubs.h like this will do fine for GCC. */ 97+ an empty stubs.h like this will do fine for GCC. */
98-- 98--
992.13.2 992.16.1
100 100
diff --git a/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch b/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch
index adb28cfd34..17bfe4fe84 100644
--- a/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch
+++ b/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch
@@ -1,7 +1,7 @@
1From 1732c7f25453c879c17701839ef34876a7357008 Mon Sep 17 00:00:00 2001 1From c6f2db0d7c5c65bfa19766a0e1ce8210111f9c7d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 15:15:09 -0800 3Date: Thu, 31 Dec 2015 15:15:09 -0800
4Subject: [PATCH 19/25] eglibc: Clear cache lines on ppc8xx 4Subject: [PATCH 19/27] eglibc: Clear cache lines on ppc8xx
5 5
62007-06-13 Nathan Sidwell <nathan@codesourcery.com> 62007-06-13 Nathan Sidwell <nathan@codesourcery.com>
7 Mark Shinwell <shinwell@codesourcery.com> 7 Mark Shinwell <shinwell@codesourcery.com>
@@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
21 2 files changed, 28 insertions(+), 2 deletions(-) 21 2 files changed, 28 insertions(+), 2 deletions(-)
22 22
23diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c 23diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
24index 23f5d5d388..7e45288db7 100644 24index 78051bc7bc..e24f442320 100644
25--- a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c 25--- a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
26+++ b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c 26+++ b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
27@@ -24,9 +24,21 @@ int __cache_line_size attribute_hidden; 27@@ -24,9 +24,21 @@ int __cache_line_size attribute_hidden;
@@ -48,7 +48,7 @@ index 23f5d5d388..7e45288db7 100644
48 break; 48 break;
49 49
50diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c 50diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c
51index ad036c1e4b..afee56a3da 100644 51index f2ad0c355d..3e6773795e 100644
52--- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c 52--- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c
53+++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c 53+++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c
54@@ -73,11 +73,25 @@ __libc_start_main (int argc, char **argv, 54@@ -73,11 +73,25 @@ __libc_start_main (int argc, char **argv,
@@ -79,5 +79,5 @@ index ad036c1e4b..afee56a3da 100644
79 break; 79 break;
80 #ifndef SHARED 80 #ifndef SHARED
81-- 81--
822.13.2 822.16.1
83 83
diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch
index f835d871ab..09f7670758 100644
--- a/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch
+++ b/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch
@@ -1,7 +1,7 @@
1From 108b3a1df96a85522c52a0dec032fc2c106f5f2d Mon Sep 17 00:00:00 2001 1From 577085016bb926a687abec145557fe8cb8f5af0e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:55:53 +0000 3Date: Wed, 18 Mar 2015 00:55:53 +0000
4Subject: [PATCH 20/25] eglibc: Resolve __fpscr_values on SH4 4Subject: [PATCH 20/27] eglibc: Resolve __fpscr_values on SH4
5 5
62010-09-29 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> 62010-09-29 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
7 Andrew Stubbs <ams@codesourcery.com> 7 Andrew Stubbs <ams@codesourcery.com>
@@ -33,7 +33,7 @@ index e0938c4165..ca1d7da339 100644
33 # a* 33 # a*
34 alphasort64; 34 alphasort64;
35diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.S b/sysdeps/unix/sysv/linux/sh/sysdep.S 35diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.S b/sysdeps/unix/sysv/linux/sh/sysdep.S
36index 5f11bc737b..2fd217b00b 100644 36index c4e28ffb98..648bae03d5 100644
37--- a/sysdeps/unix/sysv/linux/sh/sysdep.S 37--- a/sysdeps/unix/sysv/linux/sh/sysdep.S
38+++ b/sysdeps/unix/sysv/linux/sh/sysdep.S 38+++ b/sysdeps/unix/sysv/linux/sh/sysdep.S
39@@ -30,3 +30,14 @@ ENTRY (__syscall_error) 39@@ -30,3 +30,14 @@ ENTRY (__syscall_error)
@@ -52,5 +52,5 @@ index 5f11bc737b..2fd217b00b 100644
52+weak_alias (___fpscr_values, __fpscr_values) 52+weak_alias (___fpscr_values, __fpscr_values)
53+ 53+
54-- 54--
552.13.2 552.16.1
56 56
diff --git a/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch b/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch
index 6ee397bf75..530f4e1087 100644
--- a/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch
+++ b/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch
@@ -1,7 +1,7 @@
1From 3392ee83b0132c089dffb1e9892b4b252ce1ec0e Mon Sep 17 00:00:00 2001 1From c1beab8a11985f96f5eb644e7103d343b705afc6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:57:01 +0000 3Date: Wed, 18 Mar 2015 01:57:01 +0000
4Subject: [PATCH 21/25] eglibc: Install PIC archives 4Subject: [PATCH 21/27] eglibc: Install PIC archives
5 5
6Forward port from eglibc 6Forward port from eglibc
7 7
@@ -29,10 +29,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
29 1 file changed, 40 insertions(+), 2 deletions(-) 29 1 file changed, 40 insertions(+), 2 deletions(-)
30 30
31diff --git a/Makerules b/Makerules 31diff --git a/Makerules b/Makerules
32index 9bb707c168..74cbefb9ba 100644 32index ef6abeac6d..eeaa667f49 100644
33--- a/Makerules 33--- a/Makerules
34+++ b/Makerules 34+++ b/Makerules
35@@ -775,6 +775,9 @@ ifeq ($(build-shared),yes) 35@@ -778,6 +778,9 @@ ifeq ($(build-shared),yes)
36 $(common-objpfx)libc.so: $(common-objpfx)libc.map 36 $(common-objpfx)libc.so: $(common-objpfx)libc.map
37 endif 37 endif
38 common-generated += libc.so libc_pic.os 38 common-generated += libc.so libc_pic.os
@@ -42,7 +42,7 @@ index 9bb707c168..74cbefb9ba 100644
42 ifdef libc.so-version 42 ifdef libc.so-version
43 $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so 43 $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so
44 $(make-link) 44 $(make-link)
45@@ -1026,6 +1029,7 @@ endif 45@@ -1029,6 +1032,7 @@ endif
46 46
47 install: check-install-supported 47 install: check-install-supported
48 48
@@ -50,7 +50,7 @@ index 9bb707c168..74cbefb9ba 100644
50 install: $(installed-libcs) 50 install: $(installed-libcs)
51 $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force) 51 $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force)
52 $(make-target-directory) 52 $(make-target-directory)
53@@ -1054,6 +1058,22 @@ versioned := $(strip $(foreach so,$(install-lib.so),\ 53@@ -1057,6 +1061,22 @@ versioned := $(strip $(foreach so,$(install-lib.so),\
54 install-lib.so-versioned := $(filter $(versioned), $(install-lib.so)) 54 install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
55 install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so)) 55 install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
56 56
@@ -73,7 +73,7 @@ index 9bb707c168..74cbefb9ba 100644
73 # For versioned libraries, we install three files: 73 # For versioned libraries, we install three files:
74 # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script 74 # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script
75 # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink 75 # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink
76@@ -1298,9 +1318,22 @@ $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \ 76@@ -1311,9 +1331,22 @@ $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \
77 endif # headers-nonh 77 endif # headers-nonh
78 endif # headers 78 endif # headers
79 79
@@ -97,7 +97,7 @@ index 9bb707c168..74cbefb9ba 100644
97 install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin)) 97 install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin))
98 install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script)) 98 install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script))
99 install-rootsbin-nosubdir: \ 99 install-rootsbin-nosubdir: \
100@@ -1313,6 +1346,10 @@ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data)) 100@@ -1326,6 +1359,10 @@ install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data))
101 install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers)) 101 install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))
102 install-others-nosubdir: $(install-others) 102 install-others-nosubdir: $(install-others)
103 install-others-programs-nosubdir: $(install-others-programs) 103 install-others-programs-nosubdir: $(install-others-programs)
@@ -108,7 +108,7 @@ index 9bb707c168..74cbefb9ba 100644
108 108
109 # We need all the `-nosubdir' targets so that `install' in the parent 109 # We need all the `-nosubdir' targets so that `install' in the parent
110 # doesn't depend on several things which each iterate over the subdirs. 110 # doesn't depend on several things which each iterate over the subdirs.
111@@ -1322,7 +1359,8 @@ install-%:: install-%-nosubdir ; 111@@ -1335,7 +1372,8 @@ install-%:: install-%-nosubdir ;
112 112
113 .PHONY: install install-no-libc.a-nosubdir 113 .PHONY: install install-no-libc.a-nosubdir
114 install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \ 114 install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \
@@ -119,5 +119,5 @@ index 9bb707c168..74cbefb9ba 100644
119 install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \ 119 install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \
120 install-rootsbin-nosubdir install-sbin-nosubdir \ 120 install-rootsbin-nosubdir install-sbin-nosubdir \
121-- 121--
1222.13.2 1222.16.1
123 123
diff --git a/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
index 2a8a20ac8d..a629ce141a 100644
--- a/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
+++ b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
@@ -1,7 +1,7 @@
1From d97533dc201cfd863765b1a67a27fde3e2622da7 Mon Sep 17 00:00:00 2001 1From e019fe6a2b410db6043e21803f497b5cbdd90a83 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:33:49 +0000 3Date: Wed, 18 Mar 2015 01:33:49 +0000
4Subject: [PATCH 22/25] eglibc: Forward port cross locale generation support 4Subject: [PATCH 22/27] eglibc: Forward port cross locale generation support
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 create mode 100644 locale/catnames.c 23 create mode 100644 locale/catnames.c
24 24
25diff --git a/locale/Makefile b/locale/Makefile 25diff --git a/locale/Makefile b/locale/Makefile
26index 98ee76272d..bc3afb2248 100644 26index fd9972279b..176b3946de 100644
27--- a/locale/Makefile 27--- a/locale/Makefile
28+++ b/locale/Makefile 28+++ b/locale/Makefile
29@@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \ 29@@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \
@@ -91,7 +91,7 @@ index 0000000000..9fad357db1
91+ [LC_ALL] = sizeof ("LC_ALL") - 1 91+ [LC_ALL] = sizeof ("LC_ALL") - 1
92+ }; 92+ };
93diff --git a/locale/localeinfo.h b/locale/localeinfo.h 93diff --git a/locale/localeinfo.h b/locale/localeinfo.h
94index 4e1c8c568a..f7ed946f1c 100644 94index 68822a6319..fa36123776 100644
95--- a/locale/localeinfo.h 95--- a/locale/localeinfo.h
96+++ b/locale/localeinfo.h 96+++ b/locale/localeinfo.h
97@@ -224,7 +224,7 @@ __libc_tsd_define (extern, locale_t, LOCALE) 97@@ -224,7 +224,7 @@ __libc_tsd_define (extern, locale_t, LOCALE)
@@ -104,11 +104,11 @@ index 4e1c8c568a..f7ed946f1c 100644
104 # define NL_CURRENT_INDIRECT 1 104 # define NL_CURRENT_INDIRECT 1
105 #endif 105 #endif
106diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c 106diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c
107index e55ab86e28..0f87e6dd28 100644 107index 34a8d32c92..cbb9436cd1 100644
108--- a/locale/programs/charmap-dir.c 108--- a/locale/programs/charmap-dir.c
109+++ b/locale/programs/charmap-dir.c 109+++ b/locale/programs/charmap-dir.c
110@@ -19,7 +19,9 @@ 110@@ -18,7 +18,9 @@
111 #include <error.h> 111 #include <errno.h>
112 #include <fcntl.h> 112 #include <fcntl.h>
113 #include <libintl.h> 113 #include <libintl.h>
114+#ifndef NO_UNCOMPRESS 114+#ifndef NO_UNCOMPRESS
@@ -117,7 +117,7 @@ index e55ab86e28..0f87e6dd28 100644
117 #include <stdio.h> 117 #include <stdio.h>
118 #include <stdlib.h> 118 #include <stdlib.h>
119 #include <string.h> 119 #include <string.h>
120@@ -156,6 +158,7 @@ charmap_closedir (CHARMAP_DIR *cdir) 120@@ -154,6 +156,7 @@ charmap_closedir (CHARMAP_DIR *cdir)
121 return closedir (dir); 121 return closedir (dir);
122 } 122 }
123 123
@@ -125,7 +125,7 @@ index e55ab86e28..0f87e6dd28 100644
125 /* Creates a subprocess decompressing the given pathname, and returns 125 /* Creates a subprocess decompressing the given pathname, and returns
126 a stream reading its output (the decompressed data). */ 126 a stream reading its output (the decompressed data). */
127 static 127 static
128@@ -204,6 +207,7 @@ fopen_uncompressed (const char *pathname, const char *compressor) 128@@ -202,6 +205,7 @@ fopen_uncompressed (const char *pathname, const char *compressor)
129 } 129 }
130 return NULL; 130 return NULL;
131 } 131 }
@@ -133,7 +133,7 @@ index e55ab86e28..0f87e6dd28 100644
133 133
134 /* Opens a charmap for reading, given its name (not an alias name). */ 134 /* Opens a charmap for reading, given its name (not an alias name). */
135 FILE * 135 FILE *
136@@ -226,6 +230,7 @@ charmap_open (const char *directory, const char *name) 136@@ -224,6 +228,7 @@ charmap_open (const char *directory, const char *name)
137 if (stream != NULL) 137 if (stream != NULL)
138 return stream; 138 return stream;
139 139
@@ -141,7 +141,7 @@ index e55ab86e28..0f87e6dd28 100644
141 memcpy (p, ".gz", 4); 141 memcpy (p, ".gz", 4);
142 stream = fopen_uncompressed (pathname, "gzip"); 142 stream = fopen_uncompressed (pathname, "gzip");
143 if (stream != NULL) 143 if (stream != NULL)
144@@ -235,6 +240,7 @@ charmap_open (const char *directory, const char *name) 144@@ -233,6 +238,7 @@ charmap_open (const char *directory, const char *name)
145 stream = fopen_uncompressed (pathname, "bzip2"); 145 stream = fopen_uncompressed (pathname, "bzip2");
146 if (stream != NULL) 146 if (stream != NULL)
147 return stream; 147 return stream;
@@ -150,10 +150,10 @@ index e55ab86e28..0f87e6dd28 100644
150 return NULL; 150 return NULL;
151 } 151 }
152diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c 152diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
153index cec848cb7c..fcd768eb7d 100644 153index d2eebcfdbb..c3718d6589 100644
154--- a/locale/programs/ld-collate.c 154--- a/locale/programs/ld-collate.c
155+++ b/locale/programs/ld-collate.c 155+++ b/locale/programs/ld-collate.c
156@@ -350,7 +350,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen, 156@@ -349,7 +349,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen,
157 } 157 }
158 if (wcs != NULL) 158 if (wcs != NULL)
159 { 159 {
@@ -162,7 +162,7 @@ index cec848cb7c..fcd768eb7d 100644
162 uint32_t zero = 0; 162 uint32_t zero = 0;
163 /* Handle <U0000> as a single character. */ 163 /* Handle <U0000> as a single character. */
164 if (nwcs == 0) 164 if (nwcs == 0)
165@@ -1776,8 +1776,7 @@ symbol `%s' has the same encoding as"), (*eptr)->name); 165@@ -1772,8 +1772,7 @@ symbol `%s' has the same encoding as"), (*eptr)->name);
166 166
167 if ((*eptr)->nwcs == runp->nwcs) 167 if ((*eptr)->nwcs == runp->nwcs)
168 { 168 {
@@ -172,7 +172,7 @@ index cec848cb7c..fcd768eb7d 100644
172 172
173 if (c == 0) 173 if (c == 0)
174 { 174 {
175@@ -2010,9 +2009,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp) 175@@ -2000,9 +1999,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp)
176 one consecutive entry. */ 176 one consecutive entry. */
177 if (runp->wcnext != NULL 177 if (runp->wcnext != NULL
178 && runp->nwcs == runp->wcnext->nwcs 178 && runp->nwcs == runp->wcnext->nwcs
@@ -185,7 +185,7 @@ index cec848cb7c..fcd768eb7d 100644
185 && (runp->wcs[runp->nwcs - 1] 185 && (runp->wcs[runp->nwcs - 1]
186 == runp->wcnext->wcs[runp->nwcs - 1] + 1)) 186 == runp->wcnext->wcs[runp->nwcs - 1] + 1))
187 { 187 {
188@@ -2036,9 +2035,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp) 188@@ -2026,9 +2025,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp)
189 runp = runp->wcnext; 189 runp = runp->wcnext;
190 while (runp->wcnext != NULL 190 while (runp->wcnext != NULL
191 && runp->nwcs == runp->wcnext->nwcs 191 && runp->nwcs == runp->wcnext->nwcs
@@ -199,10 +199,10 @@ index cec848cb7c..fcd768eb7d 100644
199 == runp->wcnext->wcs[runp->nwcs - 1] + 1)); 199 == runp->wcnext->wcs[runp->nwcs - 1] + 1));
200 200
201diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c 201diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
202index df266c20d6..05c0152ec9 100644 202index f791e6b7e9..d809d6db7f 100644
203--- a/locale/programs/ld-ctype.c 203--- a/locale/programs/ld-ctype.c
204+++ b/locale/programs/ld-ctype.c 204+++ b/locale/programs/ld-ctype.c
205@@ -926,7 +926,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, 205@@ -915,7 +915,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap,
206 allocate_arrays (ctype, charmap, ctype->repertoire); 206 allocate_arrays (ctype, charmap, ctype->repertoire);
207 207
208 default_missing_len = (ctype->default_missing 208 default_missing_len = (ctype->default_missing
@@ -211,7 +211,7 @@ index df266c20d6..05c0152ec9 100644
211 : 0); 211 : 0);
212 212
213 init_locale_data (&file, nelems); 213 init_locale_data (&file, nelems);
214@@ -1937,7 +1937,7 @@ read_translit_entry (struct linereader *ldfile, struct locale_ctype_t *ctype, 214@@ -1926,7 +1926,7 @@ read_translit_entry (struct linereader *ldfile, struct locale_ctype_t *ctype,
215 ignore = 1; 215 ignore = 1;
216 else 216 else
217 /* This value is usable. */ 217 /* This value is usable. */
@@ -220,7 +220,7 @@ index df266c20d6..05c0152ec9 100644
220 220
221 first = 0; 221 first = 0;
222 } 222 }
223@@ -2471,8 +2471,8 @@ with character code range values one must use the absolute ellipsis `...'")); 223@@ -2460,8 +2460,8 @@ with character code range values one must use the absolute ellipsis `...'"));
224 } 224 }
225 225
226 handle_tok_digit: 226 handle_tok_digit:
@@ -231,7 +231,7 @@ index df266c20d6..05c0152ec9 100644
231 handle_digits = 1; 231 handle_digits = 1;
232 goto read_charclass; 232 goto read_charclass;
233 233
234@@ -3929,8 +3929,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, 234@@ -3901,8 +3901,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
235 235
236 while (idx < number) 236 while (idx < number)
237 { 237 {
@@ -241,7 +241,7 @@ index df266c20d6..05c0152ec9 100644
241 if (res == 0) 241 if (res == 0)
242 { 242 {
243 replace = 1; 243 replace = 1;
244@@ -3967,11 +3966,11 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, 244@@ -3939,11 +3938,11 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
245 for (size_t cnt = 0; cnt < number; ++cnt) 245 for (size_t cnt = 0; cnt < number; ++cnt)
246 { 246 {
247 struct translit_to_t *srunp; 247 struct translit_to_t *srunp;
@@ -255,7 +255,7 @@ index df266c20d6..05c0152ec9 100644
255 srunp = srunp->next; 255 srunp = srunp->next;
256 } 256 }
257 /* Plus one for the extra NUL character marking the end of 257 /* Plus one for the extra NUL character marking the end of
258@@ -3995,18 +3994,18 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, 258@@ -3967,18 +3966,18 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
259 ctype->translit_from_idx[cnt] = from_len; 259 ctype->translit_from_idx[cnt] = from_len;
260 ctype->translit_to_idx[cnt] = to_len; 260 ctype->translit_to_idx[cnt] = to_len;
261 261
@@ -281,10 +281,10 @@ index df266c20d6..05c0152ec9 100644
281 srunp = srunp->next; 281 srunp = srunp->next;
282 } 282 }
283diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c 283diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
284index 32e9c41e35..6a61fcedeb 100644 284index a755792363..e8b2f85522 100644
285--- a/locale/programs/ld-time.c 285--- a/locale/programs/ld-time.c
286+++ b/locale/programs/ld-time.c 286+++ b/locale/programs/ld-time.c
287@@ -215,8 +215,10 @@ No definition for %s category found"), "LC_TIME")); 287@@ -220,8 +220,10 @@ No definition for %s category found"), "LC_TIME");
288 } 288 }
289 else 289 else
290 { 290 {
@@ -296,7 +296,7 @@ index 32e9c41e35..6a61fcedeb 100644
296 } 296 }
297 } 297 }
298 298
299@@ -226,7 +228,7 @@ No definition for %s category found"), "LC_TIME")); 299@@ -231,7 +233,7 @@ No definition for %s category found"), "LC_TIME");
300 const int days_per_month[12] = { 31, 29, 31, 30, 31, 30, 300 const int days_per_month[12] = { 31, 29, 31, 30, 31, 30,
301 31, 31, 30, 31 ,30, 31 }; 301 31, 31, 30, 31 ,30, 31 };
302 size_t idx; 302 size_t idx;
@@ -305,7 +305,7 @@ index 32e9c41e35..6a61fcedeb 100644
305 305
306 time->era_entries = 306 time->era_entries =
307 (struct era_data *) xmalloc (time->num_era 307 (struct era_data *) xmalloc (time->num_era
308@@ -464,18 +466,18 @@ No definition for %s category found"), "LC_TIME")); 308@@ -457,18 +459,18 @@ No definition for %s category found"), "LC_TIME");
309 } 309 }
310 310
311 /* Now generate the wide character name and format. */ 311 /* Now generate the wide character name and format. */
@@ -331,7 +331,7 @@ index 32e9c41e35..6a61fcedeb 100644
331 } 331 }
332 else 332 else
333 time->era_entries[idx].wname = 333 time->era_entries[idx].wname =
334@@ -534,7 +536,16 @@ No definition for %s category found"), "LC_TIME")); 334@@ -527,7 +529,16 @@ No definition for %s category found"), "LC_TIME");
335 if (time->date_fmt == NULL) 335 if (time->date_fmt == NULL)
336 time->date_fmt = "%a %b %e %H:%M:%S %Z %Y"; 336 time->date_fmt = "%a %b %e %H:%M:%S %Z %Y";
337 if (time->wdate_fmt == NULL) 337 if (time->wdate_fmt == NULL)
@@ -350,7 +350,7 @@ index 32e9c41e35..6a61fcedeb 100644
350 350
351 351
352diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c 352diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
353index 52b340963a..1a8bce17b4 100644 353index 3525c8a43d..f8a7fd9c24 100644
354--- a/locale/programs/linereader.c 354--- a/locale/programs/linereader.c
355+++ b/locale/programs/linereader.c 355+++ b/locale/programs/linereader.c
356@@ -595,7 +595,7 @@ get_string (struct linereader *lr, const struct charmap_t *charmap, 356@@ -595,7 +595,7 @@ get_string (struct linereader *lr, const struct charmap_t *charmap,
@@ -363,18 +363,18 @@ index 52b340963a..1a8bce17b4 100644
363 size_t bufmax = 56; 363 size_t bufmax = 56;
364 364
365diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c 365diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
366index 6acc1342c7..df87740f8b 100644 366index d718d2e9f4..e0a3ad5a83 100644
367--- a/locale/programs/localedef.c 367--- a/locale/programs/localedef.c
368+++ b/locale/programs/localedef.c 368+++ b/locale/programs/localedef.c
369@@ -108,6 +108,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; 369@@ -105,6 +105,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
370 #define OPT_LIST_ARCHIVE 309
371 #define OPT_LITTLE_ENDIAN 400
372 #define OPT_BIG_ENDIAN 401 370 #define OPT_BIG_ENDIAN 401
373+#define OPT_UINT32_ALIGN 402 371 #define OPT_NO_WARN 402
372 #define OPT_WARN 403
373+#define OPT_UINT32_ALIGN 404
374 374
375 /* Definitions of arguments for argp functions. */ 375 /* Definitions of arguments for argp functions. */
376 static const struct argp_option options[] = 376 static const struct argp_option options[] =
377@@ -143,6 +144,8 @@ static const struct argp_option options[] = 377@@ -147,6 +148,8 @@ static const struct argp_option options[] =
378 N_("Generate little-endian output") }, 378 N_("Generate little-endian output") },
379 { "big-endian", OPT_BIG_ENDIAN, NULL, 0, 379 { "big-endian", OPT_BIG_ENDIAN, NULL, 0,
380 N_("Generate big-endian output") }, 380 N_("Generate big-endian output") },
@@ -383,7 +383,7 @@ index 6acc1342c7..df87740f8b 100644
383 { NULL, 0, NULL, 0, NULL } 383 { NULL, 0, NULL, 0, NULL }
384 }; 384 };
385 385
386@@ -232,12 +235,14 @@ main (int argc, char *argv[]) 386@@ -236,12 +239,14 @@ main (int argc, char *argv[])
387 ctype locale. (P1003.2 4.35.5.2) */ 387 ctype locale. (P1003.2 4.35.5.2) */
388 setlocale (LC_CTYPE, "POSIX"); 388 setlocale (LC_CTYPE, "POSIX");
389 389
@@ -392,15 +392,15 @@ index 6acc1342c7..df87740f8b 100644
392 defines error code 3 for this situation so I think it must be 392 defines error code 3 for this situation so I think it must be
393 a fatal error (see P1003.2 4.35.8). */ 393 a fatal error (see P1003.2 4.35.8). */
394 if (sysconf (_SC_2_LOCALEDEF) < 0) 394 if (sysconf (_SC_2_LOCALEDEF) < 0)
395 WITH_CUR_LOCALE (error (3, 0, _("\ 395 record_error (3, 0, _("\
396 FATAL: system does not define `_POSIX2_LOCALEDEF'"))); 396 FATAL: system does not define `_POSIX2_LOCALEDEF'"));
397+#endif 397+#endif
398 398
399 /* Process charmap file. */ 399 /* Process charmap file. */
400 charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1); 400 charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1);
401@@ -328,6 +333,9 @@ parse_opt (int key, char *arg, struct argp_state *state) 401@@ -389,6 +394,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
402 case OPT_BIG_ENDIAN: 402 /* Enable the warnings. */
403 set_big_endian (true); 403 set_warnings (arg, true);
404 break; 404 break;
405+ case OPT_UINT32_ALIGN: 405+ case OPT_UINT32_ALIGN:
406+ uint32_align_mask = strtol (arg, NULL, 0) - 1; 406+ uint32_align_mask = strtol (arg, NULL, 0) - 1;
@@ -409,7 +409,7 @@ index 6acc1342c7..df87740f8b 100644
409 force_output = 1; 409 force_output = 1;
410 break; 410 break;
411diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c 411diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
412index 0990ef11be..683422c908 100644 412index 32e5f761f2..b41e77bd8d 100644
413--- a/locale/programs/locfile.c 413--- a/locale/programs/locfile.c
414+++ b/locale/programs/locfile.c 414+++ b/locale/programs/locfile.c
415@@ -544,6 +544,9 @@ compare_files (const char *filename1, const char *filename2, size_t size, 415@@ -544,6 +544,9 @@ compare_files (const char *filename1, const char *filename2, size_t size,
@@ -432,7 +432,7 @@ index 0990ef11be..683422c908 100644
432 432
433 /* Record that FILE's next element is the 32-bit integer VALUE. */ 433 /* Record that FILE's next element is the 32-bit integer VALUE. */
434diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h 434diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h
435index 3407e13c13..0bb556caf8 100644 435index 89b347c72d..a636fc2960 100644
436--- a/locale/programs/locfile.h 436--- a/locale/programs/locfile.h
437+++ b/locale/programs/locfile.h 437+++ b/locale/programs/locfile.h
438@@ -71,6 +71,8 @@ extern void write_all_categories (struct localedef_t *definitions, 438@@ -71,6 +71,8 @@ extern void write_all_categories (struct localedef_t *definitions,
@@ -521,7 +521,7 @@ index 3407e13c13..0bb556caf8 100644
521+ 521+
522 #endif /* locfile.h */ 522 #endif /* locfile.h */
523diff --git a/locale/setlocale.c b/locale/setlocale.c 523diff --git a/locale/setlocale.c b/locale/setlocale.c
524index 19acc4b2c7..c89d3b87ad 100644 524index e4de907e1f..b5d8f5c17d 100644
525--- a/locale/setlocale.c 525--- a/locale/setlocale.c
526+++ b/locale/setlocale.c 526+++ b/locale/setlocale.c
527@@ -64,36 +64,6 @@ static char *const _nl_current_used[] = 527@@ -64,36 +64,6 @@ static char *const _nl_current_used[] =
@@ -562,5 +562,5 @@ index 19acc4b2c7..c89d3b87ad 100644
562 # define WEAK_POSTLOAD(postload) weak_extern (postload) 562 # define WEAK_POSTLOAD(postload) weak_extern (postload)
563 #else 563 #else
564-- 564--
5652.13.2 5652.16.1
566 566
diff --git a/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch b/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
index 9e580d44b1..ae708ef83e 100644
--- a/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
+++ b/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
@@ -1,7 +1,7 @@
1From cb4d00eac7f84092314de593626eea40f9529038 Mon Sep 17 00:00:00 2001 1From 9d71526be21abe68dd8ca3a5a219445851bbc2f4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 20 Apr 2016 21:11:00 -0700 3Date: Wed, 20 Apr 2016 21:11:00 -0700
4Subject: [PATCH 23/25] Define DUMMY_LOCALE_T if not defined 4Subject: [PATCH 23/27] Define DUMMY_LOCALE_T if not defined
5 5
6This is a hack to fix building the locale bits on an older 6This is a hack to fix building the locale bits on an older
7CentOs 5.X machine 7CentOs 5.X machine
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 3 insertions(+) 14 1 file changed, 3 insertions(+)
15 15
16diff --git a/locale/programs/config.h b/locale/programs/config.h 16diff --git a/locale/programs/config.h b/locale/programs/config.h
17index 5b416be0d8..79e66eed5e 100644 17index 9956cd8446..04342f3644 100644
18--- a/locale/programs/config.h 18--- a/locale/programs/config.h
19+++ b/locale/programs/config.h 19+++ b/locale/programs/config.h
20@@ -19,6 +19,9 @@ 20@@ -19,6 +19,9 @@
@@ -28,5 +28,5 @@ index 5b416be0d8..79e66eed5e 100644
28 #define PACKAGE _libc_intl_domainname 28 #define PACKAGE _libc_intl_domainname
29 #ifndef VERSION 29 #ifndef VERSION
30-- 30--
312.13.2 312.16.1
32 32
diff --git a/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch b/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
index 0b59352536..42ff667811 100644
--- a/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
+++ b/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
@@ -1,7 +1,7 @@
1From a784742739c90eea0d4ccbbd073a067d55ca95e8 Mon Sep 17 00:00:00 2001 1From 03873af286f1dab1062f598d6deb774ce513421d Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@windriver.com> 2From: Mark Hatle <mark.hatle@windriver.com>
3Date: Thu, 18 Aug 2016 14:07:58 -0500 3Date: Thu, 18 Aug 2016 14:07:58 -0500
4Subject: [PATCH 24/25] elf/dl-deps.c: Make _dl_build_local_scope breadth first 4Subject: [PATCH 24/27] elf/dl-deps.c: Make _dl_build_local_scope breadth first
5 5
6According to the ELF specification: 6According to the ELF specification:
7 7
@@ -24,10 +24,10 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
24 1 file changed, 10 insertions(+), 4 deletions(-) 24 1 file changed, 10 insertions(+), 4 deletions(-)
25 25
26diff --git a/elf/dl-deps.c b/elf/dl-deps.c 26diff --git a/elf/dl-deps.c b/elf/dl-deps.c
27index 1b8bac6593..c616808f31 100644 27index c975fcffd7..6ee58c74e0 100644
28--- a/elf/dl-deps.c 28--- a/elf/dl-deps.c
29+++ b/elf/dl-deps.c 29+++ b/elf/dl-deps.c
30@@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map) 30@@ -72,13 +72,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map)
31 { 31 {
32 struct link_map **p = list; 32 struct link_map **p = list;
33 struct link_map **q; 33 struct link_map **q;
@@ -52,5 +52,5 @@ index 1b8bac6593..c616808f31 100644
52 } 52 }
53 53
54-- 54--
552.13.2 552.16.1
56 56
diff --git a/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch b/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch
index 09ad04a4d4..7f5d1421d3 100644
--- a/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch
+++ b/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch
@@ -1,7 +1,7 @@
1From f3a670496c8fe6d4acf045f5b167a19cf41b044e Mon Sep 17 00:00:00 2001 1From 56dab024751941c07eb479f47ef6682e2168c86a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= <jeremy.rosen@smile.fr> 2From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= <jeremy.rosen@smile.fr>
3Date: Mon, 22 Aug 2016 16:09:25 +0200 3Date: Mon, 22 Aug 2016 16:09:25 +0200
4Subject: [PATCH 25/25] locale: fix hard-coded reference to gcc -E 4Subject: [PATCH 25/27] locale: fix hard-coded reference to gcc -E
5 5
6When new version of compilers are published, they may not be compatible with 6When new version of compilers are published, they may not be compatible with
7older versions of software. This is particularly common when software is built 7older versions of software. This is particularly common when software is built
@@ -34,5 +34,5 @@ index 30d3f2f195..e97653017c 100644
34 34
35 sub cstrlen { 35 sub cstrlen {
36-- 36--
372.13.2 372.16.1
38 38
diff --git a/meta/recipes-core/glibc/glibc/0027-glibc-reset-dl-load-write-lock-after-forking.patch b/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch
index 777b253405..eca1193dd3 100644
--- a/meta/recipes-core/glibc/glibc/0027-glibc-reset-dl-load-write-lock-after-forking.patch
+++ b/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch
@@ -1,7 +1,7 @@
1From a6bb73d1cfd20a73fbbe6076008376fb87879d1b Mon Sep 17 00:00:00 2001 1From 847d37d5a34e4bf294de4ba98de3668950e28bc7 Mon Sep 17 00:00:00 2001
2From: Yuanjie Huang <yuanjie.huang@windriver.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 18 Aug 2016 17:59:13 +0800 3Date: Sat, 27 Jan 2018 10:05:07 -0800
4Subject: [PATCH] reset dl_load_write_lock after forking 4Subject: [PATCH 26/27] reset dl_load_write_lock after forking
5 5
6The patch in this Bugzilla entry was requested by a customer: 6The patch in this Bugzilla entry was requested by a customer:
7 7
@@ -10,28 +10,31 @@ The patch in this Bugzilla entry was requested by a customer:
10The __libc_fork() code reset dl_load_lock, but it also needed to reset 10The __libc_fork() code reset dl_load_lock, but it also needed to reset
11dl_load_write_lock. The patch has not yet been integrated upstream. 11dl_load_write_lock. The patch has not yet been integrated upstream.
12 12
13Upstream-Status: Pending [ Not Author See bugzilla] 13Upstream-Status: Pending [ No Author See bugzilla]
14 14
15Signed-off-by: Damodar Sonone <damodar.sonone@kpit.com> 15Signed-off-by: Damodar Sonone <damodar.sonone@kpit.com>
16Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> 16Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
17--- 18---
18 sysdeps/nptl/fork.c | 3 ++- 19 sysdeps/nptl/fork.c | 4 ++--
19 1 file changed, 2 insertions(+), 1 deletion(-) 20 1 file changed, 2 insertions(+), 2 deletions(-)
20 21
21diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c 22diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
22index 2b9ae4b..3d0b8da 100644 23index 846fa49ef2..f87506f398 100644
23--- a/sysdeps/nptl/fork.c 24--- a/sysdeps/nptl/fork.c
24+++ b/sysdeps/nptl/fork.c 25+++ b/sysdeps/nptl/fork.c
25@@ -174,8 +174,9 @@ __libc_fork (void) 26@@ -194,9 +194,9 @@ __libc_fork (void)
26 /* Reset locks in the I/O code. */ 27 _IO_list_resetlock ();
27 _IO_list_resetlock (); 28 }
28 29
29- /* Reset the lock the dynamic loader uses to protect its data. */ 30- /* Reset the lock the dynamic loader uses to protect its data. */
30+ /* Reset the locks the dynamic loader uses to protect its data. */ 31+ /* Reset the locks the dynamic loader uses to protect its data. */
31 __rtld_lock_initialize (GL(dl_load_lock)); 32 __rtld_lock_initialize (GL(dl_load_lock));
33-
32+ __rtld_lock_initialize (GL(dl_load_write_lock)); 34+ __rtld_lock_initialize (GL(dl_load_write_lock));
33
34 /* Run the handlers registered for the child. */ 35 /* Run the handlers registered for the child. */
35 while (allp != NULL) 36 while (allp != NULL)
37 {
36-- 38--
371.9.1 392.16.1
40
diff --git a/meta/recipes-core/glibc/glibc/0028-Bug-4578-add-ld.so-lock-while-fork.patch b/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
index f76237a46e..9ec234bd51 100644
--- a/meta/recipes-core/glibc/glibc/0028-Bug-4578-add-ld.so-lock-while-fork.patch
+++ b/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
@@ -1,4 +1,9 @@
1The patch in this Bugzilla entry was requested by a customer: 1From 94225ab4bcc1613531558a632270b5edce779bc9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 27 Jan 2018 10:08:04 -0800
4Subject: [PATCH 27/27] Acquire ld.so lock before switching to malloc_atfork
5
6The patch is from
2 https://sourceware.org/bugzilla/show_bug.cgi?id=4578 7 https://sourceware.org/bugzilla/show_bug.cgi?id=4578
3 8
4If a thread happens to hold dl_load_lock and have r_state set to RT_ADD or 9If a thread happens to hold dl_load_lock and have r_state set to RT_ADD or
@@ -13,6 +18,7 @@ from the parent path. The child path is initialized as currently done.
13This is essentially pthreads_atfork, but forced to be first because the 18This is essentially pthreads_atfork, but forced to be first because the
14acquisition of dl_load_lock must happen before malloc_atfork is active 19acquisition of dl_load_lock must happen before malloc_atfork is active
15to avoid a deadlock. 20to avoid a deadlock.
21
16The patch has not yet been integrated upstream. 22The patch has not yet been integrated upstream.
17 23
18Upstream-Status: Pending [ Not Author See bugzilla] 24Upstream-Status: Pending [ Not Author See bugzilla]
@@ -20,11 +26,15 @@ Upstream-Status: Pending [ Not Author See bugzilla]
20Signed-off-by: Raghunath Lolur <Raghunath.Lolur@kpit.com> 26Signed-off-by: Raghunath Lolur <Raghunath.Lolur@kpit.com>
21Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> 27Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
22Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> 28Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
29Signed-off-by: Khem Raj <raj.khem@gmail.com>
30---
31 sysdeps/nptl/fork.c | 9 +++++++++
32 1 file changed, 9 insertions(+)
23 33
24Index: git/sysdeps/nptl/fork.c 34diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
25=================================================================== 35index f87506f398..225e7b51f8 100644
26--- git.orig/sysdeps/nptl/fork.c 2017-08-03 16:02:15.674704080 +0800 36--- a/sysdeps/nptl/fork.c
27+++ git/sysdeps/nptl/fork.c 2017-08-04 18:15:02.463362015 +0800 37+++ b/sysdeps/nptl/fork.c
28@@ -25,6 +25,7 @@ 38@@ -25,6 +25,7 @@
29 #include <tls.h> 39 #include <tls.h>
30 #include <hp-timing.h> 40 #include <hp-timing.h>
@@ -33,7 +43,7 @@ Index: git/sysdeps/nptl/fork.c
33 #include <stdio-lock.h> 43 #include <stdio-lock.h>
34 #include <atomic.h> 44 #include <atomic.h>
35 #include <nptl/pthreadP.h> 45 #include <nptl/pthreadP.h>
36@@ -60,6 +61,10 @@ 46@@ -60,6 +61,10 @@ __libc_fork (void)
37 but our current fork implementation is not. */ 47 but our current fork implementation is not. */
38 bool multiple_threads = THREAD_GETMEM (THREAD_SELF, header.multiple_threads); 48 bool multiple_threads = THREAD_GETMEM (THREAD_SELF, header.multiple_threads);
39 49
@@ -44,7 +54,7 @@ Index: git/sysdeps/nptl/fork.c
44 /* Run all the registered preparation handlers. In reverse order. 54 /* Run all the registered preparation handlers. In reverse order.
45 While doing this we build up a list of all the entries. */ 55 While doing this we build up a list of all the entries. */
46 struct fork_handler *runp; 56 struct fork_handler *runp;
47@@ -247,6 +252,10 @@ 57@@ -246,6 +251,10 @@ __libc_fork (void)
48 58
49 allp = allp->next; 59 allp = allp->next;
50 } 60 }
@@ -55,3 +65,6 @@ Index: git/sysdeps/nptl/fork.c
55 } 65 }
56 66
57 return pid; 67 return pid;
68--
692.16.1
70
diff --git a/meta/recipes-core/glibc/glibc_2.26.bb b/meta/recipes-core/glibc/glibc_2.27.bb
index 464b65434e..e9d4117a47 100644
--- a/meta/recipes-core/glibc/glibc_2.26.bb
+++ b/meta/recipes-core/glibc/glibc_2.27.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
7 7
8DEPENDS += "gperf-native bison-native" 8DEPENDS += "gperf-native bison-native"
9 9
10SRCREV ?= "d300041c533a3d837c9f37a099bcc95466860e98" 10SRCREV ?= "23158b08a0908f381459f273a984c6fd328363cb"
11 11
12SRCBRANCH ?= "release/${PV}/master" 12SRCBRANCH ?= "release/${PV}/master"
13 13
@@ -40,8 +40,8 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
40 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ 40 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
41 file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ 41 file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \
42 file://0025-locale-fix-hard-coded-reference-to-gcc-E.patch \ 42 file://0025-locale-fix-hard-coded-reference-to-gcc-E.patch \
43 file://0027-glibc-reset-dl-load-write-lock-after-forking.patch \ 43 file://0026-reset-dl_load_write_lock-after-forking.patch \
44 file://0028-Bug-4578-add-ld.so-lock-while-fork.patch \ 44 file://0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch \
45" 45"
46 46
47NATIVESDKFIXES ?= "" 47NATIVESDKFIXES ?= ""
@@ -102,10 +102,6 @@ do_configure () {
102# version check and doesn't really help with anything 102# version check and doesn't really help with anything
103 (cd ${S} && gnu-configize) || die "failure in running gnu-configize" 103 (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
104 find ${S} -name "configure" | xargs touch 104 find ${S} -name "configure" | xargs touch
105 # "plural.c" may or may not get regenerated from "plural.y" so we
106 # touch "plural.y" to make sure it does. (This should not be needed
107 # for glibc version 2.26+)
108 find ${S}/intl -name "plural.y" | xargs touch
109 CPPFLAGS="" oe_runconf 105 CPPFLAGS="" oe_runconf
110} 106}
111 107