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>2019-12-20 15:40:20 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-19 13:24:38 +0000
commit2b5cf2a067cb6d9ca32d851dacdc1aff0cbfe904 (patch)
treeb19c049d43c8b2f1a2eefcc1f257eeef03a62c62 /meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
parentc7a903aaa10eadae4ec7f4af3f3fa30763c144fc (diff)
downloadpoky-2b5cf2a067cb6d9ca32d851dacdc1aff0cbfe904.tar.gz
glibc: Upgrade to 2.31
License-Update: Prefer https to http for gnu.org and fsf.org URLs [1] [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=5a82c74822d3272df2f5929133680478c0cfb4bd (From OE-Core rev: b22626d996e153d6094e1f76ed33ee1bb3eea751) 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, 0 insertions, 70 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
deleted file mode 100644
index 3aad603ada..0000000000
--- a/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Make-relocatable-install-for-locales.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 50ab0b0c116f4ae3d975ec1b15ed4595fd9147f6 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/28] 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 9af605bd64..b2b0a3f93b 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 803c1cf2a4..9023f475b8 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 7c1cc3eecb..53cb8bfc59 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.22.0
70