summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/relocate-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/relocate-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/relocate-locales.patch')
-rw-r--r--meta/recipes-core/glibc/glibc/relocate-locales.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-core/glibc/glibc/relocate-locales.patch b/meta/recipes-core/glibc/glibc/relocate-locales.patch
deleted file mode 100644
index 2aea37f5ca..0000000000
--- a/meta/recipes-core/glibc/glibc/relocate-locales.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1The glibc locale path is hard-coded to the install prefix, but in SDKs we need
2to be able to relocate the binaries. Expand the strings to 4K and put them in a
3magic segment that we can relocate at install time.
4
5Upstream-Status: Inappropriate (OE-specific)
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8diff --git a/locale/findlocale.c b/locale/findlocale.c
9index 872cadb5..da14fa39 100644
10--- a/locale/findlocale.c
11+++ b/locale/findlocale.c
12@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden =
13 which are somehow addressed. */
14 struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST];
15
16-const char _nl_default_locale_path[] attribute_hidden = COMPLOCALEDIR;
17+char _nl_default_locale_path[4096] attribute_hidden __attribute__ ((section (".gccrelocprefix"))) = COMPLOCALEDIR;
18
19 /* Checks if the name is actually present, that is, not NULL and not
20 empty. */
21@@ -167,7 +167,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
22
23 /* Nothing in the archive. Set the default path to search below. */
24 locale_path = _nl_default_locale_path;
25- locale_path_len = sizeof _nl_default_locale_path;
26+ locale_path_len = strlen(locale_path) + 1;
27 }
28 else
29 /* We really have to load some data. First see whether the name is
30diff --git a/locale/localeinfo.h b/locale/localeinfo.h
31index 68822a63..537bc351 100644
32--- a/locale/localeinfo.h
33+++ b/locale/localeinfo.h
34@@ -325,7 +325,7 @@ _nl_lookup_word (locale_t l, int category, int item)
35 }
36
37 /* Default search path if no LOCPATH environment variable. */
38-extern const char _nl_default_locale_path[] attribute_hidden;
39+extern char _nl_default_locale_path[4096] attribute_hidden;
40
41 /* Load the locale data for CATEGORY from the file specified by *NAME.
42 If *NAME is "", use environment variables as specified by POSIX, and
43diff --git a/locale/loadarchive.c b/locale/loadarchive.c
44index 516d30d8..792b37fb 100644
45--- a/locale/loadarchive.c
46+++ b/locale/loadarchive.c
47@@ -42,7 +43,7 @@
48
49
50 /* Name of the locale archive file. */
51-static const char archfname[] = COMPLOCALEDIR "/locale-archive";
52+static const char archfname[4096] __attribute__ ((section (".gccrelocprefix"))) = COMPLOCALEDIR "/locale-archive";
53
54 /* Size of initial mapping window, optimal if large enough to
55 cover the header plus the initial locale. */