diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 17 |
2 files changed, 20 insertions, 1 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b27497e87..664f45c70 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -53,11 +53,13 @@ GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \ GCC_FINAL_CONFOPTS:= -ifneq ($(ADK_TARGET_WITH_NPTL),) +ifeq ($(ADK_TARGET_WITH_NPTL),y) +ifeq ($(ADK_TARGET_LIB_WITHOUT_THREADS),) GCC_CONFOPTS+= --enable-tls --enable-threads --enable-libatomic else GCC_CONFOPTS+= --disable-tls --disable-threads --disable-libatomic endif +endif ifeq ($(ADK_TARGET_UCLINUX)$(ADK_TARGET_USE_STATIC_LIBS),y) GCC_FINAL_CONFOPTS+= --disable-shared diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 79ace1dca..c10cbb823 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -89,6 +89,14 @@ ifeq ($(ADK_TARGET_WITH_LT),y) $(SED) 's/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(HAS_NO_THREADS\).*/# \1 is not set/' ${WRKBUILD}/.config endif +ifeq ($(ADK_TARGET_LIB_WITHOUT_THREADS),y) + $(SED) 's/.*\(UCLIBC_HAS_LINUXTHREADS\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_THREADS_NATIVE\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_TLS\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(PTHREADS_DEBUG_SUPPORT\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(HAS_NO_THREADS\).*/\1=y/' ${WRKBUILD}/.config + +endif endif ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_0),y) ifeq ($(ADK_TARGET_WITH_NPTL),y) @@ -106,6 +114,15 @@ ifeq ($(ADK_TARGET_WITH_LT),y) $(SED) 's/.*\(LINUXTHREADS_NEW\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(HAS_NO_THREADS\).*/# \1 is not set/' ${WRKBUILD}/.config endif +ifeq ($(ADK_TARGET_LIB_WITHOUT_THREADS),y) + $(SED) 's/.*\(LINUXTHREADS_OLD\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(LINUXTHREADS_NEW\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_THREADS_NATIVE\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_TLS\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(PTHREADS_DEBUG_SUPPORT\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(HAS_NO_THREADS\).*/\1=y/' ${WRKBUILD}/.config + +endif endif ifeq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),) $(SED) 's/.*\(HAVE_SHARED\).*/\1=y/' ${WRKBUILD}/.config |