summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-01 18:26:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-01 22:18:46 +0000
commitbcdfc5c99351f888f71c603667b0bbf5340f5a13 (patch)
tree5ee30812cb81552b86356a18295b2e153cc91a55 /meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
parent2d3e09949732ed48c8c9a328d9ab6ebbf6889b13 (diff)
downloadpoky-bcdfc5c99351f888f71c603667b0bbf5340f5a13.tar.gz
glibc: Upgrade to 2.27 release
(From OE-Core rev: 7c9faaee307585dbab569b4aa0a386658372af4e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch')
-rw-r--r--meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch90
1 files changed, 45 insertions, 45 deletions
diff --git a/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
index 2a8a20ac8d..a629ce141a 100644
--- a/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
+++ b/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
@@ -1,7 +1,7 @@
1From d97533dc201cfd863765b1a67a27fde3e2622da7 Mon Sep 17 00:00:00 2001 1From e019fe6a2b410db6043e21803f497b5cbdd90a83 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:33:49 +0000 3Date: Wed, 18 Mar 2015 01:33:49 +0000
4Subject: [PATCH 22/25] eglibc: Forward port cross locale generation support 4Subject: [PATCH 22/27] eglibc: Forward port cross locale generation support
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 create mode 100644 locale/catnames.c 23 create mode 100644 locale/catnames.c
24 24
25diff --git a/locale/Makefile b/locale/Makefile 25diff --git a/locale/Makefile b/locale/Makefile
26index 98ee76272d..bc3afb2248 100644 26index fd9972279b..176b3946de 100644
27--- a/locale/Makefile 27--- a/locale/Makefile
28+++ b/locale/Makefile 28+++ b/locale/Makefile
29@@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \ 29@@ -26,7 +26,8 @@ headers = langinfo.h locale.h bits/locale.h \
@@ -91,7 +91,7 @@ index 0000000000..9fad357db1
91+ [LC_ALL] = sizeof ("LC_ALL") - 1 91+ [LC_ALL] = sizeof ("LC_ALL") - 1
92+ }; 92+ };
93diff --git a/locale/localeinfo.h b/locale/localeinfo.h 93diff --git a/locale/localeinfo.h b/locale/localeinfo.h
94index 4e1c8c568a..f7ed946f1c 100644 94index 68822a6319..fa36123776 100644
95--- a/locale/localeinfo.h 95--- a/locale/localeinfo.h
96+++ b/locale/localeinfo.h 96+++ b/locale/localeinfo.h
97@@ -224,7 +224,7 @@ __libc_tsd_define (extern, locale_t, LOCALE) 97@@ -224,7 +224,7 @@ __libc_tsd_define (extern, locale_t, LOCALE)
@@ -104,11 +104,11 @@ index 4e1c8c568a..f7ed946f1c 100644
104 # define NL_CURRENT_INDIRECT 1 104 # define NL_CURRENT_INDIRECT 1
105 #endif 105 #endif
106diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c 106diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c
107index e55ab86e28..0f87e6dd28 100644 107index 34a8d32c92..cbb9436cd1 100644
108--- a/locale/programs/charmap-dir.c 108--- a/locale/programs/charmap-dir.c
109+++ b/locale/programs/charmap-dir.c 109+++ b/locale/programs/charmap-dir.c
110@@ -19,7 +19,9 @@ 110@@ -18,7 +18,9 @@
111 #include <error.h> 111 #include <errno.h>
112 #include <fcntl.h> 112 #include <fcntl.h>
113 #include <libintl.h> 113 #include <libintl.h>
114+#ifndef NO_UNCOMPRESS 114+#ifndef NO_UNCOMPRESS
@@ -117,7 +117,7 @@ index e55ab86e28..0f87e6dd28 100644
117 #include <stdio.h> 117 #include <stdio.h>
118 #include <stdlib.h> 118 #include <stdlib.h>
119 #include <string.h> 119 #include <string.h>
120@@ -156,6 +158,7 @@ charmap_closedir (CHARMAP_DIR *cdir) 120@@ -154,6 +156,7 @@ charmap_closedir (CHARMAP_DIR *cdir)
121 return closedir (dir); 121 return closedir (dir);
122 } 122 }
123 123
@@ -125,7 +125,7 @@ index e55ab86e28..0f87e6dd28 100644
125 /* Creates a subprocess decompressing the given pathname, and returns 125 /* Creates a subprocess decompressing the given pathname, and returns
126 a stream reading its output (the decompressed data). */ 126 a stream reading its output (the decompressed data). */
127 static 127 static
128@@ -204,6 +207,7 @@ fopen_uncompressed (const char *pathname, const char *compressor) 128@@ -202,6 +205,7 @@ fopen_uncompressed (const char *pathname, const char *compressor)
129 } 129 }
130 return NULL; 130 return NULL;
131 } 131 }
@@ -133,7 +133,7 @@ index e55ab86e28..0f87e6dd28 100644
133 133
134 /* Opens a charmap for reading, given its name (not an alias name). */ 134 /* Opens a charmap for reading, given its name (not an alias name). */
135 FILE * 135 FILE *
136@@ -226,6 +230,7 @@ charmap_open (const char *directory, const char *name) 136@@ -224,6 +228,7 @@ charmap_open (const char *directory, const char *name)
137 if (stream != NULL) 137 if (stream != NULL)
138 return stream; 138 return stream;
139 139
@@ -141,7 +141,7 @@ index e55ab86e28..0f87e6dd28 100644
141 memcpy (p, ".gz", 4); 141 memcpy (p, ".gz", 4);
142 stream = fopen_uncompressed (pathname, "gzip"); 142 stream = fopen_uncompressed (pathname, "gzip");
143 if (stream != NULL) 143 if (stream != NULL)
144@@ -235,6 +240,7 @@ charmap_open (const char *directory, const char *name) 144@@ -233,6 +238,7 @@ charmap_open (const char *directory, const char *name)
145 stream = fopen_uncompressed (pathname, "bzip2"); 145 stream = fopen_uncompressed (pathname, "bzip2");
146 if (stream != NULL) 146 if (stream != NULL)
147 return stream; 147 return stream;
@@ -150,10 +150,10 @@ index e55ab86e28..0f87e6dd28 100644
150 return NULL; 150 return NULL;
151 } 151 }
152diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c 152diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
153index cec848cb7c..fcd768eb7d 100644 153index d2eebcfdbb..c3718d6589 100644
154--- a/locale/programs/ld-collate.c 154--- a/locale/programs/ld-collate.c
155+++ b/locale/programs/ld-collate.c 155+++ b/locale/programs/ld-collate.c
156@@ -350,7 +350,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen, 156@@ -349,7 +349,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen,
157 } 157 }
158 if (wcs != NULL) 158 if (wcs != NULL)
159 { 159 {
@@ -162,7 +162,7 @@ index cec848cb7c..fcd768eb7d 100644
162 uint32_t zero = 0; 162 uint32_t zero = 0;
163 /* Handle <U0000> as a single character. */ 163 /* Handle <U0000> as a single character. */
164 if (nwcs == 0) 164 if (nwcs == 0)
165@@ -1776,8 +1776,7 @@ symbol `%s' has the same encoding as"), (*eptr)->name); 165@@ -1772,8 +1772,7 @@ symbol `%s' has the same encoding as"), (*eptr)->name);
166 166
167 if ((*eptr)->nwcs == runp->nwcs) 167 if ((*eptr)->nwcs == runp->nwcs)
168 { 168 {
@@ -172,7 +172,7 @@ index cec848cb7c..fcd768eb7d 100644
172 172
173 if (c == 0) 173 if (c == 0)
174 { 174 {
175@@ -2010,9 +2009,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp) 175@@ -2000,9 +1999,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp)
176 one consecutive entry. */ 176 one consecutive entry. */
177 if (runp->wcnext != NULL 177 if (runp->wcnext != NULL
178 && runp->nwcs == runp->wcnext->nwcs 178 && runp->nwcs == runp->wcnext->nwcs
@@ -185,7 +185,7 @@ index cec848cb7c..fcd768eb7d 100644
185 && (runp->wcs[runp->nwcs - 1] 185 && (runp->wcs[runp->nwcs - 1]
186 == runp->wcnext->wcs[runp->nwcs - 1] + 1)) 186 == runp->wcnext->wcs[runp->nwcs - 1] + 1))
187 { 187 {
188@@ -2036,9 +2035,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp) 188@@ -2026,9 +2025,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp)
189 runp = runp->wcnext; 189 runp = runp->wcnext;
190 while (runp->wcnext != NULL 190 while (runp->wcnext != NULL
191 && runp->nwcs == runp->wcnext->nwcs 191 && runp->nwcs == runp->wcnext->nwcs
@@ -199,10 +199,10 @@ index cec848cb7c..fcd768eb7d 100644
199 == runp->wcnext->wcs[runp->nwcs - 1] + 1)); 199 == runp->wcnext->wcs[runp->nwcs - 1] + 1));
200 200
201diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c 201diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
202index df266c20d6..05c0152ec9 100644 202index f791e6b7e9..d809d6db7f 100644
203--- a/locale/programs/ld-ctype.c 203--- a/locale/programs/ld-ctype.c
204+++ b/locale/programs/ld-ctype.c 204+++ b/locale/programs/ld-ctype.c
205@@ -926,7 +926,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap, 205@@ -915,7 +915,7 @@ ctype_output (struct localedef_t *locale, const struct charmap_t *charmap,
206 allocate_arrays (ctype, charmap, ctype->repertoire); 206 allocate_arrays (ctype, charmap, ctype->repertoire);
207 207
208 default_missing_len = (ctype->default_missing 208 default_missing_len = (ctype->default_missing
@@ -211,7 +211,7 @@ index df266c20d6..05c0152ec9 100644
211 : 0); 211 : 0);
212 212
213 init_locale_data (&file, nelems); 213 init_locale_data (&file, nelems);
214@@ -1937,7 +1937,7 @@ read_translit_entry (struct linereader *ldfile, struct locale_ctype_t *ctype, 214@@ -1926,7 +1926,7 @@ read_translit_entry (struct linereader *ldfile, struct locale_ctype_t *ctype,
215 ignore = 1; 215 ignore = 1;
216 else 216 else
217 /* This value is usable. */ 217 /* This value is usable. */
@@ -220,7 +220,7 @@ index df266c20d6..05c0152ec9 100644
220 220
221 first = 0; 221 first = 0;
222 } 222 }
223@@ -2471,8 +2471,8 @@ with character code range values one must use the absolute ellipsis `...'")); 223@@ -2460,8 +2460,8 @@ with character code range values one must use the absolute ellipsis `...'"));
224 } 224 }
225 225
226 handle_tok_digit: 226 handle_tok_digit:
@@ -231,7 +231,7 @@ index df266c20d6..05c0152ec9 100644
231 handle_digits = 1; 231 handle_digits = 1;
232 goto read_charclass; 232 goto read_charclass;
233 233
234@@ -3929,8 +3929,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, 234@@ -3901,8 +3901,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
235 235
236 while (idx < number) 236 while (idx < number)
237 { 237 {
@@ -241,7 +241,7 @@ index df266c20d6..05c0152ec9 100644
241 if (res == 0) 241 if (res == 0)
242 { 242 {
243 replace = 1; 243 replace = 1;
244@@ -3967,11 +3966,11 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, 244@@ -3939,11 +3938,11 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
245 for (size_t cnt = 0; cnt < number; ++cnt) 245 for (size_t cnt = 0; cnt < number; ++cnt)
246 { 246 {
247 struct translit_to_t *srunp; 247 struct translit_to_t *srunp;
@@ -255,7 +255,7 @@ index df266c20d6..05c0152ec9 100644
255 srunp = srunp->next; 255 srunp = srunp->next;
256 } 256 }
257 /* Plus one for the extra NUL character marking the end of 257 /* Plus one for the extra NUL character marking the end of
258@@ -3995,18 +3994,18 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, 258@@ -3967,18 +3966,18 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
259 ctype->translit_from_idx[cnt] = from_len; 259 ctype->translit_from_idx[cnt] = from_len;
260 ctype->translit_to_idx[cnt] = to_len; 260 ctype->translit_to_idx[cnt] = to_len;
261 261
@@ -281,10 +281,10 @@ index df266c20d6..05c0152ec9 100644
281 srunp = srunp->next; 281 srunp = srunp->next;
282 } 282 }
283diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c 283diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
284index 32e9c41e35..6a61fcedeb 100644 284index a755792363..e8b2f85522 100644
285--- a/locale/programs/ld-time.c 285--- a/locale/programs/ld-time.c
286+++ b/locale/programs/ld-time.c 286+++ b/locale/programs/ld-time.c
287@@ -215,8 +215,10 @@ No definition for %s category found"), "LC_TIME")); 287@@ -220,8 +220,10 @@ No definition for %s category found"), "LC_TIME");
288 } 288 }
289 else 289 else
290 { 290 {
@@ -296,7 +296,7 @@ index 32e9c41e35..6a61fcedeb 100644
296 } 296 }
297 } 297 }
298 298
299@@ -226,7 +228,7 @@ No definition for %s category found"), "LC_TIME")); 299@@ -231,7 +233,7 @@ No definition for %s category found"), "LC_TIME");
300 const int days_per_month[12] = { 31, 29, 31, 30, 31, 30, 300 const int days_per_month[12] = { 31, 29, 31, 30, 31, 30,
301 31, 31, 30, 31 ,30, 31 }; 301 31, 31, 30, 31 ,30, 31 };
302 size_t idx; 302 size_t idx;
@@ -305,7 +305,7 @@ index 32e9c41e35..6a61fcedeb 100644
305 305
306 time->era_entries = 306 time->era_entries =
307 (struct era_data *) xmalloc (time->num_era 307 (struct era_data *) xmalloc (time->num_era
308@@ -464,18 +466,18 @@ No definition for %s category found"), "LC_TIME")); 308@@ -457,18 +459,18 @@ No definition for %s category found"), "LC_TIME");
309 } 309 }
310 310
311 /* Now generate the wide character name and format. */ 311 /* Now generate the wide character name and format. */
@@ -331,7 +331,7 @@ index 32e9c41e35..6a61fcedeb 100644
331 } 331 }
332 else 332 else
333 time->era_entries[idx].wname = 333 time->era_entries[idx].wname =
334@@ -534,7 +536,16 @@ No definition for %s category found"), "LC_TIME")); 334@@ -527,7 +529,16 @@ No definition for %s category found"), "LC_TIME");
335 if (time->date_fmt == NULL) 335 if (time->date_fmt == NULL)
336 time->date_fmt = "%a %b %e %H:%M:%S %Z %Y"; 336 time->date_fmt = "%a %b %e %H:%M:%S %Z %Y";
337 if (time->wdate_fmt == NULL) 337 if (time->wdate_fmt == NULL)
@@ -350,7 +350,7 @@ index 32e9c41e35..6a61fcedeb 100644
350 350
351 351
352diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c 352diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
353index 52b340963a..1a8bce17b4 100644 353index 3525c8a43d..f8a7fd9c24 100644
354--- a/locale/programs/linereader.c 354--- a/locale/programs/linereader.c
355+++ b/locale/programs/linereader.c 355+++ b/locale/programs/linereader.c
356@@ -595,7 +595,7 @@ get_string (struct linereader *lr, const struct charmap_t *charmap, 356@@ -595,7 +595,7 @@ get_string (struct linereader *lr, const struct charmap_t *charmap,
@@ -363,18 +363,18 @@ index 52b340963a..1a8bce17b4 100644
363 size_t bufmax = 56; 363 size_t bufmax = 56;
364 364
365diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c 365diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
366index 6acc1342c7..df87740f8b 100644 366index d718d2e9f4..e0a3ad5a83 100644
367--- a/locale/programs/localedef.c 367--- a/locale/programs/localedef.c
368+++ b/locale/programs/localedef.c 368+++ b/locale/programs/localedef.c
369@@ -108,6 +108,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; 369@@ -105,6 +105,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
370 #define OPT_LIST_ARCHIVE 309
371 #define OPT_LITTLE_ENDIAN 400
372 #define OPT_BIG_ENDIAN 401 370 #define OPT_BIG_ENDIAN 401
373+#define OPT_UINT32_ALIGN 402 371 #define OPT_NO_WARN 402
372 #define OPT_WARN 403
373+#define OPT_UINT32_ALIGN 404
374 374
375 /* Definitions of arguments for argp functions. */ 375 /* Definitions of arguments for argp functions. */
376 static const struct argp_option options[] = 376 static const struct argp_option options[] =
377@@ -143,6 +144,8 @@ static const struct argp_option options[] = 377@@ -147,6 +148,8 @@ static const struct argp_option options[] =
378 N_("Generate little-endian output") }, 378 N_("Generate little-endian output") },
379 { "big-endian", OPT_BIG_ENDIAN, NULL, 0, 379 { "big-endian", OPT_BIG_ENDIAN, NULL, 0,
380 N_("Generate big-endian output") }, 380 N_("Generate big-endian output") },
@@ -383,7 +383,7 @@ index 6acc1342c7..df87740f8b 100644
383 { NULL, 0, NULL, 0, NULL } 383 { NULL, 0, NULL, 0, NULL }
384 }; 384 };
385 385
386@@ -232,12 +235,14 @@ main (int argc, char *argv[]) 386@@ -236,12 +239,14 @@ main (int argc, char *argv[])
387 ctype locale. (P1003.2 4.35.5.2) */ 387 ctype locale. (P1003.2 4.35.5.2) */
388 setlocale (LC_CTYPE, "POSIX"); 388 setlocale (LC_CTYPE, "POSIX");
389 389
@@ -392,15 +392,15 @@ index 6acc1342c7..df87740f8b 100644
392 defines error code 3 for this situation so I think it must be 392 defines error code 3 for this situation so I think it must be
393 a fatal error (see P1003.2 4.35.8). */ 393 a fatal error (see P1003.2 4.35.8). */
394 if (sysconf (_SC_2_LOCALEDEF) < 0) 394 if (sysconf (_SC_2_LOCALEDEF) < 0)
395 WITH_CUR_LOCALE (error (3, 0, _("\ 395 record_error (3, 0, _("\
396 FATAL: system does not define `_POSIX2_LOCALEDEF'"))); 396 FATAL: system does not define `_POSIX2_LOCALEDEF'"));
397+#endif 397+#endif
398 398
399 /* Process charmap file. */ 399 /* Process charmap file. */
400 charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1); 400 charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1);
401@@ -328,6 +333,9 @@ parse_opt (int key, char *arg, struct argp_state *state) 401@@ -389,6 +394,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
402 case OPT_BIG_ENDIAN: 402 /* Enable the warnings. */
403 set_big_endian (true); 403 set_warnings (arg, true);
404 break; 404 break;
405+ case OPT_UINT32_ALIGN: 405+ case OPT_UINT32_ALIGN:
406+ uint32_align_mask = strtol (arg, NULL, 0) - 1; 406+ uint32_align_mask = strtol (arg, NULL, 0) - 1;
@@ -409,7 +409,7 @@ index 6acc1342c7..df87740f8b 100644
409 force_output = 1; 409 force_output = 1;
410 break; 410 break;
411diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c 411diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
412index 0990ef11be..683422c908 100644 412index 32e5f761f2..b41e77bd8d 100644
413--- a/locale/programs/locfile.c 413--- a/locale/programs/locfile.c
414+++ b/locale/programs/locfile.c 414+++ b/locale/programs/locfile.c
415@@ -544,6 +544,9 @@ compare_files (const char *filename1, const char *filename2, size_t size, 415@@ -544,6 +544,9 @@ compare_files (const char *filename1, const char *filename2, size_t size,
@@ -432,7 +432,7 @@ index 0990ef11be..683422c908 100644
432 432
433 /* Record that FILE's next element is the 32-bit integer VALUE. */ 433 /* Record that FILE's next element is the 32-bit integer VALUE. */
434diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h 434diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h
435index 3407e13c13..0bb556caf8 100644 435index 89b347c72d..a636fc2960 100644
436--- a/locale/programs/locfile.h 436--- a/locale/programs/locfile.h
437+++ b/locale/programs/locfile.h 437+++ b/locale/programs/locfile.h
438@@ -71,6 +71,8 @@ extern void write_all_categories (struct localedef_t *definitions, 438@@ -71,6 +71,8 @@ extern void write_all_categories (struct localedef_t *definitions,
@@ -521,7 +521,7 @@ index 3407e13c13..0bb556caf8 100644
521+ 521+
522 #endif /* locfile.h */ 522 #endif /* locfile.h */
523diff --git a/locale/setlocale.c b/locale/setlocale.c 523diff --git a/locale/setlocale.c b/locale/setlocale.c
524index 19acc4b2c7..c89d3b87ad 100644 524index e4de907e1f..b5d8f5c17d 100644
525--- a/locale/setlocale.c 525--- a/locale/setlocale.c
526+++ b/locale/setlocale.c 526+++ b/locale/setlocale.c
527@@ -64,36 +64,6 @@ static char *const _nl_current_used[] = 527@@ -64,36 +64,6 @@ static char *const _nl_current_used[] =
@@ -562,5 +562,5 @@ index 19acc4b2c7..c89d3b87ad 100644
562 # define WEAK_POSTLOAD(postload) weak_extern (postload) 562 # define WEAK_POSTLOAD(postload) weak_extern (postload)
563 #else 563 #else
564-- 564--
5652.13.2 5652.16.1
566 566