| author | "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
| Sun Apr 19 16:17:11 2009 +0000 (2009-04-19) | |
| branch | newlib |
| changeset 1365 | c4d124ed9f8e |
| permissions | -rw-r--r-- |
| yann@1365 | 1 |
Original patch from: gentoo/src/patchsets/glibc/2.9/1040_all_2.3.3-localedef-fix-trampoline.patch |
| yann@1365 | 2 |
|
| yann@1365 | 3 |
-= BEGIN original header =- |
| yann@1365 | 4 |
#! /bin/sh -e |
| yann@1365 | 5 |
|
| yann@1365 | 6 |
# DP: Description: Fix localedef segfault when run under exec-shield, |
| yann@1365 | 7 |
# PaX or similar. (#231438, #198099) |
| yann@1365 | 8 |
# DP: Dpatch Author: James Troup <james@nocrew.org> |
| yann@1365 | 9 |
# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com> |
| yann@1365 | 10 |
# DP: Upstream status: Unknown |
| yann@1365 | 11 |
# DP: Status Details: Unknown |
| yann@1365 | 12 |
# DP: Date: 2004-03-16 |
| yann@1365 | 13 |
|
| yann@1365 | 14 |
if [ $# -ne 2 ]; then |
| yann@1365 | 15 |
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" |
| yann@1365 | 16 |
exit 1 |
| yann@1365 | 17 |
fi |
| yann@1365 | 18 |
case "$1" in |
| yann@1365 | 19 |
-patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;; |
| yann@1365 | 20 |
-unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;; |
| yann@1365 | 21 |
*) |
| yann@1365 | 22 |
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" |
| yann@1365 | 23 |
exit 1 |
| yann@1365 | 24 |
esac |
| yann@1365 | 25 |
exit 0 |
| yann@1365 | 26 |
|
| yann@1365 | 27 |
-= END original header =- |
| yann@1365 | 28 |
|
| yann@1365 | 29 |
diff -durN glibc-2_9.orig/locale/programs/3level.h glibc-2_9/locale/programs/3level.h |
| yann@1365 | 30 |
--- glibc-2_9.orig/locale/programs/3level.h 2007-07-16 02:54:59.000000000 +0200 |
| yann@1365 | 31 |
+++ glibc-2_9/locale/programs/3level.h 2009-02-02 22:00:54.000000000 +0100 |
| yann@1365 | 32 |
@@ -203,6 +203,42 @@ |
| yann@1365 | 33 |
} |
| yann@1365 | 34 |
} |
| yann@1365 | 35 |
} |
| yann@1365 | 36 |
+ |
| yann@1365 | 37 |
+/* GCC ATM seems to do a poor job with pointers to nested functions passed |
| yann@1365 | 38 |
+ to inlined functions. Help it a little bit with this hack. */ |
| yann@1365 | 39 |
+#define wchead_table_iterate(tp, fn) \ |
| yann@1365 | 40 |
+do \ |
| yann@1365 | 41 |
+ { \
|
| yann@1365 | 42 |
+ struct wchead_table *t = (tp); \ |
| yann@1365 | 43 |
+ uint32_t index1; \ |
| yann@1365 | 44 |
+ for (index1 = 0; index1 < t->level1_size; index1++) \ |
| yann@1365 | 45 |
+ { \
|
| yann@1365 | 46 |
+ uint32_t lookup1 = t->level1[index1]; \ |
| yann@1365 | 47 |
+ if (lookup1 != ((uint32_t) ~0)) \ |
| yann@1365 | 48 |
+ { \
|
| yann@1365 | 49 |
+ uint32_t lookup1_shifted = lookup1 << t->q; \ |
| yann@1365 | 50 |
+ uint32_t index2; \ |
| yann@1365 | 51 |
+ for (index2 = 0; index2 < (1 << t->q); index2++) \ |
| yann@1365 | 52 |
+ { \
|
| yann@1365 | 53 |
+ uint32_t lookup2 = t->level2[index2 + lookup1_shifted]; \ |
| yann@1365 | 54 |
+ if (lookup2 != ((uint32_t) ~0)) \ |
| yann@1365 | 55 |
+ { \
|
| yann@1365 | 56 |
+ uint32_t lookup2_shifted = lookup2 << t->p; \ |
| yann@1365 | 57 |
+ uint32_t index3; \ |
| yann@1365 | 58 |
+ for (index3 = 0; index3 < (1 << t->p); index3++) \ |
| yann@1365 | 59 |
+ { \
|
| yann@1365 | 60 |
+ struct element_t *lookup3 \ |
| yann@1365 | 61 |
+ = t->level3[index3 + lookup2_shifted]; \ |
| yann@1365 | 62 |
+ if (lookup3 != NULL) \ |
| yann@1365 | 63 |
+ fn ((((index1 << t->q) + index2) << t->p) + index3, \ |
| yann@1365 | 64 |
+ lookup3); \ |
| yann@1365 | 65 |
+ } \ |
| yann@1365 | 66 |
+ } \ |
| yann@1365 | 67 |
+ } \ |
| yann@1365 | 68 |
+ } \ |
| yann@1365 | 69 |
+ } \ |
| yann@1365 | 70 |
+ } while (0) |
| yann@1365 | 71 |
+ |
| yann@1365 | 72 |
#endif |
| yann@1365 | 73 |
|
| yann@1365 | 74 |
#ifndef NO_FINALIZE |