summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-01-31 10:11:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-02 11:05:59 +0000
commitba7731646ee1342d997310f9efe2629ac08401b3 (patch)
treedd11b91805bfe920c7cc96a9e737290fd1728a99 /meta
parentbcb3e7b7f88adaabc7b78c7c0155b4f68da254d8 (diff)
downloadpoky-ba7731646ee1342d997310f9efe2629ac08401b3.tar.gz
glibc: Update to 2.29 release
(From OE-Core rev: 9d9e055192bf1c66f2131482e6239e9c844ad0f4) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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.29.bb (renamed from meta/recipes-core/glibc/cross-localedef-native_2.28.bb)8
-rw-r--r--meta/recipes-core/glibc/glibc-collateral.inc1
-rw-r--r--meta/recipes-core/glibc/glibc-locale_2.29.bb (renamed from meta/recipes-core/glibc/glibc-locale_2.28.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-mtrace_2.29.bb (renamed from meta/recipes-core/glibc/glibc-mtrace_2.28.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc-scripts_2.29.bb (renamed from meta/recipes-core/glibc/glibc-scripts_2.28.bb)0
-rw-r--r--meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch10
-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-.patch26
-rw-r--r--meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch39
-rw-r--r--meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch13
-rw-r--r--meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch7
-rw-r--r--meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch10
-rw-r--r--meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch7
-rw-r--r--meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch9
-rw-r--r--meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch10
-rw-r--r--meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch21
-rw-r--r--meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch9
-rw-r--r--meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch7
-rw-r--r--meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch9
-rw-r--r--meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch7
-rw-r--r--meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch13
-rw-r--r--meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch7
-rw-r--r--meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch7
-rw-r--r--meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch9
-rw-r--r--meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch11
-rw-r--r--meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch9
-rw-r--r--meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch45
-rw-r--r--meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch9
-rw-r--r--meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch (renamed from meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch)29
-rw-r--r--meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch (renamed from meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch)9
-rw-r--r--meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch35
-rw-r--r--meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch9
-rw-r--r--meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch9
-rw-r--r--meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch66
-rw-r--r--meta/recipes-core/glibc/glibc/0028-intl-Emit-no-lines-in-bison-generated-files.patch (renamed from meta/recipes-core/glibc/glibc/0030-intl-Emit-no-lines-in-bison-generated-files.patch)9
-rw-r--r--meta/recipes-core/glibc/glibc/0029-inject-file-assembly-directives.patch (renamed from meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch)172
-rw-r--r--meta/recipes-core/glibc/glibc/0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch (renamed from meta/recipes-core/glibc/glibc/0033-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch)36
-rw-r--r--meta/recipes-core/glibc/glibc/0031-sysdeps-ieee754-prevent-maybe-uninitialized-errors-w.patch258
-rw-r--r--meta/recipes-core/glibc/glibc/0032-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch100
-rw-r--r--meta/recipes-core/glibc/glibc_2.29.bb (renamed from meta/recipes-core/glibc/glibc_2.28.bb)36
41 files changed, 367 insertions, 716 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 812b923fa2..cd6acf3219 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ GCCVERSION ?= "8.%"
22SDKGCCVERSION ?= "${GCCVERSION}" 22SDKGCCVERSION ?= "${GCCVERSION}"
23BINUVERSION ?= "2.31%" 23BINUVERSION ?= "2.31%"
24GDBVERSION ?= "8.2%" 24GDBVERSION ?= "8.2%"
25GLIBCVERSION ?= "2.28%" 25GLIBCVERSION ?= "2.29%"
26LINUXLIBCVERSION ?= "4.19%" 26LINUXLIBCVERSION ?= "4.19%"
27QEMUVERSION ?= "3.1%" 27QEMUVERSION ?= "3.1%"
28GOVERSION ?= "1.11%" 28GOVERSION ?= "1.11%"
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.28.bb b/meta/recipes-core/glibc/cross-localedef-native_2.29.bb
index a05b94e3b3..edb4fd40dc 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.28.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.29.bb
@@ -21,8 +21,10 @@ 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+(\.(?!90)\d+)*)" 22UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)"
23 23
24SRCREV_glibc ?= "3c03baca37fdcb52c3881e653ca392bba7a99c2b" 24PV = "2.29"
25SRCREV_localedef ?= "c328777219ccc480be3112cf807217ca6b570b64" 25
26SRCREV_glibc ?= "56c86f5dd516284558e106d04b92875d5b623b7a"
27SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655"
26 28
27SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 29SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
28 git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ 30 git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
@@ -34,7 +36,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
34 file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \ 36 file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \
35 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ 37 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \
36 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ 38 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
37 file://0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ 39 file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \
38" 40"
39# Makes for a rather long rev (22 characters), but... 41# Makes for a rather long rev (22 characters), but...
40# 42#
diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc
index 536edfb040..3379270566 100644
--- a/meta/recipes-core/glibc/glibc-collateral.inc
+++ b/meta/recipes-core/glibc/glibc-collateral.inc
@@ -21,3 +21,4 @@ do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale"
21 21
22COMPATIBLE_HOST_libc-musl_class-target = "null" 22COMPATIBLE_HOST_libc-musl_class-target = "null"
23 23
24PV = "2.29"
diff --git a/meta/recipes-core/glibc/glibc-locale_2.28.bb b/meta/recipes-core/glibc/glibc-locale_2.29.bb
index f7702e0358..f7702e0358 100644
--- a/meta/recipes-core/glibc/glibc-locale_2.28.bb
+++ b/meta/recipes-core/glibc/glibc-locale_2.29.bb
diff --git a/meta/recipes-core/glibc/glibc-mtrace_2.28.bb b/meta/recipes-core/glibc/glibc-mtrace_2.29.bb
index 0b69bad46a..0b69bad46a 100644
--- a/meta/recipes-core/glibc/glibc-mtrace_2.28.bb
+++ b/meta/recipes-core/glibc/glibc-mtrace_2.29.bb
diff --git a/meta/recipes-core/glibc/glibc-scripts_2.28.bb b/meta/recipes-core/glibc/glibc-scripts_2.29.bb
index 5a89bd8022..5a89bd8022 100644
--- a/meta/recipes-core/glibc/glibc-scripts_2.28.bb
+++ b/meta/recipes-core/glibc/glibc-scripts_2.29.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 5df26a8545..86ad9eaf1c 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,8 @@
1From bd51b3add89a5cb2d8f44029a1027c780b2afff5 Mon Sep 17 00:00:00 2001 1From 0cac7493366586e8f87e8459359c15f702ef8c81 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] nativesdk-glibc: Look for host system ld.so.cache as well 4Subject: [PATCH 01/30] nativesdk-glibc: Look for host system ld.so.cache as
5 well
5 6
6Upstream-Status: Inappropriate [embedded specific] 7Upstream-Status: Inappropriate [embedded specific]
7 8
@@ -30,7 +31,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
30 1 file changed, 8 insertions(+), 8 deletions(-) 31 1 file changed, 8 insertions(+), 8 deletions(-)
31 32
32diff --git a/elf/dl-load.c b/elf/dl-load.c 33diff --git a/elf/dl-load.c b/elf/dl-load.c
33index c51e4b3718..44bbb69dc4 100644 34index f972524421..e53c3a1b7b 100644
34--- a/elf/dl-load.c 35--- a/elf/dl-load.c
35+++ b/elf/dl-load.c 36+++ b/elf/dl-load.c
36@@ -2085,6 +2085,14 @@ _dl_map_object (struct link_map *loader, const char *name, 37@@ -2085,6 +2085,14 @@ _dl_map_object (struct link_map *loader, const char *name,
@@ -63,3 +64,6 @@ index c51e4b3718..44bbb69dc4 100644
63 /* Add another newline when we are tracing the library loading. */ 64 /* Add another newline when we are tracing the library loading. */
64 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS)) 65 if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_LIBS))
65 _dl_debug_printf ("\n"); 66 _dl_debug_printf ("\n");
67--
682.20.1
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 daadec76c7..f663e18edd 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,8 @@
1From fdc8a33ac2c81a0237b8a6d8b1aac7f1cdbb46af Mon Sep 17 00:00:00 2001 1From f275c04e263fc2ebf2eaad6ac1ab3c838647bb14 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] nativesdk-glibc: Fix buffer overrun with a relocated SDK 4Subject: [PATCH 02/30] nativesdk-glibc: Fix buffer overrun with a relocated
5 SDK
5 6
6When 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
7original fixed location, the dynamic loader will crash in open_path 8original fixed location, the dynamic loader will crash in open_path
@@ -21,7 +22,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
21 1 file changed, 12 insertions(+) 22 1 file changed, 12 insertions(+)
22 23
23diff --git a/elf/dl-load.c b/elf/dl-load.c 24diff --git a/elf/dl-load.c b/elf/dl-load.c
24index 44bbb69dc4..74e2e5e962 100644 25index e53c3a1b7b..2bd9bc27f2 100644
25--- a/elf/dl-load.c 26--- a/elf/dl-load.c
26+++ b/elf/dl-load.c 27+++ b/elf/dl-load.c
27@@ -1785,7 +1785,19 @@ open_path (const char *name, size_t namelen, int mode, 28@@ -1785,7 +1785,19 @@ open_path (const char *name, size_t namelen, int mode,
@@ -44,3 +45,6 @@ index 44bbb69dc4..74e2e5e962 100644
44 do 45 do
45 { 46 {
46 struct r_search_path_elem *this_dir = *dirs; 47 struct r_search_path_elem *this_dir = *dirs;
48--
492.20.1
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 e082540303..fd909f644a 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,8 @@
1From 055dd46b793168fb08e44913153010b088011ba2 Mon Sep 17 00:00:00 2001 1From 92df5673de18779b612609afa4f687e33e5ecb6e 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] nativesdk-glibc: Raise the size of arrays containing dl paths 4Subject: [PATCH 03/30] nativesdk-glibc: Raise the size of arrays containing dl
5 paths
5 6
6This 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
7and lengths as well as ld.so.cache path in the dynamic loader to specific 8and lengths as well as ld.so.cache path in the dynamic loader to specific
@@ -25,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
25 7 files changed, 14 insertions(+), 10 deletions(-) 26 7 files changed, 14 insertions(+), 10 deletions(-)
26 27
27diff --git a/elf/dl-cache.c b/elf/dl-cache.c 28diff --git a/elf/dl-cache.c b/elf/dl-cache.c
28index 6ee5153ff9..37a5f701fa 100644 29index d8d1e2344e..d2247bfc4f 100644
29--- a/elf/dl-cache.c 30--- a/elf/dl-cache.c
30+++ b/elf/dl-cache.c 31+++ b/elf/dl-cache.c
31@@ -133,6 +133,10 @@ do \ 32@@ -133,6 +133,10 @@ do \
@@ -40,7 +41,7 @@ index 6ee5153ff9..37a5f701fa 100644
40 _dl_cache_libcmp (const char *p1, const char *p2) 41 _dl_cache_libcmp (const char *p1, const char *p2)
41 { 42 {
42diff --git a/elf/dl-load.c b/elf/dl-load.c 43diff --git a/elf/dl-load.c b/elf/dl-load.c
43index 74e2e5e962..8f19186e1c 100644 44index 2bd9bc27f2..4170cc1a09 100644
44--- a/elf/dl-load.c 45--- a/elf/dl-load.c
45+++ b/elf/dl-load.c 46+++ b/elf/dl-load.c
46@@ -110,8 +110,8 @@ static size_t max_capstrlen attribute_relro; 47@@ -110,8 +110,8 @@ static size_t max_capstrlen attribute_relro;
@@ -55,7 +56,7 @@ index 74e2e5e962..8f19186e1c 100644
55 SYSTEM_DIRS_LEN 56 SYSTEM_DIRS_LEN
56 }; 57 };
57diff --git a/elf/interp.c b/elf/interp.c 58diff --git a/elf/interp.c b/elf/interp.c
58index 9cd50c7291..fc2f39d73c 100644 59index 243829f5f7..0e74241703 100644
59--- a/elf/interp.c 60--- a/elf/interp.c
60+++ b/elf/interp.c 61+++ b/elf/interp.c
61@@ -18,5 +18,5 @@ 62@@ -18,5 +18,5 @@
@@ -66,7 +67,7 @@ index 9cd50c7291..fc2f39d73c 100644
66+const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) 67+const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp")))
67 = RUNTIME_LINKER; 68 = RUNTIME_LINKER;
68diff --git a/elf/ldconfig.c b/elf/ldconfig.c 69diff --git a/elf/ldconfig.c b/elf/ldconfig.c
69index fbdd814edf..9f4d8d69b1 100644 70index 206cd51df6..2fd4fb54ae 100644
70--- a/elf/ldconfig.c 71--- a/elf/ldconfig.c
71+++ b/elf/ldconfig.c 72+++ b/elf/ldconfig.c
72@@ -168,6 +168,9 @@ static struct argp argp = 73@@ -168,6 +168,9 @@ static struct argp argp =
@@ -80,7 +81,7 @@ index fbdd814edf..9f4d8d69b1 100644
80 a platform. */ 81 a platform. */
81 static int 82 static int
82diff --git a/elf/rtld.c b/elf/rtld.c 83diff --git a/elf/rtld.c b/elf/rtld.c
83index 1b0c74739f..a70a62d31e 100644 84index 5d97f41b7b..26c5fef929 100644
84--- a/elf/rtld.c 85--- a/elf/rtld.c
85+++ b/elf/rtld.c 86+++ b/elf/rtld.c
86@@ -130,6 +130,7 @@ dso_name_valid_for_suid (const char *p) 87@@ -130,6 +130,7 @@ dso_name_valid_for_suid (const char *p)
@@ -107,7 +108,7 @@ index 1b0c74739f..a70a62d31e 100644
107 ++_dl_skip_args; 108 ++_dl_skip_args;
108 --_dl_argc; 109 --_dl_argc;
109diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c 110diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
110index f173cde71b..5c3205026f 100644 111index ae8937cba0..f321ee419e 100644
111--- a/iconv/gconv_conf.c 112--- a/iconv/gconv_conf.c
112+++ b/iconv/gconv_conf.c 113+++ b/iconv/gconv_conf.c
113@@ -36,7 +36,7 @@ 114@@ -36,7 +36,7 @@
@@ -117,10 +118,10 @@ index f173cde71b..5c3205026f 100644
117-static const char default_gconv_path[] = GCONV_PATH; 118-static const char default_gconv_path[] = GCONV_PATH;
118+static char default_gconv_path[4096] __attribute__ ((section (".gccrelocprefix"))) = GCONV_PATH; 119+static char default_gconv_path[4096] __attribute__ ((section (".gccrelocprefix"))) = GCONV_PATH;
119 120
120 /* The path elements, as determined by the __gconv_get_path function. 121 /* Type to represent search path. */
121 All path elements end in a slash. */ 122 struct path_elem
122diff --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
123index cf43f1cf3b..7f07adde53 100644 124index bc8b40331d..b0fdd2144b 100644
124--- a/sysdeps/generic/dl-cache.h 125--- a/sysdeps/generic/dl-cache.h
125+++ b/sysdeps/generic/dl-cache.h 126+++ b/sysdeps/generic/dl-cache.h
126@@ -27,10 +27,6 @@ 127@@ -27,10 +27,6 @@
@@ -134,3 +135,6 @@ index cf43f1cf3b..7f07adde53 100644
134 #ifndef add_system_dir 135 #ifndef add_system_dir
135 # define add_system_dir(dir) add_dir (dir) 136 # define add_system_dir(dir) add_dir (dir)
136 #endif 137 #endif
138--
1392.20.1
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 1ae2e33b4f..d6c9aac69d 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 a237553ccd15276462be2023057a017fa8ee5d7c Mon Sep 17 00:00:00 2001 1From ff0f4756f1a98202726c65745aca38354864e033 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] nativesdk-glibc: Allow 64 bit atomics for x86 4Subject: [PATCH 04/30] 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.
@@ -13,19 +13,30 @@ Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
13Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 13Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
14Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15--- 15---
16 sysdeps/i386/atomic-machine.h | 2 +- 16 sysdeps/x86/atomic-machine.h | 3 +--
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 2 deletions(-)
18 18
19diff --git a/sysdeps/i386/atomic-machine.h b/sysdeps/i386/atomic-machine.h 19diff --git a/sysdeps/x86/atomic-machine.h b/sysdeps/x86/atomic-machine.h
20index 272da5dd8f..409c759f14 100644 20index aa60ca4cd6..3e42e00183 100644
21--- a/sysdeps/i386/atomic-machine.h 21--- a/sysdeps/x86/atomic-machine.h
22+++ b/sysdeps/i386/atomic-machine.h 22+++ b/sysdeps/x86/atomic-machine.h
23@@ -54,7 +54,7 @@ typedef uintmax_t uatomic_max_t; 23@@ -58,15 +58,14 @@ typedef uintmax_t uatomic_max_t;
24 # endif
25 #endif 24 #endif
26 25
27-#define __HAVE_64B_ATOMICS 0 26 #define USE_ATOMIC_COMPILER_BUILTINS 1
28+#define __HAVE_64B_ATOMICS 1 27+# define __HAVE_64B_ATOMICS 1
29 #define USE_ATOMIC_COMPILER_BUILTINS 0
30 #define ATOMIC_EXCHANGE_USES_CAS 0
31 28
29 #ifdef __x86_64__
30-# define __HAVE_64B_ATOMICS 1
31 # define SP_REG "rsp"
32 # define SEG_REG "fs"
33 # define BR_CONSTRAINT "q"
34 # define IBR_CONSTRAINT "iq"
35 #else
36-# define __HAVE_64B_ATOMICS 0
37 # define SP_REG "esp"
38 # define SEG_REG "gs"
39 # define BR_CONSTRAINT "r"
40--
412.20.1
42
diff --git a/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch b/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
index b53f2ef2e2..9f9f503a1e 100644
--- a/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
+++ b/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
@@ -1,7 +1,7 @@
1From e1dc85af1800afa4fbf4eb5a59cc41025495af57 Mon Sep 17 00:00:00 2001 1From b2ec111dc3a42d9dce71c903524724ae82ff22d8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Aug 2018 09:55:12 -0700 3Date: Fri, 3 Aug 2018 09:55:12 -0700
4Subject: [PATCH] nativesdk-glibc: Make relocatable install for locales 4Subject: [PATCH 05/30] nativesdk-glibc: Make relocatable install for locales
5 5
6The glibc locale path is hard-coded to the install prefix, but in SDKs we need 6The glibc locale path is hard-coded to the install prefix, but in SDKs we need
7to be able to relocate the binaries. Expand the strings to 4K and put them in a 7to be able to relocate the binaries. Expand the strings to 4K and put them in a
@@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 3 files changed, 4 insertions(+), 4 deletions(-) 18 3 files changed, 4 insertions(+), 4 deletions(-)
19 19
20diff --git a/locale/findlocale.c b/locale/findlocale.c 20diff --git a/locale/findlocale.c b/locale/findlocale.c
21index 872cadb5b9..dd651e07f5 100644 21index 9af605bd64..b2b0a3f93b 100644
22--- a/locale/findlocale.c 22--- a/locale/findlocale.c
23+++ b/locale/findlocale.c 23+++ b/locale/findlocale.c
24@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = 24@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden =
@@ -40,7 +40,7 @@ index 872cadb5b9..dd651e07f5 100644
40 else 40 else
41 /* We really have to load some data. First see whether the name is 41 /* We really have to load some data. First see whether the name is
42diff --git a/locale/loadarchive.c b/locale/loadarchive.c 42diff --git a/locale/loadarchive.c b/locale/loadarchive.c
43index 516d30d8d1..9bfbe1a5dd 100644 43index 803c1cf2a4..9023f475b8 100644
44--- a/locale/loadarchive.c 44--- a/locale/loadarchive.c
45+++ b/locale/loadarchive.c 45+++ b/locale/loadarchive.c
46@@ -42,7 +42,7 @@ 46@@ -42,7 +42,7 @@
@@ -53,7 +53,7 @@ index 516d30d8d1..9bfbe1a5dd 100644
53 /* Size of initial mapping window, optimal if large enough to 53 /* Size of initial mapping window, optimal if large enough to
54 cover the header plus the initial locale. */ 54 cover the header plus the initial locale. */
55diff --git a/locale/localeinfo.h b/locale/localeinfo.h 55diff --git a/locale/localeinfo.h b/locale/localeinfo.h
56index 68822a6319..537bc35149 100644 56index 7c1cc3eecb..53cb8bfc59 100644
57--- a/locale/localeinfo.h 57--- a/locale/localeinfo.h
58+++ b/locale/localeinfo.h 58+++ b/locale/localeinfo.h
59@@ -325,7 +325,7 @@ _nl_lookup_word (locale_t l, int category, int item) 59@@ -325,7 +325,7 @@ _nl_lookup_word (locale_t l, int category, int item)
@@ -65,3 +65,6 @@ index 68822a6319..537bc35149 100644
65 65
66 /* Load the locale data for CATEGORY from the file specified by *NAME. 66 /* Load the locale data for CATEGORY from the file specified by *NAME.
67 If *NAME is "", use environment variables as specified by POSIX, and 67 If *NAME is "", use environment variables as specified by POSIX, and
68--
692.20.1
70
diff --git a/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
index 971700a6df..a6dddebbc0 100644
--- a/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
+++ b/meta/recipes-core/glibc/glibc/0006-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
@@ -1,7 +1,7 @@
1From d23c577b0b70b34335971abaf3f50e617dda615e Mon Sep 17 00:00:00 2001 1From 4dc4b4f63dd79734078fa54446edb7fe2d9c74fa 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] fsl e500/e5500/e6500/603e fsqrt implementation 4Subject: [PATCH 06/30] 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>
@@ -1579,3 +1579,6 @@ index 0000000000..04ff8cc181
1579+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/e6500/fpu/Implies 1579+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/e6500/fpu/Implies
1580@@ -0,0 +1 @@ 1580@@ -0,0 +1 @@
1581+powerpc/powerpc64/e6500/fpu 1581+powerpc/powerpc64/e6500/fpu
1582--
15832.20.1
1584
diff --git a/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
index 4871346838..17ffc6fd48 100644
--- a/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
+++ b/meta/recipes-core/glibc/glibc/0007-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
@@ -1,7 +1,8 @@
1From d65f6ee214d7d91445fceabc6a5d6bf55b0e8d4b Mon Sep 17 00:00:00 2001 1From 5506296ef55a6e4916febab63805ddf2d5a5293c 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] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known names 4Subject: [PATCH 07/30] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known
5 names
5 6
6This 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
7names into glibc especially for multilib case, where it differs from any 8names into glibc especially for multilib case, where it differs from any
@@ -16,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 1 insertion(+) 17 1 file changed, 1 insertion(+)
17 18
18diff --git a/elf/readlib.c b/elf/readlib.c 19diff --git a/elf/readlib.c b/elf/readlib.c
19index 573c01476c..d8c7412287 100644 20index c9743e6692..6307f918fc 100644
20--- a/elf/readlib.c 21--- a/elf/readlib.c
21+++ b/elf/readlib.c 22+++ b/elf/readlib.c
22@@ -51,6 +51,7 @@ static struct known_names interpreters[] = 23@@ -51,6 +51,7 @@ static struct known_names interpreters[] =
@@ -27,3 +28,6 @@ index 573c01476c..d8c7412287 100644
27 }; 28 };
28 29
29 static struct known_names known_libs[] = 30 static struct known_names known_libs[] =
31--
322.20.1
33
diff --git a/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
index c0d96eb1f5..aacc9f2e3c 100644
--- a/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
+++ b/meta/recipes-core/glibc/glibc/0008-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
@@ -1,7 +1,7 @@
1From ee3aa1464f40c916c62cf326bf4c18f8b71a229b Mon Sep 17 00:00:00 2001 1From ea969d7767428d73823c91ad9955829bd66b9e58 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] ppc/sqrt: Fix undefined reference to `__sqrt_finite' 4Subject: [PATCH 08/30] 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'
@@ -203,3 +203,6 @@ index 26fa067abf..9d175122a8 100644
203 return f_washf (b); 203 return f_washf (b);
204 } 204 }
205+strong_alias (__ieee754_sqrtf, __sqrtf_finite) 205+strong_alias (__ieee754_sqrtf, __sqrtf_finite)
206--
2072.20.1
208
diff --git a/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index d0b47cd67b..b1d4413036 100644
--- a/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/meta/recipes-core/glibc/glibc/0009-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
@@ -1,8 +1,8 @@
1From 17e82d594b2d8d3a6998face953382f9d14fb046 Mon Sep 17 00:00:00 2001 1From a9e6ca45cdaf13ee595089a5a580d00a95a06bf1 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] __ieee754_sqrt{,f} are now inline functions and call out 4Subject: [PATCH 09/30] __ieee754_sqrt{,f} are now inline functions and call
5 __slow versions 5 out __slow versions
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
8 8
@@ -382,3 +382,6 @@ index 9d175122a8..10de1f0cc3 100644
382+} 382+}
383+ 383+
384 strong_alias (__ieee754_sqrtf, __sqrtf_finite) 384 strong_alias (__ieee754_sqrtf, __sqrtf_finite)
385--
3862.20.1
387
diff --git a/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
index 86ef3a1059..46d205808e 100644
--- a/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
+++ b/meta/recipes-core/glibc/glibc/0010-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
@@ -1,7 +1,8 @@
1From fe8d9b76e7c881cc0a0b728ea2bd637fafca0978 Mon Sep 17 00:00:00 2001 1From 50ad00401eb16bb88c57d95bc927deeec4033e01 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] Quote from bug 1443 which explains what the patch does : 4Subject: [PATCH 10/30] Quote from bug 1443 which explains what the patch does
5 :
5 6
6 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,
7 it dies with a SIGSEGV before reaching main(). 8 it dies with a SIGSEGV before reaching main().
@@ -44,7 +45,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
44 1 file changed, 1 insertion(+), 1 deletion(-) 45 1 file changed, 1 insertion(+), 1 deletion(-)
45 46
46diff --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
47index 1a4fd3f17b..a02c47571a 100644 48index 7a2f9d9b78..36a1dd1888 100644
48--- a/sysdeps/arm/dl-machine.h 49--- a/sysdeps/arm/dl-machine.h
49+++ b/sysdeps/arm/dl-machine.h 50+++ b/sysdeps/arm/dl-machine.h
50@@ -510,7 +510,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,
@@ -56,3 +57,6 @@ index 1a4fd3f17b..a02c47571a 100644
56 break; 57 break;
57 58
58 case R_ARM_TLS_TPOFF32: 59 case R_ARM_TLS_TPOFF32:
60--
612.20.1
62
diff --git a/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
index 32aae5cd53..293b72e79e 100644
--- a/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
+++ b/meta/recipes-core/glibc/glibc/0011-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
@@ -1,7 +1,7 @@
1From 3012cb839a64e7d5c621efa79b643d169290e6e9 Mon Sep 17 00:00:00 2001 1From a29a718890a3f32e7135f6b64b1a80c74f2d1454 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] eglibc: run libm-err-tab.pl with specific dirs in ${S} 4Subject: [PATCH 11/30] 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,16 +18,19 @@ 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 c2756640a7..1b5bb16a96 100644 21index 4f76ee85d2..04b8c8c320 100644
22--- a/manual/Makefile 22--- a/manual/Makefile
23+++ b/manual/Makefile 23+++ b/manual/Makefile
24@@ -102,7 +102,8 @@ $(objpfx)libm-err.texi: $(objpfx)stamp-libm-err 24@@ -103,7 +103,8 @@ $(objpfx)stamp-libm-err: $(..)math/gen-libm-test.py \
25 $(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ 25 $(wildcard $(foreach dir,$(sysdirs),\
26 $(dir)/libm-test-ulps)) 26 $(dir)/libm-test-ulps))
27 pwd=`pwd`; \ 27 pwd=`pwd`; \
28- $(PERL) $< $$pwd/.. > $(objpfx)libm-err-tmp 28- $(PYTHON) $< -s $$pwd/.. -m $(objpfx)libm-err-tmp
29+ $(PERL) $< $$pwd/../ports > $(objpfx)libm-err-tmp 29+ $(PYTHON) $< -s $$pwd/../ports -m $(objpfx)libm-err-tmp
30+ $(PERL) $< $$pwd/../sysdeps >> $(objpfx)libm-err-tmp 30+ $(PYTHON) $< -s $$pwd/../sysdeps -m $(objpfx)libm-err-tmp
31 $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi 31 $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi
32 touch $@ 32 touch $@
33 33
34--
352.20.1
36
diff --git a/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
index 93395c389f..6e175b64d1 100644
--- a/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
+++ b/meta/recipes-core/glibc/glibc/0012-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
@@ -1,8 +1,8 @@
1From 93ab69ae4c98303929ba9492130a021fa4a215be Mon Sep 17 00:00:00 2001 1From 777da88a819738683e4389580cfbfded2a83e87e 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] __ieee754_sqrt{,f} are now inline functions and call out 4Subject: [PATCH 12/30] __ieee754_sqrt{,f} are now inline functions and call
5 __slow versions 5 out __slow versions
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
8 8
@@ -56,3 +56,6 @@ index 812653558f..10de1f0cc3 100644
56 float b; 56 float b;
57 #endif 57 #endif
58 { 58 {
59--
602.20.1
61
diff --git a/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
index 9998691fa4..b5adecba06 100644
--- a/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
+++ b/meta/recipes-core/glibc/glibc/0013-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
@@ -1,7 +1,7 @@
1From a7bd8aa65f3f2755d6dbd0d5adbfd269c1fb0094 Mon Sep 17 00:00:00 2001 1From f98b1b9e6b569abd3594b4923ace0c966c9daece 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] sysdeps/gnu/configure.ac: handle correctly 4Subject: [PATCH 13/30] sysdeps/gnu/configure.ac: handle correctly
5 $libc_cv_rootsbindir 5 $libc_cv_rootsbindir
6 6
7Upstream-Status:Pending 7Upstream-Status:Pending
@@ -37,3 +37,6 @@ index 634fe4de2a..3db1697f4f 100644
37+ test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin 37+ test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin
38 ;; 38 ;;
39 esac 39 esac
40--
412.20.1
42
diff --git a/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch b/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch
index 9d6ab30e2c..1cd91475db 100644
--- a/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch
+++ b/meta/recipes-core/glibc/glibc/0014-Add-unused-attribute.patch
@@ -1,7 +1,7 @@
1From 2ce5bc6da23dcb402afdeb967fa44c39eecf6d37 Mon Sep 17 00:00:00 2001 1From b9cd992052550d4b2bba954099e221677a6652e7 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] Add unused attribute 4Subject: [PATCH 14/30] 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 123e2a62ce..63cc83ec84 100644 20index 91e0ad3141..2e9549fe49 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 @@
@@ -29,3 +29,6 @@ index 123e2a62ce..63cc83ec84 100644
29 strip (char *wp, const char *s) 29 strip (char *wp, const char *s)
30 { 30 {
31 int slash_count = 0; 31 int slash_count = 0;
32--
332.20.1
34
diff --git a/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch b/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch
index 0267e7a4ec..f2e1802392 100644
--- a/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch
+++ b/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch
@@ -1,7 +1,7 @@
1From b382138c41ccf6079b44592f1e74f183ca8281bb Mon Sep 17 00:00:00 2001 1From e8a88fb3bb6ffcc43871a7caf7ad9c59bd183e50 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] 'yes' within the path sets wrong config variables 4Subject: [PATCH 15/30] '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
@@ -258,3 +258,6 @@ index f9cba6e15d..b21f72f1e4 100644
258 #endif 258 #endif
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--
2622.20.1
263
diff --git a/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch b/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch
index 15453ec6ff..8a9fa4916c 100644
--- a/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch
+++ b/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch
@@ -1,7 +1,7 @@
1From 04fb7b93dc40c1f96ebc05d29a2f02f9e4f0d572 Mon Sep 17 00:00:00 2001 1From 10f470476dc947d7b950d6a66f7c06f500c96c60 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] timezone: re-written tzselect as posix sh 4Subject: [PATCH 16/30] 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 0194aba4a1..58e5405a05 100644 18index 493deca790..36e559e16c 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%
@@ -28,10 +28,10 @@ index 0194aba4a1..58e5405a05 100644
28 -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ 28 -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
29 -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ 29 -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
30diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh 30diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
31index d2c3a6d1dd..089679f306 100755 31index 18fce27e24..70745f9d36 100755
32--- a/timezone/tzselect.ksh 32--- a/timezone/tzselect.ksh
33+++ b/timezone/tzselect.ksh 33+++ b/timezone/tzselect.ksh
34@@ -35,7 +35,7 @@ REPORT_BUGS_TO=tz@iana.org 34@@ -34,7 +34,7 @@ REPORT_BUGS_TO=tz@iana.org
35 35
36 # Specify default values for environment variables if they are unset. 36 # Specify default values for environment variables if they are unset.
37 : ${AWK=awk} 37 : ${AWK=awk}
@@ -40,3 +40,6 @@ index d2c3a6d1dd..089679f306 100755
40 40
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--
442.20.1
45
diff --git a/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch b/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
index 06d2cd1d25..a27759a39a 100644
--- a/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
+++ b/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch
@@ -1,7 +1,7 @@
1From 7a2f244c0980a54ed74f9544ab44a7269ef12bce Mon Sep 17 00:00:00 2001 1From 809392d20fa9a9f8159242451f9969e65a658835 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] Remove bash dependency for nscd init script 4Subject: [PATCH 17/30] 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.
@@ -70,3 +70,6 @@ index a882da7d8b..b02986ec15 100644
70 RETVAL=1 70 RETVAL=1
71 ;; 71 ;;
72 esac 72 esac
73--
742.20.1
75
diff --git a/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch b/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
index 29109a26ea..f80a3ee1d2 100644
--- a/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
+++ b/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch
@@ -1,7 +1,7 @@
1From 44a5c79efea09f5b990e524ec42abdeef444056a Mon Sep 17 00:00:00 2001 1From 016d6987600d49d3f45874096e943b97d1667539 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] eglibc: Cross building and testing instructions 4Subject: [PATCH 18/30] eglibc: Cross building and testing instructions
5 5
6Ported from eglibc 6Ported from eglibc
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -614,3 +614,6 @@ index 0000000000..b67b468466
614+- Some tests require access to libstdc++.so.6 and libgcc_s.so.1; we 614+- Some tests require access to libstdc++.so.6 and libgcc_s.so.1; we
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--
6182.20.1
619
diff --git a/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch b/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch
index 71c2ab9180..603bf21888 100644
--- a/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch
+++ b/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch
@@ -1,7 +1,7 @@
1From f4ec5527d562d38523abb8587a6c7532e9d21f8a Mon Sep 17 00:00:00 2001 1From 7e4423528d362cf6268b1902a8e30d710431f333 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] eglibc: Help bootstrap cross toolchain 4Subject: [PATCH 19/30] 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 d3f25a525a..ab383867e2 100644 32index 4a014d6eff..3a1f419bc3 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
@@ -95,3 +95,6 @@ index 0000000000..1d2b669aff
95+ difficult headers. The <gnu/stubs.h> header depends, via the 95+ difficult headers. The <gnu/stubs.h> header depends, via the
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--
992.20.1
100
diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch
index 6e475a711e..985b17b583 100644
--- a/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch
+++ b/meta/recipes-core/glibc/glibc/0020-eglibc-Clear-cache-lines-on-ppc8xx.patch
@@ -1,7 +1,7 @@
1From 6c23660d035e71de0e20b40460ad3050bd057665 Mon Sep 17 00:00:00 2001 1From 8c4d7d70a84a69fe5e8d69539368aa11f8fe20aa 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] eglibc: Clear cache lines on ppc8xx 4Subject: [PATCH 20/30] 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 78051bc7bc..e24f442320 100644 24index b04ecc4a4c..75bda97241 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 78051bc7bc..e24f442320 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 f2ad0c355d..3e6773795e 100644 51index 4fd5f70700..1a21e4675c 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,
@@ -78,3 +78,6 @@ index f2ad0c355d..3e6773795e 100644
78 __cache_line_size = av->a_un.a_val; 78 __cache_line_size = av->a_un.a_val;
79 break; 79 break;
80 #ifndef SHARED 80 #ifndef SHARED
81--
822.20.1
83
diff --git a/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch b/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch
index 8aecf2624c..fb1b43b18c 100644
--- a/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch
+++ b/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch
@@ -1,7 +1,7 @@
1From 55531ef57d04006c5a1e3b32a8e0410372f86007 Mon Sep 17 00:00:00 2001 1From 19f041215673d4499ee9b23805d5c224c4063689 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] eglibc: Resolve __fpscr_values on SH4 4Subject: [PATCH 21/30] 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 c4e28ffb98..648bae03d5 100644 36index 6ce36d6dd5..425811cc77 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)
@@ -51,3 +51,6 @@ index c4e28ffb98..648bae03d5 100644
51+ .long 0x80000 51+ .long 0x80000
52+weak_alias (___fpscr_values, __fpscr_values) 52+weak_alias (___fpscr_values, __fpscr_values)
53+ 53+
54--
552.20.1
56
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 aa62c6352c..a2d35d43ed 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 4bb23fbb07984b93fd14f353fd9325d927b0cd98 Mon Sep 17 00:00:00 2001 1From 1ae15f60a84f16187e06a05906f44a6658bae487 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] eglibc: Forward port cross locale generation support 4Subject: [PATCH 22/30] 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 fd9972279b..176b3946de 100644 26index 764e751c36..866957fefa 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 537bc35149..73ba20d695 100644 94index 53cb8bfc59..92c466200c 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,7 +104,7 @@ index 537bc35149..73ba20d695 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 34a8d32c92..cbb9436cd1 100644 107index 94c122df68..80e53e12c8 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@@ -18,7 +18,9 @@ 110@@ -18,7 +18,9 @@
@@ -150,7 +150,7 @@ index 34a8d32c92..cbb9436cd1 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 d2eebcfdbb..c3718d6589 100644 153index bb4e2c539d..9d08d422c4 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@@ -349,7 +349,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,
@@ -199,7 +199,7 @@ index d2eebcfdbb..c3718d6589 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 f791e6b7e9..d809d6db7f 100644 202index 36fd08ba80..08155a27d6 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@@ -915,7 +915,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,
@@ -281,7 +281,7 @@ index f791e6b7e9..d809d6db7f 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 a755792363..e8b2f85522 100644 284index 8e9849fdba..028d3efa9f 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@@ -220,8 +220,10 @@ No definition for %s category found"), "LC_TIME"); 287@@ -220,8 +220,10 @@ No definition for %s category found"), "LC_TIME");
@@ -350,7 +350,7 @@ index a755792363..e8b2f85522 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 3525c8a43d..f8a7fd9c24 100644 353index ed3a9731d0..3178ea057a 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 3525c8a43d..f8a7fd9c24 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 d718d2e9f4..e0a3ad5a83 100644 366index b7bcef8248..efeced1e0f 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@@ -105,6 +105,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; 369@@ -109,6 +109,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
370 #define OPT_BIG_ENDIAN 401
371 #define OPT_NO_WARN 402 370 #define OPT_NO_WARN 402
372 #define OPT_WARN 403 371 #define OPT_WARN 403
373+#define OPT_UINT32_ALIGN 404 372 #define OPT_NO_HARD_LINKS 404
373+#define OPT_UINT32_ALIGN 405
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@@ -147,6 +148,8 @@ static const struct argp_option options[] = 377@@ -153,6 +154,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 d718d2e9f4..e0a3ad5a83 100644
383 { NULL, 0, NULL, 0, NULL } 383 { NULL, 0, NULL, 0, NULL }
384 }; 384 };
385 385
386@@ -236,12 +239,14 @@ main (int argc, char *argv[]) 386@@ -242,12 +245,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
@@ -398,9 +398,9 @@ index d718d2e9f4..e0a3ad5a83 100644
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@@ -389,6 +394,9 @@ parse_opt (int key, char *arg, struct argp_state *state) 401@@ -399,6 +404,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
402 /* Enable the warnings. */ 402 /* Do not hard link to other locales. */
403 set_warnings (arg, true); 403 hard_links = false;
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 d718d2e9f4..e0a3ad5a83 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 32e5f761f2..b41e77bd8d 100644 412index e4ba48e968..e7b0efe887 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 32e5f761f2..b41e77bd8d 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 89b347c72d..a636fc2960 100644 435index c063fc097d..4e7465e55a 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 89b347c72d..a636fc2960 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 e4de907e1f..b5d8f5c17d 100644 524index 9427a5ad28..8f4140d684 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[] =
@@ -561,3 +561,6 @@ index e4de907e1f..b5d8f5c17d 100644
561 #ifdef NL_CURRENT_INDIRECT 561 #ifdef NL_CURRENT_INDIRECT
562 # define WEAK_POSTLOAD(postload) weak_extern (postload) 562 # define WEAK_POSTLOAD(postload) weak_extern (postload)
563 #else 563 #else
564--
5652.20.1
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 68fad96410..0f7c5fdf72 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 1b2ceb6c2414e3c98c7bcd029583287ced9f3159 Mon Sep 17 00:00:00 2001 1From 809c79b7d554a4ec83921df9d8773c99a03dc81c 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] Define DUMMY_LOCALE_T if not defined 4Subject: [PATCH 23/30] 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 9956cd8446..04342f3644 100644 17index a1e6e0ec3c..7f75528eae 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 @@
@@ -27,3 +27,6 @@ index 9956cd8446..04342f3644 100644
27 /* Use the internal textdomain used for libc messages. */ 27 /* Use the internal textdomain used for libc messages. */
28 #define PACKAGE _libc_intl_domainname 28 #define PACKAGE _libc_intl_domainname
29 #ifndef VERSION 29 #ifndef VERSION
30--
312.20.1
32
diff --git a/meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch b/meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch
index e17f6aa3b9..c289e544ee 100644
--- a/meta/recipes-core/glibc/glibc/0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch
+++ b/meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch
@@ -1,7 +1,8 @@
1From 865651d2496a90f7ae8e7cc19a2e54b6f17a8ad5 Mon Sep 17 00:00:00 2001 1From b2d1c9b4159bfd661a4996588d06d922491dfecb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Aug 2018 09:42:06 -0700 3Date: Fri, 3 Aug 2018 09:42:06 -0700
4Subject: [PATCH] localedef --add-to-archive uses a hard-coded locale path 4Subject: [PATCH 24/30] localedef --add-to-archive uses a hard-coded locale
5 path
5 6
6it doesn't exist in normal use, and there's no way to pass an 7it doesn't exist in normal use, and there's no way to pass an
7alternative filename. 8alternative filename.
@@ -14,11 +15,11 @@ Upstream-Status: Inappropriate (OE-specific)
14Signed-off-by: Ross Burton <ross.burton@intel.com> 15Signed-off-by: Ross Burton <ross.burton@intel.com>
15Signed-off-by: Khem Raj <raj.khem@gmail.com> 16Signed-off-by: Khem Raj <raj.khem@gmail.com>
16--- 17---
17 locale/programs/locarchive.c | 37 ++++++++++++++++++++++++++---------- 18 locale/programs/locarchive.c | 35 +++++++++++++++++++++++++----------
18 1 file changed, 27 insertions(+), 10 deletions(-) 19 1 file changed, 25 insertions(+), 10 deletions(-)
19 20
20diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c 21diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
21index ca332a345f..91f62da662 100644 22index e6310b18be..f54a76eade 100644
22--- a/locale/programs/locarchive.c 23--- a/locale/programs/locarchive.c
23+++ b/locale/programs/locarchive.c 24+++ b/locale/programs/locarchive.c
24@@ -340,12 +340,24 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) 25@@ -340,12 +340,24 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
@@ -34,7 +35,7 @@ index ca332a345f..91f62da662 100644
34- if (output_prefix) 35- if (output_prefix)
35- memcpy (archivefname, output_prefix, prefix_len); 36- memcpy (archivefname, output_prefix, prefix_len);
36- strcpy (archivefname + prefix_len, ARCHIVE_NAME); 37- strcpy (archivefname + prefix_len, ARCHIVE_NAME);
37+ if (envarchive != NULL) 38+ if (envarchive != NULL)
38+ { 39+ {
39+ archivefname = xmalloc(strlen(envarchive) + 1); 40+ archivefname = xmalloc(strlen(envarchive) + 1);
40+ fname = xmalloc(strlen(envarchive) + sizeof (".XXXXXX")); 41+ fname = xmalloc(strlen(envarchive) + sizeof (".XXXXXX"));
@@ -51,16 +52,7 @@ index ca332a345f..91f62da662 100644
51 strcpy (stpcpy (fname, archivefname), ".XXXXXX"); 52 strcpy (stpcpy (fname, archivefname), ".XXXXXX");
52 53
53 /* Not all of the old file has to be mapped. Change this now this 54 /* Not all of the old file has to be mapped. Change this now this
54@@ -551,6 +563,8 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) 55@@ -569,10 +581,13 @@ open_archive (struct locarhandle *ah, bool readonly)
55
56 /* Add the information for the new one. */
57 *ah = new_ah;
58+ free(archivefname);
59+ free(fname);
60 }
61
62
63@@ -569,10 +583,13 @@ open_archive (struct locarhandle *ah, bool readonly)
64 /* If ah has a non-NULL fname open that otherwise open the default. */ 56 /* If ah has a non-NULL fname open that otherwise open the default. */
65 if (archivefname == NULL) 57 if (archivefname == NULL)
66 { 58 {
@@ -78,7 +70,7 @@ index ca332a345f..91f62da662 100644
78 } 70 }
79 71
80 while (1) 72 while (1)
81@@ -585,7 +602,7 @@ open_archive (struct locarhandle *ah, bool readonly) 73@@ -585,7 +600,7 @@ open_archive (struct locarhandle *ah, bool readonly)
82 the default locale archive we ignore the failure and 74 the default locale archive we ignore the failure and
83 list an empty archive, otherwise we print an error 75 list an empty archive, otherwise we print an error
84 and exit. */ 76 and exit. */
@@ -87,3 +79,6 @@ index ca332a345f..91f62da662 100644
87 { 79 {
88 if (readonly) 80 if (readonly)
89 { 81 {
82--
832.20.1
84
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/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
index 28cff2b90b..0ddd2e58b2 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/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
@@ -1,7 +1,7 @@
1From a6159c9486745664a5f116ee9cc45837021b7624 Mon Sep 17 00:00:00 2001 1From 804b05a034bfaf4e3427243e6baf736086822cd0 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] elf/dl-deps.c: Make _dl_build_local_scope breadth first 4Subject: [PATCH 25/30] 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,7 +24,7 @@ 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 9d9b1ba7f2..8414028c58 100644 27index e12c353158..9234daac05 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@@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map)
@@ -51,3 +51,6 @@ index 9d9b1ba7f2..8414028c58 100644
51 return p - list; 51 return p - list;
52 } 52 }
53 53
54--
552.20.1
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
deleted file mode 100644
index 4a7919ff5b..0000000000
--- a/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 6c6aecba19b3e7947100623532a41b6f16734ace Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= <jeremy.rosen@smile.fr>
3Date: Mon, 22 Aug 2016 16:09:25 +0200
4Subject: [PATCH] locale: fix hard-coded reference to gcc -E
5
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
8with -Werror.
9
10Autotools provides a way for a user to specify the name of his compiler using a
11set of variables ($CC $CXX $CPP etc.). Those variables are used correctly when
12compiling glibc but the script used to generate transliterations in the locale/
13subdirectory directly calls the gcc binary to get the output of the
14preprocessor instead of using the $CPP variable provided by the build
15environment.
16
17This patch replaces the hard-coded reference to the gcc binary with the proper
18environment variable, thus allowing a user to override it.
19
20Upstream-Status: Submitted [https://sourceware.org/ml/libc-alpha/2016-08/msg00746.html]
21---
22 locale/gen-translit.pl | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/locale/gen-translit.pl b/locale/gen-translit.pl
26index 30d3f2f195..e97653017c 100644
27--- a/locale/gen-translit.pl
28+++ b/locale/gen-translit.pl
29@@ -1,5 +1,5 @@
30 #!/usr/bin/perl -w
31-open F, "cat C-translit.h.in | gcc -E - |" || die "Cannot preprocess input file";
32+open F, 'cat C-translit.h.in | ${CPP:-gcc -E} - |' || die "Cannot preprocess input file";
33
34
35 sub cstrlen {
diff --git a/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch b/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch
index 71ddc1234b..70696b8d3c 100644
--- a/meta/recipes-core/glibc/glibc/0026-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 efb0fca7db742f4195e1771d8ba4c7fba4938819 Mon Sep 17 00:00:00 2001 1From e6e6e5011611fa22186508a3ff8ed4215a529f1f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 27 Jan 2018 10:05:07 -0800 3Date: Sat, 27 Jan 2018 10:05:07 -0800
4Subject: [PATCH] reset dl_load_write_lock after forking 4Subject: [PATCH 26/30] 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
@@ -20,7 +20,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
20 1 file changed, 2 insertions(+), 2 deletions(-) 20 1 file changed, 2 insertions(+), 2 deletions(-)
21 21
22diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c 22diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
23index ec56a827eb..0f48933ff1 100644 23index bd68f18b45..5c9bb44372 100644
24--- a/sysdeps/nptl/fork.c 24--- a/sysdeps/nptl/fork.c
25+++ b/sysdeps/nptl/fork.c 25+++ b/sysdeps/nptl/fork.c
26@@ -130,9 +130,9 @@ __libc_fork (void) 26@@ -130,9 +130,9 @@ __libc_fork (void)
@@ -35,3 +35,6 @@ index ec56a827eb..0f48933ff1 100644
35 /* Run the handlers registered for the child. */ 35 /* Run the handlers registered for the child. */
36 __run_fork_handlers (atfork_run_child); 36 __run_fork_handlers (atfork_run_child);
37 } 37 }
38--
392.20.1
40
diff --git a/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch b/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
index dd37f2cd4d..5bc813a900 100644
--- a/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
+++ b/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
@@ -1,7 +1,7 @@
1From 6ea962e0946da7564a774b08dd3eda28d64e9e56 Mon Sep 17 00:00:00 2001 1From eb43af9afba3c2b499be6e71b69687d4e7c6272a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 27 Jan 2018 10:08:04 -0800 3Date: Sat, 27 Jan 2018 10:08:04 -0800
4Subject: [PATCH] Acquire ld.so lock before switching to malloc_atfork 4Subject: [PATCH 27/30] Acquire ld.so lock before switching to malloc_atfork
5 5
6The patch is from 6The patch is from
7 https://sourceware.org/bugzilla/show_bug.cgi?id=4578 7 https://sourceware.org/bugzilla/show_bug.cgi?id=4578
@@ -32,7 +32,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
32 1 file changed, 7 insertions(+) 32 1 file changed, 7 insertions(+)
33 33
34diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c 34diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
35index 0f48933ff1..eef3f9669b 100644 35index 5c9bb44372..84a1a404b3 100644
36--- a/sysdeps/nptl/fork.c 36--- a/sysdeps/nptl/fork.c
37+++ b/sysdeps/nptl/fork.c 37+++ b/sysdeps/nptl/fork.c
38@@ -25,6 +25,7 @@ 38@@ -25,6 +25,7 @@
@@ -63,3 +63,6 @@ index 0f48933ff1..eef3f9669b 100644
63 } 63 }
64 64
65 return pid; 65 return pid;
66--
672.20.1
68
diff --git a/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch b/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch
deleted file mode 100644
index fae8d0040d..0000000000
--- a/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1From 38fad3e5ab3b45c56810abd35fa11a72fa10b8f1 Mon Sep 17 00:00:00 2001
2From: Pratyush Anand <panand@redhat.com>
3Date: Wed, 22 Mar 2017 17:02:38 +0530
4Subject: [PATCH] bits/siginfo-consts.h: enum definition for TRAP_HWBKPT is
5 missing
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Compile following linux kernel test code with latest glibc:
11
12https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c
13
14and we get following error:
15breakpoint_test_arm64.c: In function ‘run_test’:
16breakpoint_test_arm64.c:171:25: error: ‘TRAP_HWBKPT’ undeclared (first use in this function)
17 if (siginfo.si_code != TRAP_HWBKPT) {
18 ^
19I can compile test code by modifying my local
20/usr/include/bits/siginfo.h and test works great. Therefore, this patch
21will be needed in upstream glibc so that issue is fixed there as well.
22
23Signed-off-by: Pratyush Anand <panand@redhat.com>
24
25Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=21286]
26---
27 bits/siginfo-consts.h | 6 +++++-
28 sysdeps/unix/sysv/linux/bits/siginfo-consts.h | 6 +++++-
29 2 files changed, 10 insertions(+), 2 deletions(-)
30
31diff --git a/bits/siginfo-consts.h b/bits/siginfo-consts.h
32index 7464c1882b..298314527a 100644
33--- a/bits/siginfo-consts.h
34+++ b/bits/siginfo-consts.h
35@@ -106,8 +106,12 @@ enum
36 {
37 TRAP_BRKPT = 1, /* Process breakpoint. */
38 # define TRAP_BRKPT TRAP_BRKPT
39- TRAP_TRACE /* Process trace trap. */
40+ TRAP_TRACE, /* Process trace trap. */
41 # define TRAP_TRACE TRAP_TRACE
42+ TRAP_BRANCH, /* Process branch trap. */
43+# define TRAP_BRANCH TRAP_BRANCH
44+ TRAP_HWBKPT /* hardware breakpoint/watchpoint */
45+# define TRAP_HWBKPT TRAP_HWBKPT
46 };
47 # endif
48
49diff --git a/sysdeps/unix/sysv/linux/bits/siginfo-consts.h b/sysdeps/unix/sysv/linux/bits/siginfo-consts.h
50index 193bd9c471..3fe852bc5f 100644
51--- a/sysdeps/unix/sysv/linux/bits/siginfo-consts.h
52+++ b/sysdeps/unix/sysv/linux/bits/siginfo-consts.h
53@@ -141,8 +141,12 @@ enum
54 {
55 TRAP_BRKPT = 1, /* Process breakpoint. */
56 # define TRAP_BRKPT TRAP_BRKPT
57- TRAP_TRACE /* Process trace trap. */
58+ TRAP_TRACE, /* Process trace trap. */
59 # define TRAP_TRACE TRAP_TRACE
60+ TRAP_BRANCH, /* Process branch trap. */
61+# define TRAP_BRANCH TRAP_BRANCH
62+ TRAP_HWBKPT /* hardware breakpoint/watchpoint */
63+# define TRAP_HWBKPT TRAP_HWBKPT
64 };
65 # endif
66
diff --git a/meta/recipes-core/glibc/glibc/0030-intl-Emit-no-lines-in-bison-generated-files.patch b/meta/recipes-core/glibc/glibc/0028-intl-Emit-no-lines-in-bison-generated-files.patch
index db97d91c99..0eb006ffb7 100644
--- a/meta/recipes-core/glibc/glibc/0030-intl-Emit-no-lines-in-bison-generated-files.patch
+++ b/meta/recipes-core/glibc/glibc/0028-intl-Emit-no-lines-in-bison-generated-files.patch
@@ -1,7 +1,7 @@
1From a54c15d0567d547137066f41b1b22eba4875c27b Mon Sep 17 00:00:00 2001 1From 39f910a4b8195d0538425aad7f0ebdc232b7a582 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Aug 2018 09:44:00 -0700 3Date: Fri, 3 Aug 2018 09:44:00 -0700
4Subject: [PATCH] intl: Emit no lines in bison generated files 4Subject: [PATCH 28/30] intl: Emit no lines in bison generated files
5 5
6Improve reproducibility: 6Improve reproducibility:
7Do not put any #line preprocessor commands in bison generated files. 7Do not put any #line preprocessor commands in bison generated files.
@@ -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/intl/Makefile b/intl/Makefile 19diff --git a/intl/Makefile b/intl/Makefile
20index 672edf1b38..d31888d013 100644 20index 9eea8d57e3..627dce4cf1 100644
21--- a/intl/Makefile 21--- a/intl/Makefile
22+++ b/intl/Makefile 22+++ b/intl/Makefile
23@@ -155,7 +155,7 @@ $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out 23@@ -155,7 +155,7 @@ $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out
@@ -29,3 +29,6 @@ index 672edf1b38..d31888d013 100644
29 29
30 $(inst_localedir)/locale.alias: locale.alias $(+force) 30 $(inst_localedir)/locale.alias: locale.alias $(+force)
31 $(do-install) 31 $(do-install)
32--
332.20.1
34
diff --git a/meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch b/meta/recipes-core/glibc/glibc/0029-inject-file-assembly-directives.patch
index 55eba2d43e..2874fb5815 100644
--- a/meta/recipes-core/glibc/glibc/0034-inject-file-assembly-directives.patch
+++ b/meta/recipes-core/glibc/glibc/0029-inject-file-assembly-directives.patch
@@ -1,7 +1,12 @@
1Currently, non-IA builds are not reproducibile since build paths are 1From 649bfb399265eb48a9fe8db1c2b5a31633c55152 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 29 Nov 2018 17:29:35 -0800
4Subject: [PATCH 29/30] inject file assembly directives
5
6Currently, non-IA builds are not reproducibile since build paths are
2being injected into the debug symbols. These are coming from the use of 7being injected into the debug symbols. These are coming from the use of
3.S assembler files during the glibc build. No STT_FILE section is added 8.S assembler files during the glibc build. No STT_FILE section is added
4during the assembly but when linking, ld decides to add one to aid 9during the assembly but when linking, ld decides to add one to aid
5debugging and ensure references between the different object files its 10debugging and ensure references between the different object files its
6linking remain clear. 11linking remain clear.
7 12
@@ -18,8 +23,32 @@ RP
18 23
19Upstream-Status: Pending 24Upstream-Status: Pending
20 25
26Signed-off-by: Khem Raj <raj.khem@gmail.com>
27---
28 csu/abi-note.S | 2 ++
29 sysdeps/aarch64/crti.S | 2 ++
30 sysdeps/aarch64/crtn.S | 2 ++
31 sysdeps/aarch64/dl-tlsdesc.S | 2 ++
32 sysdeps/aarch64/dl-trampoline.S | 2 ++
33 sysdeps/aarch64/start.S | 2 ++
34 sysdeps/arm/abi-note.S | 2 ++
35 sysdeps/arm/crti.S | 2 ++
36 sysdeps/arm/crtn.S | 2 ++
37 sysdeps/arm/dl-tlsdesc.S | 2 ++
38 sysdeps/arm/dl-trampoline.S | 2 ++
39 sysdeps/arm/start.S | 2 ++
40 sysdeps/mips/start.S | 2 ++
41 sysdeps/powerpc/powerpc32/dl-start.S | 2 ++
42 sysdeps/powerpc/powerpc32/start.S | 2 ++
43 sysdeps/powerpc/powerpc64/start.S | 2 ++
44 sysdeps/unix/sysv/linux/aarch64/__read_tp.S | 2 ++
45 sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S | 2 ++
46 sysdeps/unix/sysv/linux/arm/libc-do-syscall.S | 2 ++
47 sysdeps/unix/sysv/linux/powerpc/dl-brk.S | 2 ++
48 20 files changed, 40 insertions(+)
49
21diff --git a/csu/abi-note.S b/csu/abi-note.S 50diff --git a/csu/abi-note.S b/csu/abi-note.S
22index 5d0ca7803d..8ce41581b1 100644 51index fa1f014a88..098731362a 100644
23--- a/csu/abi-note.S 52--- a/csu/abi-note.S
24+++ b/csu/abi-note.S 53+++ b/csu/abi-note.S
25@@ -56,6 +56,8 @@ offset length contents 54@@ -56,6 +56,8 @@ offset length contents
@@ -32,7 +61,7 @@ index 5d0ca7803d..8ce41581b1 100644
32 name begins with `.note' and creates a PT_NOTE program header entry 61 name begins with `.note' and creates a PT_NOTE program header entry
33 pointing at it. */ 62 pointing at it. */
34diff --git a/sysdeps/aarch64/crti.S b/sysdeps/aarch64/crti.S 63diff --git a/sysdeps/aarch64/crti.S b/sysdeps/aarch64/crti.S
35index 2b213758b2..736f33e314 100644 64index d4e7dfcf5c..e0218df30c 100644
36--- a/sysdeps/aarch64/crti.S 65--- a/sysdeps/aarch64/crti.S
37+++ b/sysdeps/aarch64/crti.S 66+++ b/sysdeps/aarch64/crti.S
38@@ -50,6 +50,8 @@ 67@@ -50,6 +50,8 @@
@@ -45,7 +74,7 @@ index 2b213758b2..736f33e314 100644
45 weak_extern (PREINIT_FUNCTION) 74 weak_extern (PREINIT_FUNCTION)
46 #else 75 #else
47diff --git a/sysdeps/aarch64/crtn.S b/sysdeps/aarch64/crtn.S 76diff --git a/sysdeps/aarch64/crtn.S b/sysdeps/aarch64/crtn.S
48index d72300af80..cb249bf3ca 100644 77index 363f752460..2fb06fba62 100644
49--- a/sysdeps/aarch64/crtn.S 78--- a/sysdeps/aarch64/crtn.S
50+++ b/sysdeps/aarch64/crtn.S 79+++ b/sysdeps/aarch64/crtn.S
51@@ -37,6 +37,8 @@ 80@@ -37,6 +37,8 @@
@@ -57,34 +86,8 @@ index d72300af80..cb249bf3ca 100644
57 .section .init,"ax",%progbits 86 .section .init,"ax",%progbits
58 ldp x29, x30, [sp], 16 87 ldp x29, x30, [sp], 16
59 RET 88 RET
60diff --git a/sysdeps/aarch64/start.S b/sysdeps/aarch64/start.S
61index bad000f555..5957c028cd 100644
62--- a/sysdeps/aarch64/start.S
63+++ b/sysdeps/aarch64/start.S
64@@ -18,6 +18,8 @@
65
66 #include <sysdep.h>
67
68+ .file "start.S"
69+
70 /* This is the canonical entry point, usually the first thing in the text
71 segment.
72
73diff --git a/sysdeps/unix/sysv/linux/aarch64/__read_tp.S b/sysdeps/unix/sysv/linux/aarch64/__read_tp.S
74index 92fc0191a5..715bfcb9e4 100644
75--- a/sysdeps/unix/sysv/linux/aarch64/__read_tp.S
76+++ b/sysdeps/unix/sysv/linux/aarch64/__read_tp.S
77@@ -18,6 +18,8 @@
78
79 #include <sysdep.h>
80
81+ .file "__read_tp.S"
82+
83 .hidden __read_tp
84 ENTRY (__read_tp)
85 mrs x0, tpidr_el0
86diff --git a/sysdeps/aarch64/dl-tlsdesc.S b/sysdeps/aarch64/dl-tlsdesc.S 89diff --git a/sysdeps/aarch64/dl-tlsdesc.S b/sysdeps/aarch64/dl-tlsdesc.S
87index 43a62ef307..42f85cdde9 100644 90index 4abe6b82a3..8c44b2ff8a 100644
88--- a/sysdeps/aarch64/dl-tlsdesc.S 91--- a/sysdeps/aarch64/dl-tlsdesc.S
89+++ b/sysdeps/aarch64/dl-tlsdesc.S 92+++ b/sysdeps/aarch64/dl-tlsdesc.S
90@@ -22,6 +22,8 @@ 93@@ -22,6 +22,8 @@
@@ -97,7 +100,7 @@ index 43a62ef307..42f85cdde9 100644
97 #define SAVE_Q_REGISTERS \ 100 #define SAVE_Q_REGISTERS \
98 stp q0, q1, [sp, #-32*NSAVEDQREGPAIRS]!; \ 101 stp q0, q1, [sp, #-32*NSAVEDQREGPAIRS]!; \
99diff --git a/sysdeps/aarch64/dl-trampoline.S b/sysdeps/aarch64/dl-trampoline.S 102diff --git a/sysdeps/aarch64/dl-trampoline.S b/sysdeps/aarch64/dl-trampoline.S
100index a86d0722d4..92edab1d01 100644 103index 19b117e8f9..38c78b5409 100644
101--- a/sysdeps/aarch64/dl-trampoline.S 104--- a/sysdeps/aarch64/dl-trampoline.S
102+++ b/sysdeps/aarch64/dl-trampoline.S 105+++ b/sysdeps/aarch64/dl-trampoline.S
103@@ -21,6 +21,8 @@ 106@@ -21,6 +21,8 @@
@@ -109,6 +112,19 @@ index a86d0722d4..92edab1d01 100644
109 #define ip0 x16 112 #define ip0 x16
110 #define ip0l PTR_REG (16) 113 #define ip0l PTR_REG (16)
111 #define ip1 x17 114 #define ip1 x17
115diff --git a/sysdeps/aarch64/start.S b/sysdeps/aarch64/start.S
116index f5e9b9c223..ae3e22a6a5 100644
117--- a/sysdeps/aarch64/start.S
118+++ b/sysdeps/aarch64/start.S
119@@ -18,6 +18,8 @@
120
121 #include <sysdep.h>
122
123+ .file "start.S"
124+
125 /* This is the canonical entry point, usually the first thing in the text
126 segment.
127
112diff --git a/sysdeps/arm/abi-note.S b/sysdeps/arm/abi-note.S 128diff --git a/sysdeps/arm/abi-note.S b/sysdeps/arm/abi-note.S
113index 07bd4c4619..7213b16f27 100644 129index 07bd4c4619..7213b16f27 100644
114--- a/sysdeps/arm/abi-note.S 130--- a/sysdeps/arm/abi-note.S
@@ -120,7 +136,7 @@ index 07bd4c4619..7213b16f27 100644
120 alignment in any callee. */ 136 alignment in any callee. */
121 .eabi_attribute 25, 1 137 .eabi_attribute 25, 1
122diff --git a/sysdeps/arm/crti.S b/sysdeps/arm/crti.S 138diff --git a/sysdeps/arm/crti.S b/sysdeps/arm/crti.S
123index a1424d0333..bca1dab256 100644 139index 26dbba66a3..dd84ecd566 100644
124--- a/sysdeps/arm/crti.S 140--- a/sysdeps/arm/crti.S
125+++ b/sysdeps/arm/crti.S 141+++ b/sysdeps/arm/crti.S
126@@ -57,6 +57,8 @@ 142@@ -57,6 +57,8 @@
@@ -133,7 +149,7 @@ index a1424d0333..bca1dab256 100644
133 .p2align 2 149 .p2align 2
134 .type call_weak_fn, %function 150 .type call_weak_fn, %function
135diff --git a/sysdeps/arm/crtn.S b/sysdeps/arm/crtn.S 151diff --git a/sysdeps/arm/crtn.S b/sysdeps/arm/crtn.S
136index 26027693ce..65a0502826 100644 152index 8f91c8d88b..a87fe49e07 100644
137--- a/sysdeps/arm/crtn.S 153--- a/sysdeps/arm/crtn.S
138+++ b/sysdeps/arm/crtn.S 154+++ b/sysdeps/arm/crtn.S
139@@ -37,6 +37,8 @@ 155@@ -37,6 +37,8 @@
@@ -146,7 +162,7 @@ index 26027693ce..65a0502826 100644
146 corresponding to the prologues in crti.S. */ 162 corresponding to the prologues in crti.S. */
147 163
148diff --git a/sysdeps/arm/dl-tlsdesc.S b/sysdeps/arm/dl-tlsdesc.S 164diff --git a/sysdeps/arm/dl-tlsdesc.S b/sysdeps/arm/dl-tlsdesc.S
149index 056e17d52d..a98c68dfb9 100644 165index a929340b42..b724c9776d 100644
150--- a/sysdeps/arm/dl-tlsdesc.S 166--- a/sysdeps/arm/dl-tlsdesc.S
151+++ b/sysdeps/arm/dl-tlsdesc.S 167+++ b/sysdeps/arm/dl-tlsdesc.S
152@@ -21,6 +21,8 @@ 168@@ -21,6 +21,8 @@
@@ -159,7 +175,7 @@ index 056e17d52d..a98c68dfb9 100644
159 @ emit debug information with cfi 175 @ emit debug information with cfi
160 @ use arm-specific pseudos for unwinding itself 176 @ use arm-specific pseudos for unwinding itself
161diff --git a/sysdeps/arm/dl-trampoline.S b/sysdeps/arm/dl-trampoline.S 177diff --git a/sysdeps/arm/dl-trampoline.S b/sysdeps/arm/dl-trampoline.S
162index c731b01286..4b37b25344 100644 178index 325cfcd2ce..4bfdcbce51 100644
163--- a/sysdeps/arm/dl-trampoline.S 179--- a/sysdeps/arm/dl-trampoline.S
164+++ b/sysdeps/arm/dl-trampoline.S 180+++ b/sysdeps/arm/dl-trampoline.S
165@@ -21,6 +21,8 @@ 181@@ -21,6 +21,8 @@
@@ -172,7 +188,7 @@ index c731b01286..4b37b25344 100644
172 .globl _dl_runtime_resolve 188 .globl _dl_runtime_resolve
173 .type _dl_runtime_resolve, #function 189 .type _dl_runtime_resolve, #function
174diff --git a/sysdeps/arm/start.S b/sysdeps/arm/start.S 190diff --git a/sysdeps/arm/start.S b/sysdeps/arm/start.S
175index adef090717..d22e4128e0 100644 191index a05f8a4651..2f4374fcaa 100644
176--- a/sysdeps/arm/start.S 192--- a/sysdeps/arm/start.S
177+++ b/sysdeps/arm/start.S 193+++ b/sysdeps/arm/start.S
178@@ -57,6 +57,8 @@ 194@@ -57,6 +57,8 @@
@@ -184,21 +200,8 @@ index adef090717..d22e4128e0 100644
184 /* Tag_ABI_align8_preserved: This code preserves 8-byte 200 /* Tag_ABI_align8_preserved: This code preserves 8-byte
185 alignment in any callee. */ 201 alignment in any callee. */
186 .eabi_attribute 25, 1 202 .eabi_attribute 25, 1
187diff --git a/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S b/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S
188index 871702317a..20a942dbac 100644
189--- a/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S
190+++ b/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S
191@@ -39,6 +39,8 @@
192 a normal function call) in a high page of memory; tail call to the
193 helper. */
194
195+ .file "aeabi_read_tp.S"
196+
197 .hidden __aeabi_read_tp
198 ENTRY (__aeabi_read_tp)
199 #ifdef ARCH_HAS_HARD_TP
200diff --git a/sysdeps/mips/start.S b/sysdeps/mips/start.S 203diff --git a/sysdeps/mips/start.S b/sysdeps/mips/start.S
201index a4c4ef0fae..d00fff31a8 100644 204index 8638e5b545..93f6564aec 100644
202--- a/sysdeps/mips/start.S 205--- a/sysdeps/mips/start.S
203+++ b/sysdeps/mips/start.S 206+++ b/sysdeps/mips/start.S
204@@ -38,6 +38,8 @@ 207@@ -38,6 +38,8 @@
@@ -210,16 +213,21 @@ index a4c4ef0fae..d00fff31a8 100644
210 #ifndef ENTRY_POINT 213 #ifndef ENTRY_POINT
211 #error ENTRY_POINT needs to be defined for start.S on MIPS/ELF. 214 #error ENTRY_POINT needs to be defined for start.S on MIPS/ELF.
212 #endif 215 #endif
213diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-brk.S b/sysdeps/unix/sysv/linux/powerpc/dl-brk.S 216diff --git a/sysdeps/powerpc/powerpc32/dl-start.S b/sysdeps/powerpc/powerpc32/dl-start.S
214index eeb96544e3..da182b28f8 100644 217index 99a10d643a..e47fc0d245 100644
215--- a/sysdeps/unix/sysv/linux/powerpc/dl-brk.S 218--- a/sysdeps/powerpc/powerpc32/dl-start.S
216+++ b/sysdeps/unix/sysv/linux/powerpc/dl-brk.S 219+++ b/sysdeps/powerpc/powerpc32/dl-start.S
217@@ -1 +1,3 @@ 220@@ -18,6 +18,8 @@
218+ .file "dl-brk.S" 221
222 #include <sysdep.h>
223
224+ .file "dl-start.S"
219+ 225+
220 #include <brk.S> 226 /* Initial entry point code for the dynamic linker.
227 The C function `_dl_start' is the real entry point;
228 its return value is the user program's entry point. */
221diff --git a/sysdeps/powerpc/powerpc32/start.S b/sysdeps/powerpc/powerpc32/start.S 229diff --git a/sysdeps/powerpc/powerpc32/start.S b/sysdeps/powerpc/powerpc32/start.S
222index 5c10a22f8a..2b52627f27 100644 230index 172fb5a56b..ef1471b861 100644
223--- a/sysdeps/powerpc/powerpc32/start.S 231--- a/sysdeps/powerpc/powerpc32/start.S
224+++ b/sysdeps/powerpc/powerpc32/start.S 232+++ b/sysdeps/powerpc/powerpc32/start.S
225@@ -35,6 +35,8 @@ 233@@ -35,6 +35,8 @@
@@ -232,7 +240,7 @@ index 5c10a22f8a..2b52627f27 100644
232 before crtbegin.o, the file defining __EH_FRAME_BEGIN__. */ 240 before crtbegin.o, the file defining __EH_FRAME_BEGIN__. */
233 #undef cfi_startproc 241 #undef cfi_startproc
234diff --git a/sysdeps/powerpc/powerpc64/start.S b/sysdeps/powerpc/powerpc64/start.S 242diff --git a/sysdeps/powerpc/powerpc64/start.S b/sysdeps/powerpc/powerpc64/start.S
235index bd7189310c..2e22b8472d 100644 243index 55fae68ad6..0cb608fe0f 100644
236--- a/sysdeps/powerpc/powerpc64/start.S 244--- a/sysdeps/powerpc/powerpc64/start.S
237+++ b/sysdeps/powerpc/powerpc64/start.S 245+++ b/sysdeps/powerpc/powerpc64/start.S
238@@ -35,6 +35,8 @@ 246@@ -35,6 +35,8 @@
@@ -244,21 +252,34 @@ index bd7189310c..2e22b8472d 100644
244 /* We do not want .eh_frame info for crt1.o since crt1.o is linked 252 /* We do not want .eh_frame info for crt1.o since crt1.o is linked
245 before crtbegin.o, the file defining __EH_FRAME_BEGIN__. */ 253 before crtbegin.o, the file defining __EH_FRAME_BEGIN__. */
246 #undef cfi_startproc 254 #undef cfi_startproc
247diff --git a/sysdeps/powerpc/powerpc32/dl-start.S b/sysdeps/powerpc/powerpc32/dl-start.S 255diff --git a/sysdeps/unix/sysv/linux/aarch64/__read_tp.S b/sysdeps/unix/sysv/linux/aarch64/__read_tp.S
248index 244d87fb6d..14d3e2ce14 100644 256index 30a29b9fb0..07892b383f 100644
249--- a/sysdeps/powerpc/powerpc32/dl-start.S 257--- a/sysdeps/unix/sysv/linux/aarch64/__read_tp.S
250+++ b/sysdeps/powerpc/powerpc32/dl-start.S 258+++ b/sysdeps/unix/sysv/linux/aarch64/__read_tp.S
251@@ -18,6 +18,8 @@ 259@@ -18,6 +18,8 @@
252 260
253 #include <sysdep.h> 261 #include <sysdep.h>
254 262
255+ .file "dl-start.S" 263+ .file "__read_tp.S"
256+ 264+
257 /* Initial entry point code for the dynamic linker. 265 .hidden __read_tp
258 The C function `_dl_start' is the real entry point; 266 ENTRY (__read_tp)
259 its return value is the user program's entry point. */ 267 mrs x0, tpidr_el0
268diff --git a/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S b/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S
269index f64c4ffe8a..2da315ab08 100644
270--- a/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S
271+++ b/sysdeps/unix/sysv/linux/arm/aeabi_read_tp.S
272@@ -39,6 +39,8 @@
273 a normal function call) in a high page of memory; tail call to the
274 helper. */
275
276+ .file "aeabi_read_tp.S"
277+
278 .hidden __aeabi_read_tp
279 ENTRY (__aeabi_read_tp)
280 #ifdef ARCH_HAS_HARD_TP
260diff --git a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S 281diff --git a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
261index d26ad1f8d3..a0de10bf81 100644 282index 0b6237ac55..8cda491c28 100644
262--- a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S 283--- a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
263+++ b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S 284+++ b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
264@@ -27,6 +27,8 @@ 285@@ -27,6 +27,8 @@
@@ -270,3 +291,14 @@ index d26ad1f8d3..a0de10bf81 100644
270 #if defined(__thumb__) 291 #if defined(__thumb__)
271 .thumb 292 .thumb
272 .syntax unified 293 .syntax unified
294diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-brk.S b/sysdeps/unix/sysv/linux/powerpc/dl-brk.S
295index eeb96544e3..da182b28f8 100644
296--- a/sysdeps/unix/sysv/linux/powerpc/dl-brk.S
297+++ b/sysdeps/unix/sysv/linux/powerpc/dl-brk.S
298@@ -1 +1,3 @@
299+ .file "dl-brk.S"
300+
301 #include <brk.S>
302--
3032.20.1
304
diff --git a/meta/recipes-core/glibc/glibc/0033-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch b/meta/recipes-core/glibc/glibc/0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch
index 31058ca91a..adc2424002 100644
--- a/meta/recipes-core/glibc/glibc/0033-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch
+++ b/meta/recipes-core/glibc/glibc/0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch
@@ -1,7 +1,7 @@
1From cbada1a1b218c1ef61d0eb4363fad7598e6509d6 Mon Sep 17 00:00:00 2001 1From 6ddab9c8692e6a777c2e2e7a6ca26a65df7d2c5d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Sun, 30 Sep 2018 09:16:48 +0000 3Date: Mon, 17 Dec 2018 21:36:18 +0000
4Subject: [PATCH] locale: prevent maybe-uninitialized errors with -Os [BZ 4Subject: [PATCH 30/30] locale: prevent maybe-uninitialized errors with -Os [BZ
5 #19444] 5 #19444]
6 6
7Fixes following error when building for aarch64 with -Os: 7Fixes following error when building for aarch64 with -Os:
@@ -21,34 +21,19 @@ Fixes following error when building for aarch64 with -Os:
21| coll_seq seq1, seq2; 21| coll_seq seq1, seq2;
22| ^~~~ 22| ^~~~
23 23
24 Partial fix for [BZ #23716] 24 Partial fix for [BZ #19444]
25 * locale/weight.h: Fix build with -Os. 25 * locale/weight.h: Fix build with -Os.
26 26
27Work around the issue instead of removing -O like we do with 27Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1014766]
28SELECTED_OPTIMIZATION
29
30Upstream-Status: Submitted [https://www.sourceware.org/ml/libc-alpha/2018-09/msg00539.html]
31 28
32Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 29Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
30Signed-off-by: Khem Raj <raj.khem@gmail.com>
33--- 31---
34 ChangeLog | 4 ++++
35 locale/weight.h | 7 +++++++ 32 locale/weight.h | 7 +++++++
36 2 files changed, 11 insertions(+) 33 1 file changed, 7 insertions(+)
37 34
38diff --git a/ChangeLog b/ChangeLog
39index 216336edc9..84fbbf47ed 100644
40--- a/ChangeLog
41+++ b/ChangeLog
42@@ -1,3 +1,7 @@
43+2018-09-30 Martin Jansa <Martin.Jansa@gmail.com>
44+ Partial fix for [BZ #23716]
45+ * locale/weight.h: Fix build with -Os.
46+
47 2018-09-30 Martin Jansa <Martin.Jansa@gmail.com>
48 Partial fix for [BZ #23716]
49 * sysdeps/ieee754/soft-fp/s_fdiv.c: Fix build with -O.
50diff --git a/locale/weight.h b/locale/weight.h 35diff --git a/locale/weight.h b/locale/weight.h
51index 6028d3595e..10bcea25e5 100644 36index 7ca81498b2..d608ca70bb 100644
52--- a/locale/weight.h 37--- a/locale/weight.h
53+++ b/locale/weight.h 38+++ b/locale/weight.h
54@@ -28,7 +28,14 @@ findidx (const int32_t *table, 39@@ -28,7 +28,14 @@ findidx (const int32_t *table,
@@ -66,3 +51,6 @@ index 6028d3595e..10bcea25e5 100644
66 const unsigned char *cp; 51 const unsigned char *cp;
67 const unsigned char *usrc; 52 const unsigned char *usrc;
68 53
54--
552.20.1
56
diff --git a/meta/recipes-core/glibc/glibc/0031-sysdeps-ieee754-prevent-maybe-uninitialized-errors-w.patch b/meta/recipes-core/glibc/glibc/0031-sysdeps-ieee754-prevent-maybe-uninitialized-errors-w.patch
deleted file mode 100644
index 61f55d4f83..0000000000
--- a/meta/recipes-core/glibc/glibc/0031-sysdeps-ieee754-prevent-maybe-uninitialized-errors-w.patch
+++ /dev/null
@@ -1,258 +0,0 @@
1From 546b46c309a52ed74dc906114b1e984bb9703d74 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 14 Sep 2018 23:23:03 +0000
4Subject: [PATCH] sysdeps/ieee754: prevent maybe-uninitialized errors with -O
5 [BZ #19444]
6
7With -O included in CFLAGS it fails to build with:
8
9../sysdeps/ieee754/ldbl-96/e_jnl.c: In function '__ieee754_jnl':
10../sysdeps/ieee754/ldbl-96/e_jnl.c:146:20: error: 'temp' may be used uninitialized in this function [-Werror=maybe-uninitialized]
11 b = invsqrtpi * temp / sqrtl (x);
12 ~~~~~~~~~~^~~~~~
13../sysdeps/ieee754/ldbl-96/e_jnl.c: In function '__ieee754_ynl':
14../sysdeps/ieee754/ldbl-96/e_jnl.c:375:16: error: 'temp' may be used uninitialized in this function [-Werror=maybe-uninitialized]
15 b = invsqrtpi * temp / sqrtl (x);
16 ~~~~~~~~~~^~~~~~
17../sysdeps/ieee754/dbl-64/e_jn.c: In function '__ieee754_jn':
18../sysdeps/ieee754/dbl-64/e_jn.c:113:20: error: 'temp' may be used uninitialized in this function [-Werror=maybe-uninitialized]
19 b = invsqrtpi * temp / sqrt (x);
20 ~~~~~~~~~~^~~~~~
21../sysdeps/ieee754/dbl-64/e_jn.c: In function '__ieee754_yn':
22../sysdeps/ieee754/dbl-64/e_jn.c:320:16: error: 'temp' may be used uninitialized in this function [-Werror=maybe-uninitialized]
23 b = invsqrtpi * temp / sqrt (x);
24 ~~~~~~~~~~^~~~~~
25
26Build tested with Yocto for ARM, AARCH64, X86, X86_64, PPC, MIPS, MIPS64
27with -O, -O1, -Os.
28For soft-fp ARM it needs one more fix for -O1:
29https://sourceware.org/ml/libc-alpha/2018-09/msg00300.html
30For AARCH64 it needs one more fix in locale for -Os.
31
32 [BZ #23716]
33 * sysdeps/ieee754/dbl-96/e_jnl.c: Fix build with -O
34 * sysdeps/ieee754/ldbl-96/e_jnl.c: Likewise.
35 * sysdeps/ieee754/ldbl-128/e_jnl.c: Likewise.
36 * sysdeps/ieee754/ldbl-128ibm/e_jnl.c: Likewise.
37
38Work around the issue instead of removing -O like we do with
39SELECTED_OPTIMIZATION
40
41Upstream-Status: Submitted [https://www.sourceware.org/ml/libc-alpha/2018-09/msg00299.html]
42
43Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
44---
45 ChangeLog | 7 +++++++
46 sysdeps/ieee754/dbl-64/e_jn.c | 21 +++++++++++++++++++++
47 sysdeps/ieee754/ldbl-128/e_jnl.c | 21 +++++++++++++++++++++
48 sysdeps/ieee754/ldbl-128ibm/e_jnl.c | 21 +++++++++++++++++++++
49 sysdeps/ieee754/ldbl-96/e_jnl.c | 21 +++++++++++++++++++++
50 5 files changed, 91 insertions(+)
51
52diff --git a/ChangeLog b/ChangeLog
53index 11a9b8d98e..922e916f2c 100644
54--- a/ChangeLog
55+++ b/ChangeLog
56@@ -1,3 +1,10 @@
57+2018-09-29 Martin Jansa <Martin.Jansa@gmail.com>
58+ Partial fix for [BZ #23716]
59+ * sysdeps/ieee754/dbl-96/e_jnl.c: Fix build with -O
60+ * sysdeps/ieee754/ldbl-96/e_jnl.c: Likewise.
61+ * sysdeps/ieee754/ldbl-128/e_jnl.c: Likewise.
62+ * sysdeps/ieee754/ldbl-128ibm/e_jnl.c: Likewise.
63+
64 2018-09-28 Adhemerval Zanella <adhemerval.zanella@linaro.org>
65
66 [BZ #23579]
67diff --git a/sysdeps/ieee754/dbl-64/e_jn.c b/sysdeps/ieee754/dbl-64/e_jn.c
68index 9181b22bb8..9ff52c737f 100644
69--- a/sysdeps/ieee754/dbl-64/e_jn.c
70+++ b/sysdeps/ieee754/dbl-64/e_jn.c
71@@ -42,6 +42,7 @@
72 #include <math-narrow-eval.h>
73 #include <math_private.h>
74 #include <math-underflow.h>
75+#include <libc-diag.h>
76
77 static const double
78 invsqrtpi = 5.64189583547756279280e-01, /* 0x3FE20DD7, 0x50429B6D */
79@@ -109,7 +110,17 @@ __ieee754_jn (int n, double x)
80 case 2: temp = -c - s; break;
81 case 3: temp = c - s; break;
82 }
83+ /* With GCC 8 (and older) when compiling with -O the compiler
84+ warns that the variable 'temp', may be used uninitialized.
85+ The switch above covers all possible values of n & 3
86+ but GCC without VRP enabled isn't able to figure out the
87+ range of possible values is [0,3] as explained in:
88+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69230
89+ so it's false possitive with -O1 and lower. */
90+ DIAG_PUSH_NEEDS_COMMENT;
91+ DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
92 b = invsqrtpi * temp / sqrt (x);
93+ DIAG_POP_NEEDS_COMMENT;
94 }
95 else
96 {
97@@ -316,7 +327,17 @@ __ieee754_yn (int n, double x)
98 case 2: temp = -s + c; break;
99 case 3: temp = s + c; break;
100 }
101+ /* With GCC 8 (and older) when compiling with -O the compiler
102+ warns that the variable 'temp', may be used uninitialized.
103+ The switch above covers all possible values of n & 3
104+ but GCC without VRP enabled isn't able to figure out the
105+ range of possible values is [0,3] as explained in:
106+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69230
107+ so it's false possitive with -O1 and lower. */
108+ DIAG_PUSH_NEEDS_COMMENT;
109+ DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
110 b = invsqrtpi * temp / sqrt (x);
111+ DIAG_POP_NEEDS_COMMENT;
112 }
113 else
114 {
115diff --git a/sysdeps/ieee754/ldbl-128/e_jnl.c b/sysdeps/ieee754/ldbl-128/e_jnl.c
116index 7739eec291..8706a11575 100644
117--- a/sysdeps/ieee754/ldbl-128/e_jnl.c
118+++ b/sysdeps/ieee754/ldbl-128/e_jnl.c
119@@ -61,6 +61,7 @@
120 #include <math.h>
121 #include <math_private.h>
122 #include <math-underflow.h>
123+#include <libc-diag.h>
124
125 static const _Float128
126 invsqrtpi = L(5.6418958354775628694807945156077258584405E-1),
127@@ -150,7 +151,17 @@ __ieee754_jnl (int n, _Float128 x)
128 temp = c - s;
129 break;
130 }
131+ /* With GCC 8 (and older) when compiling with -O the compiler
132+ warns that the variable 'temp', may be used uninitialized.
133+ The switch above covers all possible values of n & 3
134+ but GCC without VRP enabled isn't able to figure out the
135+ range of possible values is [0,3] as explained in:
136+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69230
137+ so it's false possitive with -O1 and lower. */
138+ DIAG_PUSH_NEEDS_COMMENT;
139+ DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
140 b = invsqrtpi * temp / sqrtl (x);
141+ DIAG_POP_NEEDS_COMMENT;
142 }
143 else
144 {
145@@ -386,7 +397,17 @@ __ieee754_ynl (int n, _Float128 x)
146 temp = s + c;
147 break;
148 }
149+ /* With GCC 8 (and older) when compiling with -O the compiler
150+ warns that the variable 'temp', may be used uninitialized.
151+ The switch above covers all possible values of n & 3
152+ but GCC without VRP enabled isn't able to figure out the
153+ range of possible values is [0,3] as explained in:
154+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69230
155+ so it's false possitive with -O1 and lower. */
156+ DIAG_PUSH_NEEDS_COMMENT;
157+ DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
158 b = invsqrtpi * temp / sqrtl (x);
159+ DIAG_POP_NEEDS_COMMENT;
160 }
161 else
162 {
163diff --git a/sysdeps/ieee754/ldbl-128ibm/e_jnl.c b/sysdeps/ieee754/ldbl-128ibm/e_jnl.c
164index 71b3addfba..3226d02309 100644
165--- a/sysdeps/ieee754/ldbl-128ibm/e_jnl.c
166+++ b/sysdeps/ieee754/ldbl-128ibm/e_jnl.c
167@@ -61,6 +61,7 @@
168 #include <math.h>
169 #include <math_private.h>
170 #include <math-underflow.h>
171+#include <libc-diag.h>
172
173 static const long double
174 invsqrtpi = 5.6418958354775628694807945156077258584405E-1L,
175@@ -150,7 +151,17 @@ __ieee754_jnl (int n, long double x)
176 temp = c - s;
177 break;
178 }
179+ /* With GCC 8 (and older) when compiling with -O the compiler
180+ warns that the variable 'temp', may be used uninitialized.
181+ The switch above covers all possible values of n & 3
182+ but GCC without VRP enabled isn't able to figure out the
183+ range of possible values is [0,3] as explained in:
184+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69230
185+ so it's false possitive with -O1 and lower. */
186+ DIAG_PUSH_NEEDS_COMMENT;
187+ DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
188 b = invsqrtpi * temp / sqrtl (x);
189+ DIAG_POP_NEEDS_COMMENT;
190 }
191 else
192 {
193@@ -386,7 +397,17 @@ __ieee754_ynl (int n, long double x)
194 temp = s + c;
195 break;
196 }
197+ /* With GCC 8 (and older) when compiling with -O the compiler
198+ warns that the variable 'temp', may be used uninitialized.
199+ The switch above covers all possible values of n & 3
200+ but GCC without VRP enabled isn't able to figure out the
201+ range of possible values is [0,3] as explained in:
202+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69230
203+ so it's false possitive with -O1 and lower. */
204+ DIAG_PUSH_NEEDS_COMMENT;
205+ DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
206 b = invsqrtpi * temp / sqrtl (x);
207+ DIAG_POP_NEEDS_COMMENT;
208 }
209 else
210 {
211diff --git a/sysdeps/ieee754/ldbl-96/e_jnl.c b/sysdeps/ieee754/ldbl-96/e_jnl.c
212index 394921f564..da5c2cc93e 100644
213--- a/sysdeps/ieee754/ldbl-96/e_jnl.c
214+++ b/sysdeps/ieee754/ldbl-96/e_jnl.c
215@@ -61,6 +61,7 @@
216 #include <math.h>
217 #include <math_private.h>
218 #include <math-underflow.h>
219+#include <libc-diag.h>
220
221 static const long double
222 invsqrtpi = 5.64189583547756286948079e-1L, two = 2.0e0L, one = 1.0e0L;
223@@ -143,7 +144,17 @@ __ieee754_jnl (int n, long double x)
224 temp = c - s;
225 break;
226 }
227+ /* With GCC 8 (and older) when compiling with -O the compiler
228+ warns that the variable 'temp', may be used uninitialized.
229+ The switch above covers all possible values of n & 3
230+ but GCC without VRP enabled isn't able to figure out the
231+ range of possible values is [0,3] as explained in:
232+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69230
233+ so it's false possitive with -O1 and lower. */
234+ DIAG_PUSH_NEEDS_COMMENT;
235+ DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
236 b = invsqrtpi * temp / sqrtl (x);
237+ DIAG_POP_NEEDS_COMMENT;
238 }
239 else
240 {
241@@ -372,7 +383,17 @@ __ieee754_ynl (int n, long double x)
242 temp = s + c;
243 break;
244 }
245+ /* With GCC 8 (and older) when compiling with -O the compiler
246+ warns that the variable 'temp', may be used uninitialized.
247+ The switch above covers all possible values of n & 3
248+ but GCC without VRP enabled isn't able to figure out the
249+ range of possible values is [0,3] as explained in:
250+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69230
251+ so it's false possitive with -O1 and lower. */
252+ DIAG_PUSH_NEEDS_COMMENT;
253+ DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
254 b = invsqrtpi * temp / sqrtl (x);
255+ DIAG_POP_NEEDS_COMMENT;
256 }
257 else
258 {
diff --git a/meta/recipes-core/glibc/glibc/0032-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch b/meta/recipes-core/glibc/glibc/0032-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch
deleted file mode 100644
index 99cd2509ec..0000000000
--- a/meta/recipes-core/glibc/glibc/0032-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch
+++ /dev/null
@@ -1,100 +0,0 @@
1From 618668540e263c09b0eb28131dde7b4500158fd4 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 16 Sep 2018 12:39:22 +0000
4Subject: [PATCH] sysdeps/ieee754/soft-fp: ignore maybe-uninitialized with -O
5 [BZ #19444]
6
7* with -O, -O1, -Os it fails with:
8
9In file included from ../soft-fp/soft-fp.h:318,
10 from ../sysdeps/ieee754/soft-fp/s_fdiv.c:28:
11../sysdeps/ieee754/soft-fp/s_fdiv.c: In function '__fdiv':
12../soft-fp/op-2.h:98:25: error: 'R_f1' may be used uninitialized in this function [-Werror=maybe-uninitialized]
13 X##_f0 = (X##_f1 << (_FP_W_TYPE_SIZE - (N)) | X##_f0 >> (N) \
14 ^~
15../sysdeps/ieee754/soft-fp/s_fdiv.c:38:14: note: 'R_f1' was declared here
16 FP_DECL_D (R);
17 ^
18../soft-fp/op-2.h:37:36: note: in definition of macro '_FP_FRAC_DECL_2'
19 _FP_W_TYPE X##_f0 _FP_ZERO_INIT, X##_f1 _FP_ZERO_INIT
20 ^
21../soft-fp/double.h:95:24: note: in expansion of macro '_FP_DECL'
22 # define FP_DECL_D(X) _FP_DECL (2, X)
23 ^~~~~~~~
24../sysdeps/ieee754/soft-fp/s_fdiv.c:38:3: note: in expansion of macro 'FP_DECL_D'
25 FP_DECL_D (R);
26 ^~~~~~~~~
27../soft-fp/op-2.h:101:17: error: 'R_f0' may be used uninitialized in this function [-Werror=maybe-uninitialized]
28 : (X##_f0 << (_FP_W_TYPE_SIZE - (N))) != 0)); \
29 ^~
30../sysdeps/ieee754/soft-fp/s_fdiv.c:38:14: note: 'R_f0' was declared here
31 FP_DECL_D (R);
32 ^
33../soft-fp/op-2.h:37:14: note: in definition of macro '_FP_FRAC_DECL_2'
34 _FP_W_TYPE X##_f0 _FP_ZERO_INIT, X##_f1 _FP_ZERO_INIT
35 ^
36../soft-fp/double.h:95:24: note: in expansion of macro '_FP_DECL'
37 # define FP_DECL_D(X) _FP_DECL (2, X)
38 ^~~~~~~~
39../sysdeps/ieee754/soft-fp/s_fdiv.c:38:3: note: in expansion of macro 'FP_DECL_D'
40 FP_DECL_D (R);
41 ^~~~~~~~~
42
43Build tested with Yocto for ARM, AARCH64, X86, X86_64, PPC, MIPS, MIPS64
44with -O, -O1, -Os.
45For AARCH64 it needs one more fix in locale for -Os.
46
47 Partial fix for [BZ #23716]
48 * sysdeps/ieee754/soft-fp/s_fdiv.c: Fix build with -O
49
50Work around the issue instead of removing -O like we do with
51SELECTED_OPTIMIZATION
52
53Upstream-Status: Submitted [https://www.sourceware.org/ml/libc-alpha/2018-09/msg00300.html]
54
55Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
56---
57 ChangeLog | 4 ++++
58 sysdeps/ieee754/soft-fp/s_fdiv.c | 12 ++++++++++++
59 2 files changed, 16 insertions(+)
60
61diff --git a/ChangeLog b/ChangeLog
62index 922e916f2c..216336edc9 100644
63--- a/ChangeLog
64+++ b/ChangeLog
65@@ -1,3 +1,7 @@
66+2018-09-30 Martin Jansa <Martin.Jansa@gmail.com>
67+ Partial fix for [BZ #23716]
68+ * sysdeps/ieee754/soft-fp/s_fdiv.c: Fix build with -O.
69+
70 2018-09-29 Martin Jansa <Martin.Jansa@gmail.com>
71 Partial fix for [BZ #23716]
72 * sysdeps/ieee754/dbl-96/e_jnl.c: Fix build with -O
73diff --git a/sysdeps/ieee754/soft-fp/s_fdiv.c b/sysdeps/ieee754/soft-fp/s_fdiv.c
74index 341339f5ed..14655b77da 100644
75--- a/sysdeps/ieee754/soft-fp/s_fdiv.c
76+++ b/sysdeps/ieee754/soft-fp/s_fdiv.c
77@@ -25,6 +25,16 @@
78 #undef fdivl
79
80 #include <math-narrow.h>
81+
82+#include <libc-diag.h>
83+/* R_f[01] are not set in cases where it is not used in packing, but the
84+ compiler does not see that it is set in all cases where it is
85+ used, resulting in warnings that it may be used uninitialized.
86+ The location of the warning differs in different versions of GCC,
87+ it may be where R is defined using a macro or it may be where the
88+ macro is defined. */
89+DIAG_PUSH_NEEDS_COMMENT;
90+DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
91 #include <soft-fp.h>
92 #include <single.h>
93 #include <double.h>
94@@ -53,4 +63,6 @@ __fdiv (double x, double y)
95 CHECK_NARROW_DIV (ret, x, y);
96 return ret;
97 }
98+DIAG_POP_NEEDS_COMMENT;
99+
100 libm_alias_float_double (div)
diff --git a/meta/recipes-core/glibc/glibc_2.28.bb b/meta/recipes-core/glibc/glibc_2.29.bb
index cebd2d0c9f..362c172833 100644
--- a/meta/recipes-core/glibc/glibc_2.28.bb
+++ b/meta/recipes-core/glibc/glibc_2.29.bb
@@ -7,13 +7,24 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72 \
7 7
8DEPENDS += "gperf-native bison-native make-native" 8DEPENDS += "gperf-native bison-native make-native"
9 9
10SRCREV ?= "044c96f0d5595aeb0bb4e79355081c5a7f4faca5" 10PV = "2.29"
11
12SRCREV ?= "56c86f5dd516284558e106d04b92875d5b623b7a"
11 13
12SRCBRANCH ?= "release/${PV}/master" 14SRCBRANCH ?= "release/${PV}/master"
13 15
14GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" 16GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)" 17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.(?!90)\d+)*)"
16 18
19NATIVESDKFIXES ?= ""
20NATIVESDKFIXES_class-nativesdk = "\
21 file://0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \
22 file://0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch \
23 file://0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \
24 file://0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch \
25 file://0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch \
26"
27
17SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 28SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
18 file://etc/ld.so.conf \ 29 file://etc/ld.so.conf \
19 file://generate-supported.mk \ 30 file://generate-supported.mk \
@@ -38,26 +49,13 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
38 file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \ 49 file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \
39 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ 50 file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \
40 file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ 51 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 \ 52 file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \
42 file://0025-locale-fix-hard-coded-reference-to-gcc-E.patch \ 53 file://0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \
43 file://0026-reset-dl_load_write_lock-after-forking.patch \ 54 file://0026-reset-dl_load_write_lock-after-forking.patch \
44 file://0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch \ 55 file://0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch \
45 file://0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch \ 56 file://0028-intl-Emit-no-lines-in-bison-generated-files.patch \
46 file://0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ 57 file://0029-inject-file-assembly-directives.patch \
47 file://0030-intl-Emit-no-lines-in-bison-generated-files.patch \ 58 file://0030-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \
48 file://0031-sysdeps-ieee754-prevent-maybe-uninitialized-errors-w.patch \
49 file://0032-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch \
50 file://0033-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \
51 file://0034-inject-file-assembly-directives.patch \
52"
53
54NATIVESDKFIXES ?= ""
55NATIVESDKFIXES_class-nativesdk = "\
56 file://0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \
57 file://0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch \
58 file://0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \
59 file://0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch \
60 file://0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch \
61" 59"
62 60
63S = "${WORKDIR}/git" 61S = "${WORKDIR}/git"