summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/libpthread/Makefile2
-rw-r--r--toolchain/gcc/patches/5.3.0/disable-split-stach-nothread.patch10
2 files changed, 12 insertions, 0 deletions
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index 62cf9b729..be77d00b6 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -32,6 +32,7 @@ libpthread-install:
ifneq ($(ADK_TARGET_LIB_MUSL),y)
ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
ifneq ($(ADK_TARGET_WITHOUT_THREADS),y)
+ifneq ($(ADK_TARGET_LIB_WITHOUT_THREADS),y)
ifneq ($(ADK_TARGET_BINFMT_FLAT),y)
${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
@@ -39,5 +40,6 @@ endif
endif
endif
endif
+endif
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/toolchain/gcc/patches/5.3.0/disable-split-stach-nothread.patch b/toolchain/gcc/patches/5.3.0/disable-split-stach-nothread.patch
new file mode 100644
index 000000000..32ecf713b
--- /dev/null
+++ b/toolchain/gcc/patches/5.3.0/disable-split-stach-nothread.patch
@@ -0,0 +1,10 @@
+diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
+--- gcc-5.3.0.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200
++++ gcc-5.3.0/libgcc/config/t-stack 2016-03-06 16:26:13.332119208 +0100
+@@ -1,4 +1,6 @@
+ # Makefile fragment to provide generic support for -fsplit-stack.
+ # This should be used in config.host for any host which supports
+ # -fsplit-stack.
++ifeq ($(enable_threads),yes)
+ LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
++endif