diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-28 15:30:12 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-28 15:30:12 +0100 |
| commit | 463d03f3e8dda0dceb86812df475a43787b5d166 (patch) | |
| tree | 260acaf4339f8975ea921ac66bb059a0418a9186 | |
| parent | 8d15a993a7769d05d4c12d1f2c2939c473264363 (diff) | |
| download | embtoolkit-463d03f3e8dda0dceb86812df475a43787b5d166.tar.gz embtoolkit-463d03f3e8dda0dceb86812df475a43787b5d166.tar.bz2 embtoolkit-463d03f3e8dda0dceb86812df475a43787b5d166.tar.xz | |
Toolchain: clang/llvm/uClibc: Do not build compiler-rt when linuxthread.old is used or no threading is used all
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | kconfig/uclibc-kconfigs/uclibc.kconfig | 2 | ||||
| -rw-r--r-- | mk/toolchain.mk | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/kconfig/uclibc-kconfigs/uclibc.kconfig b/kconfig/uclibc-kconfigs/uclibc.kconfig index 06a9407..b1976e6 100644 --- a/kconfig/uclibc-kconfigs/uclibc.kconfig +++ b/kconfig/uclibc-kconfigs/uclibc.kconfig @@ -320,13 +320,11 @@ choice config KEMBTK_UCLIBC_HAS_NO_THREADS bool "none" - depends on !EMBTK_LLVM_ONLY_TOOLCHAIN && !EMBTK_GCC_AND_LLVM_TOOLCHAIN help Disable thread support. config KEMBTK_UCLIBC_LINUXTHREADS_OLD bool "older (stable) version of linuxthreads" - depends on !EMBTK_LLVM_ONLY_TOOLCHAIN && !EMBTK_GCC_AND_LLVM_TOOLCHAIN # linuxthreads and linuxthreads.old need nanosleep() select KEMBTK_UCLIBC_UCLIBC_HAS_REALTIME help diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 8660fa5..f9a84d1 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -168,7 +168,17 @@ __gcc3_toolchain-$(CONFIG_EMBTK_GCC_LANGUAGE_OBJECTIVEC) := gcc3_install __gcc3_toolchain-$(CONFIG_EMBTK_GCC_LANGUAGE_OBJECTIVECPP) := gcc3_install __llvm_toolchain-$(CONFIG_EMTK_HAVE_LLVM) := llvm_install -__llvm_compiler-rt-$(CONFIG_EMTK_HAVE_COMPILER-RT) := compiler-rt_install + +# +# Handle clang/llvm/uClibc based toolchain where linuxthread.old is used or non +# threading is used at all. +# FIXME: print a warning + +ifeq ($(CONFIG_EMTK_HAVE_COMPILER-RT)$(CONFIG_KEMBTK_UCLIBC_LINUXTHREADS_OLD),yy) +else ifeq ($(CONFIG_EMTK_HAVE_COMPILER-RT)$(CONFIG_KEMBTK_UCLIBC_LINUXTHREADS_OLD),yy) +else +__llvm_compiler-rt-$(CONFIG_EMTK_HAVE_COMPILER-RT) := compiler-rt_install +endif TOOLCHAIN_DEPS := linux_headers_install gmp_host_install TOOLCHAIN_DEPS += mpfr_host_install mpc_host_install binutils_install |