diff options
| -rw-r--r-- | patches/glibc-2.16.0/0003-i386-x86_64-revert-clone-cfi.patch | 58 | ||||
| -rw-r--r-- | patches/glibc-2.16.0/0004-queue-header-updates.patch | 92 | ||||
| -rw-r--r-- | patches/glibc-2.16.0/0007-section-comments.patch | 34 | ||||
| -rw-r--r-- | patches/glibc-2.16.0/0008-fpscr-values.patch | 42 | ||||
| -rw-r--r-- | patches/glibc-2.16.0/0100-Fix-localedef-segfault-when-run-under-exec-shield-Pa.patch (renamed from patches/glibc-2.16.0/0005-localedef-fix-trampoline.patch) | 28 | ||||
| -rw-r--r-- | patches/glibc-2.16.0/0200-resolv-dynamic.patch (renamed from patches/glibc-2.16.0/0006-resolv-dynamic.patch) | 0 | ||||
| -rw-r--r-- | patches/glibc-2.16.0/0300-optimized-string-functions-for-NEON-from-Linaro.patch (renamed from patches/glibc-2.16.0/0009-optimized-string-functions-for-NEON-from-Linaro.patch) | 0 | ||||
| -rw-r--r-- | patches/glibc-2.16.0/0301-add-libc_hidden_builtin_def-for-all-cortex-functions.patch (renamed from patches/glibc-2.16.0/0010-add-libc_hidden_builtin_def-for-all-cortex-functions.patch) | 0 | ||||
| -rw-r--r-- | patches/glibc-2.16.0/series | 18 |
9 files changed, 23 insertions, 249 deletions
diff --git a/patches/glibc-2.16.0/0003-i386-x86_64-revert-clone-cfi.patch b/patches/glibc-2.16.0/0003-i386-x86_64-revert-clone-cfi.patch deleted file mode 100644 index 0477106..0000000 --- a/patches/glibc-2.16.0/0003-i386-x86_64-revert-clone-cfi.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: unknown author <unknown.author@example.com> -Date: Tue, 1 Nov 2011 18:58:26 +0100 -Subject: [PATCH] i386/x86_64 revert clone cfi - -revert cfi additions to clone on i386/x86_64 to workaround problems in -gcc's unwinder code. this is not a bug in glibc, it triggers problems -elsewhere. this cfi code does not gain us a whole lot anyways. - -http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html ---- - sysdeps/unix/sysv/linux/i386/clone.S | 4 ---- - sysdeps/unix/sysv/linux/x86_64/clone.S | 4 ---- - 2 files changed, 8 deletions(-) - -diff --git a/sysdeps/unix/sysv/linux/i386/clone.S b/sysdeps/unix/sysv/linux/i386/clone.S -index 0603218..82c6536 100644 ---- a/sysdeps/unix/sysv/linux/i386/clone.S -+++ b/sysdeps/unix/sysv/linux/i386/clone.S -@@ -119,9 +119,6 @@ L(pseudo_end): - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -154,7 +151,6 @@ L(nomoregetpid): - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff --git a/sysdeps/unix/sysv/linux/x86_64/clone.S b/sysdeps/unix/sysv/linux/x86_64/clone.S -index 6bcb542..656b389 100644 ---- a/sysdeps/unix/sysv/linux/x86_64/clone.S -+++ b/sysdeps/unix/sysv/linux/x86_64/clone.S -@@ -88,9 +88,6 @@ L(pseudo_end): - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -115,7 +112,6 @@ L(thread_start): - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/patches/glibc-2.16.0/0004-queue-header-updates.patch b/patches/glibc-2.16.0/0004-queue-header-updates.patch deleted file mode 100644 index a542ef3..0000000 --- a/patches/glibc-2.16.0/0004-queue-header-updates.patch +++ /dev/null @@ -1,92 +0,0 @@ -From: unknown author <unknown.author@example.com> -Date: Tue, 1 Nov 2011 18:58:26 +0100 -Subject: [PATCH] queue header updates - -grab some updates from FreeBSD - -http://bugs.gentoo.org/201979 ---- - misc/sys/queue.h | 37 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 37 insertions(+) - -diff --git a/misc/sys/queue.h b/misc/sys/queue.h -index daf4553..f2678ba 100644 ---- a/misc/sys/queue.h -+++ b/misc/sys/queue.h -@@ -136,6 +136,11 @@ struct { \ - (var); \ - (var) = ((var)->field.le_next)) - -+#define LIST_FOREACH_SAFE(var, head, field, tvar) \ -+ for ((var) = LIST_FIRST((head)); \ -+ (var) && ((tvar) = LIST_NEXT((var), field), 1); \ -+ (var) = (tvar)) -+ - /* - * List access methods. - */ -@@ -197,6 +202,16 @@ struct { \ - #define SLIST_FOREACH(var, head, field) \ - for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next) - -+#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ -+ for ((var) = SLIST_FIRST((head)); \ -+ (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ -+ (var) = (tvar)) -+ -+#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \ -+ for ((varp) = &SLIST_FIRST((head)); \ -+ ((var) = *(varp)) != NULL; \ -+ (varp) = &SLIST_NEXT((var), field)) -+ - /* - * Singly-linked List access methods. - */ -@@ -242,6 +257,12 @@ struct { \ - (head)->stqh_last = &(elm)->field.stqe_next; \ - } while (/*CONSTCOND*/0) - -+#define STAILQ_LAST(head, type, field) \ -+ (STAILQ_EMPTY((head)) ? \ -+ NULL : \ -+ ((struct type *)(void *) \ -+ ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) -+ - #define STAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ - if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\ - (head)->stqh_last = &(elm)->field.stqe_next; \ -@@ -286,6 +307,11 @@ struct { \ - #define STAILQ_FIRST(head) ((head)->stqh_first) - #define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) - -+#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ -+ for ((var) = STAILQ_FIRST((head)); \ -+ (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ -+ (var) = (tvar)) -+ - - /* - * Simple queue definitions. -@@ -437,11 +463,22 @@ struct { \ - (var); \ - (var) = ((var)->field.tqe_next)) - -+#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ -+ for ((var) = TAILQ_FIRST((head)); \ -+ (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ -+ (var) = (tvar)) -+ - #define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ - for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last)); \ - (var); \ - (var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last))) - -+#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \ -+ for ((var) = TAILQ_LAST((head), headname); \ -+ (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \ -+ (var) = (tvar)) -+ -+ - #define TAILQ_CONCAT(head1, head2, field) do { \ - if (!TAILQ_EMPTY(head2)) { \ - *(head1)->tqh_last = (head2)->tqh_first; \ diff --git a/patches/glibc-2.16.0/0007-section-comments.patch b/patches/glibc-2.16.0/0007-section-comments.patch deleted file mode 100644 index cad6f24..0000000 --- a/patches/glibc-2.16.0/0007-section-comments.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: unknown author <unknown.author@example.com> -Date: Tue, 1 Nov 2011 18:58:26 +0100 -Subject: [PATCH] section comments - -http://sources.redhat.com/ml/binutils/2004-04/msg00665.html - -fixes building on some architectures (like m68k/arm/cris/etc...) because -it does the right thing - -This patch was taken from gentoo. ---- - include/libc-symbols.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 12b3639..40dde1d 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -205,12 +205,12 @@ - # define __make_section_unallocated(section_string) - #endif - --/* Tacking on "\n\t#" to the section name makes gcc put it's bogus -+/* Tacking on "\n#APP\n\t#" to the section name makes gcc put it's bogus - section attributes on what looks like a comment to the assembler. */ - #ifdef HAVE_SECTION_QUOTES --# define __sec_comment "\"\n\t#\"" -+# define __sec_comment "\"\n#APP\n\t#\"" - #else --# define __sec_comment "\n\t#" -+# define __sec_comment "\n#APP\n\t#" - #endif - #define link_warning(symbol, msg) \ - __make_section_unallocated (".gnu.warning." #symbol) \ diff --git a/patches/glibc-2.16.0/0008-fpscr-values.patch b/patches/glibc-2.16.0/0008-fpscr-values.patch deleted file mode 100644 index 50ec4d4..0000000 --- a/patches/glibc-2.16.0/0008-fpscr-values.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: unknown author <unknown.author@example.com> -Date: Tue, 1 Nov 2011 18:58:26 +0100 -Subject: [PATCH] fpscr values - -http://rpm.sh-linux.org/rpm-2004/target/SRPMS/glibc-2.3.3-27.12.src.rpm - -http://bugs.gentoo.org/100696 ---- - sysdeps/unix/sysv/linux/sh/Versions | 1 + - sysdeps/unix/sysv/linux/sh/sysdep.S | 10 ++++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/sysdeps/unix/sysv/linux/sh/Versions b/sysdeps/unix/sysv/linux/sh/Versions -index e0938c4..ca1d7da 100644 ---- a/sysdeps/unix/sysv/linux/sh/Versions -+++ b/sysdeps/unix/sysv/linux/sh/Versions -@@ -2,6 +2,7 @@ libc { - GLIBC_2.2 { - # functions used in other libraries - __xstat64; __fxstat64; __lxstat64; -+ __fpscr_values; - - # a* - alphasort64; -diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.S b/sysdeps/unix/sysv/linux/sh/sysdep.S -index ba80b14..91e9008 100644 ---- a/sysdeps/unix/sysv/linux/sh/sysdep.S -+++ b/sysdeps/unix/sysv/linux/sh/sysdep.S -@@ -31,3 +31,13 @@ ENTRY (__syscall_error) - - #define __syscall_error __syscall_error_1 - #include <sysdeps/unix/sh/sysdep.S> -+ -+ .data -+ .align 3 -+ .globl ___fpscr_values -+ .type ___fpscr_values, @object -+ .size ___fpscr_values, 8 -+___fpscr_values: -+ .long 0 -+ .long 0x80000 -+weak_alias (___fpscr_values, __fpscr_values) diff --git a/patches/glibc-2.16.0/0005-localedef-fix-trampoline.patch b/patches/glibc-2.16.0/0100-Fix-localedef-segfault-when-run-under-exec-shield-Pa.patch index 55d8c0d..02865b3 100644 --- a/patches/glibc-2.16.0/0005-localedef-fix-trampoline.patch +++ b/patches/glibc-2.16.0/0100-Fix-localedef-segfault-when-run-under-exec-shield-Pa.patch @@ -1,19 +1,19 @@ -From: unknown author <unknown.author@example.com> +From: Jakub Jelinek <jakub@redhat.com> Date: Tue, 1 Nov 2011 18:58:26 +0100 -Subject: [PATCH] localedef fix trampoline +Subject: [PATCH] Fix localedef segfault when run under exec-shield, PaX or + similar -if [ $# -ne 2 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 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 + +Taken from Debian. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- locale/programs/3level.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/patches/glibc-2.16.0/0006-resolv-dynamic.patch b/patches/glibc-2.16.0/0200-resolv-dynamic.patch index 076ea83..076ea83 100644 --- a/patches/glibc-2.16.0/0006-resolv-dynamic.patch +++ b/patches/glibc-2.16.0/0200-resolv-dynamic.patch diff --git a/patches/glibc-2.16.0/0009-optimized-string-functions-for-NEON-from-Linaro.patch b/patches/glibc-2.16.0/0300-optimized-string-functions-for-NEON-from-Linaro.patch index ef7dc02..ef7dc02 100644 --- a/patches/glibc-2.16.0/0009-optimized-string-functions-for-NEON-from-Linaro.patch +++ b/patches/glibc-2.16.0/0300-optimized-string-functions-for-NEON-from-Linaro.patch diff --git a/patches/glibc-2.16.0/0010-add-libc_hidden_builtin_def-for-all-cortex-functions.patch b/patches/glibc-2.16.0/0301-add-libc_hidden_builtin_def-for-all-cortex-functions.patch index be6993d..be6993d 100644 --- a/patches/glibc-2.16.0/0010-add-libc_hidden_builtin_def-for-all-cortex-functions.patch +++ b/patches/glibc-2.16.0/0301-add-libc_hidden_builtin_def-for-all-cortex-functions.patch diff --git a/patches/glibc-2.16.0/series b/patches/glibc-2.16.0/series index bfa7e1f..b70db9b 100644 --- a/patches/glibc-2.16.0/series +++ b/patches/glibc-2.16.0/series @@ -1,13 +1,13 @@ # generated by git-ptx-patches #tag:base --start-number 1 +#tag:build-system --start-number 1 0001-add-install-lib-all-target.patch 0002-don-t-regen-docs-if-perl-is-not-found.patch -0003-i386-x86_64-revert-clone-cfi.patch -0004-queue-header-updates.patch -0005-localedef-fix-trampoline.patch -0006-resolv-dynamic.patch -0007-section-comments.patch -0008-fpscr-values.patch -0009-optimized-string-functions-for-NEON-from-Linaro.patch -0010-add-libc_hidden_builtin_def-for-all-cortex-functions.patch -# 836d22209095126bf71de80d57df7f6b - git-ptx-patches magic +#tag:debian --start-number 100 +0100-Fix-localedef-segfault-when-run-under-exec-shield-Pa.patch +#tag:gentoo --start-number 200 +0200-resolv-dynamic.patch +#tag:linaro --start-number 300 +0300-optimized-string-functions-for-NEON-from-Linaro.patch +0301-add-libc_hidden_builtin_def-for-all-cortex-functions.patch +# a4ec378a1364c1c28fb1ae34aab4f545 - git-ptx-patches magic |