summaryrefslogtreecommitdiff
path: root/packages/glibc/2.14/170-localedef-fix-trampoline.patch
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-08-26 23:29:58 (GMT)
committerGitHub <noreply@github.com>2017-08-26 23:29:58 (GMT)
commitf627e740ffd38a02ccb43848d875a4d36cf91d9c (patch)
tree89278e74a7b37674bb2b340f6cc040d3c288659b /packages/glibc/2.14/170-localedef-fix-trampoline.patch
parent5494335c03d096b33e6d82aa2aaad2c51b5c3a37 (diff)
parenteba1a826862d875e6163315029839fd3de192c8b (diff)
Merge pull request #814 from stilor/issue-802
Issue 802
Diffstat (limited to 'packages/glibc/2.14/170-localedef-fix-trampoline.patch')
-rw-r--r--packages/glibc/2.14/170-localedef-fix-trampoline.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/packages/glibc/2.14/170-localedef-fix-trampoline.patch b/packages/glibc/2.14/170-localedef-fix-trampoline.patch
deleted file mode 100644
index 3cc6559..0000000
--- a/packages/glibc/2.14/170-localedef-fix-trampoline.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-# DP: Description: Fix localedef segfault when run under exec-shield,
-# PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@nocrew.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h 2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h 2009-11-13 00:49:56.000000000 +0100
-@@ -203,6 +203,42 @@
- }
- }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+ to inlined functions. Help it a little bit with this hack. */
-+#define wchead_table_iterate(tp, fn) \
-+do \
-+ { \
-+ struct wchead_table *t = (tp); \
-+ uint32_t index1; \
-+ for (index1 = 0; index1 < t->level1_size; index1++) \
-+ { \
-+ uint32_t lookup1 = t->level1[index1]; \
-+ if (lookup1 != ((uint32_t) ~0)) \
-+ { \
-+ uint32_t lookup1_shifted = lookup1 << t->q; \
-+ uint32_t index2; \
-+ for (index2 = 0; index2 < (1 << t->q); index2++) \
-+ { \
-+ uint32_t lookup2 = t->level2[index2 + lookup1_shifted]; \
-+ if (lookup2 != ((uint32_t) ~0)) \
-+ { \
-+ uint32_t lookup2_shifted = lookup2 << t->p; \
-+ uint32_t index3; \
-+ for (index3 = 0; index3 < (1 << t->p); index3++) \
-+ { \
-+ struct element_t *lookup3 \
-+ = t->level3[index3 + lookup2_shifted]; \
-+ if (lookup3 != NULL) \
-+ fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+ lookup3); \
-+ } \
-+ } \
-+ } \
-+ } \
-+ } \
-+ } while (0)
-+
- #endif
-
- #ifndef NO_FINALIZE