summaryrefslogtreecommitdiffstats
path: root/package/uclibc
diff options
context:
space:
mode:
Diffstat (limited to 'package/uclibc')
-rw-r--r--package/uclibc/0002-arm-fix-static-linking-issues.patch38
-rw-r--r--package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch33
2 files changed, 71 insertions, 0 deletions
diff --git a/package/uclibc/0002-arm-fix-static-linking-issues.patch b/package/uclibc/0002-arm-fix-static-linking-issues.patch
new file mode 100644
index 0000000000..5480b0dca7
--- /dev/null
+++ b/package/uclibc/0002-arm-fix-static-linking-issues.patch
@@ -0,0 +1,38 @@
+From 94810a91c48ac62daed55b4aec70d04a44c10795 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Thu, 16 Feb 2017 20:22:21 +0100
+Subject: [PATCH] arm: fix static linking issues
+
+As reported by Buildroot developers these files causing static
+linking issues. The original contribution with the ARM unwind-resume
+rework and GNU libc sync was made before the combined libc change.
+But the patch was applied later, after the libc change and
+it seems the test coverage for static linking didn't catch it in
+the regression testing. Remove the files.
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c | 2 --
+ libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c | 1 -
+ 2 files changed, 3 deletions(-)
+ delete mode 100644 libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
+ delete mode 100644 libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
+
+diff --git a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
+deleted file mode 100644
+index fd0cec4..0000000
+--- a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
++++ /dev/null
+@@ -1,2 +0,0 @@
+-__asm__ (".set __libgcc_s_init, pthread_cancel_init");
+-#include <arm-unwind-resume.c>
+diff --git a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
+deleted file mode 100644
+index 2641dc5..0000000
+--- a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
++++ /dev/null
+@@ -1 +0,0 @@
+-#include <arm-unwind-resume.c>
+--
+2.1.4
+
diff --git a/package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch b/package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch
new file mode 100644
index 0000000000..7c6022818d
--- /dev/null
+++ b/package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch
@@ -0,0 +1,33 @@
+From 228d03bf0032e5799e9bf04810170c0653ca846d Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Fri, 17 Feb 2017 22:33:49 +0100
+Subject: [PATCH] or1k: add missing definition of ucontext
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ libc/sysdeps/linux/or1k/sys/ucontext.h | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/or1k/sys/ucontext.h b/libc/sysdeps/linux/or1k/sys/ucontext.h
+index b11928e..dd97b60 100644
+--- a/libc/sysdeps/linux/or1k/sys/ucontext.h
++++ b/libc/sysdeps/linux/or1k/sys/ucontext.h
+@@ -20,6 +20,14 @@
+
+ #include <features.h>
+ #include <signal.h>
+-#include <asm/ucontext.h>
++#include <bits/sigcontext.h>
++
++typedef struct ucontext {
++ unsigned long uc_flags;
++ struct ucontext *uc_link;
++ stack_t uc_stack;
++ struct sigcontext uc_mcontext;
++ sigset_t uc_sigmask; /* mask last for extensibility */
++} ucontext_t;
+
+ #endif /* sys/ucontext.h */
+--
+2.1.4
+
OpenPOWER on IntegriCloud