summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-08 10:04:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:44:33 +0100
commitfb535ac046697db5923575bb23ee419fe7cfbab2 (patch)
tree8f842469be51c8e27647d28f4f2e8d955354dd83 /meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
parent19ee0f26cbaaacebacf552878ce98149957d0ac3 (diff)
downloadpoky-fb535ac046697db5923575bb23ee419fe7cfbab2.tar.gz
glibc: Upgrade to 2.28
License-Update: libidn is dropped from glibc and a testcase that was a particular contributor copyrighted see https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=LICENSES;h=0e3a9fe39b26e97038d92f904508a4c3aa1bb43b;hp=b29efe01084af28cc40953d7317f22927c0ee3b7;hb=5a357506659f9a00fcf5bc9c5d8fc676175c89a7;hpb=7279af007c420a9d5f88a6909d11e7cb712c16a4 https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=LICENSES;h=b29efe01084af28cc40953d7317f22927c0ee3b7;hp=80f7f1487947f57815b9fe076fadc8c7f94eeb8e;hb=7f9f1ecb710eac4d65bb02785ddf288cac098323;hpb=5f7b841d3aebdccc2baed27cb4b22ddb08cd7c0c Drop upstreamed and backported patches (From OE-Core rev: da8bf414922ce7af865fadc4a86fd96ab6262506) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch')
-rw-r--r--meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch70
1 files changed, 70 insertions, 0 deletions
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
new file mode 100644
index 0000000000..56ff398753
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
@@ -0,0 +1,70 @@
1From 7195d203c6986ccdb39053933b703391ccc6854a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Aug 2018 09:55:12 -0700
4Subject: [PATCH 05/30] nativesdk-glibc: Make relocatable install for locales
5
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
8magic segment that we can relocate at install time.
9
10Upstream-Status: Inappropriate (OE-specific)
11
12Signed-off-by: Ross Burton <ross.burton@intel.com>
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 locale/findlocale.c | 4 ++--
16 locale/loadarchive.c | 2 +-
17 locale/localeinfo.h | 2 +-
18 3 files changed, 4 insertions(+), 4 deletions(-)
19
20diff --git a/locale/findlocale.c b/locale/findlocale.c
21index 872cadb5b9..dd651e07f5 100644
22--- a/locale/findlocale.c
23+++ b/locale/findlocale.c
24@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden =
25 which are somehow addressed. */
26 struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST];
27
28-const char _nl_default_locale_path[] attribute_hidden = COMPLOCALEDIR;
29+char _nl_default_locale_path[4096] attribute_hidden __attribute__ ((section (".gccrelocprefix"))) = COMPLOCALEDIR;
30
31 /* Checks if the name is actually present, that is, not NULL and not
32 empty. */
33@@ -167,7 +167,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
34
35 /* Nothing in the archive. Set the default path to search below. */
36 locale_path = _nl_default_locale_path;
37- locale_path_len = sizeof _nl_default_locale_path;
38+ locale_path_len = strlen(locale_path) + 1;
39 }
40 else
41 /* We really have to load some data. First see whether the name is
42diff --git a/locale/loadarchive.c b/locale/loadarchive.c
43index 516d30d8d1..9bfbe1a5dd 100644
44--- a/locale/loadarchive.c
45+++ b/locale/loadarchive.c
46@@ -42,7 +42,7 @@
47
48
49 /* Name of the locale archive file. */
50-static const char archfname[] = COMPLOCALEDIR "/locale-archive";
51+static const char archfname[4096] __attribute__ ((section (".gccrelocprefix"))) = COMPLOCALEDIR "/locale-archive";
52
53 /* Size of initial mapping window, optimal if large enough to
54 cover the header plus the initial locale. */
55diff --git a/locale/localeinfo.h b/locale/localeinfo.h
56index 68822a6319..537bc35149 100644
57--- a/locale/localeinfo.h
58+++ b/locale/localeinfo.h
59@@ -325,7 +325,7 @@ _nl_lookup_word (locale_t l, int category, int item)
60 }
61
62 /* Default search path if no LOCPATH environment variable. */
63-extern const char _nl_default_locale_path[] attribute_hidden;
64+extern char _nl_default_locale_path[4096] attribute_hidden;
65
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
68--
692.18.0
70