diff options
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.patch | 45 |
1 files changed, 24 insertions, 21 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 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 @@ | |||
1 | From 4bb23fbb07984b93fd14f353fd9325d927b0cd98 Mon Sep 17 00:00:00 2001 | 1 | From 1ae15f60a84f16187e06a05906f44a6658bae487 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 18 Mar 2015 01:33:49 +0000 | 3 | Date: Wed, 18 Mar 2015 01:33:49 +0000 |
4 | Subject: [PATCH] eglibc: Forward port cross locale generation support | 4 | Subject: [PATCH 22/30] eglibc: Forward port cross locale generation support |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-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 | ||
25 | diff --git a/locale/Makefile b/locale/Makefile | 25 | diff --git a/locale/Makefile b/locale/Makefile |
26 | index fd9972279b..176b3946de 100644 | 26 | index 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 | + }; |
93 | diff --git a/locale/localeinfo.h b/locale/localeinfo.h | 93 | diff --git a/locale/localeinfo.h b/locale/localeinfo.h |
94 | index 537bc35149..73ba20d695 100644 | 94 | index 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 |
106 | diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c | 106 | diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c |
107 | index 34a8d32c92..cbb9436cd1 100644 | 107 | index 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 | } |
152 | diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c | 152 | diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c |
153 | index d2eebcfdbb..c3718d6589 100644 | 153 | index 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 | ||
201 | diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c | 201 | diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c |
202 | index f791e6b7e9..d809d6db7f 100644 | 202 | index 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 | } |
283 | diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c | 283 | diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c |
284 | index a755792363..e8b2f85522 100644 | 284 | index 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 | ||
352 | diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c | 352 | diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c |
353 | index 3525c8a43d..f8a7fd9c24 100644 | 353 | index 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 | ||
365 | diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c | 365 | diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c |
366 | index d718d2e9f4..e0a3ad5a83 100644 | 366 | index 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; |
411 | diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c | 411 | diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c |
412 | index 32e5f761f2..b41e77bd8d 100644 | 412 | index 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. */ |
434 | diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h | 434 | diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h |
435 | index 89b347c72d..a636fc2960 100644 | 435 | index 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 */ |
523 | diff --git a/locale/setlocale.c b/locale/setlocale.c | 523 | diff --git a/locale/setlocale.c b/locale/setlocale.c |
524 | index e4de907e1f..b5d8f5c17d 100644 | 524 | index 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 | -- | ||
565 | 2.20.1 | ||
566 | |||