summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-03-04 22:47:04 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-03-04 22:47:16 +0100
commit85e0ef6a186e4dedf2ec17165eaaf8fb2fde594b (patch)
treeb681dd753c09dbf0f67d6bfde6d7ac3a24ba34c2 /mk
parent9938b1de157269752ea6f952a32717a98af25880 (diff)
downloadembtoolkit-85e0ef6a186e4dedf2ec17165eaaf8fb2fde594b.tar.gz
embtoolkit-85e0ef6a186e4dedf2ec17165eaaf8fb2fde594b.tar.bz2
embtoolkit-85e0ef6a186e4dedf2ec17165eaaf8fb2fde594b.tar.xz
Toolchain: compiler-rt/musl: workaround for compiler-rt assuming off_t is 32bit
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/llvm/compiler-rt/compiler-rt.mk4
-rw-r--r--mk/toolchain.mk2
2 files changed, 4 insertions, 2 deletions
diff --git a/mk/llvm/compiler-rt/compiler-rt.mk b/mk/llvm/compiler-rt/compiler-rt.mk
index cb3b82e..2a62060 100644
--- a/mk/llvm/compiler-rt/compiler-rt.mk
+++ b/mk/llvm/compiler-rt/compiler-rt.mk
@@ -44,6 +44,10 @@ ifeq ($(CONFIG_EMBTK_CLANG_VERSION_3_3),y)
__embtk_compiler-rt_cflags += -DASAN_INTERFACE_VERSION=3
endif
+ifeq ($(CONFIG_EMBTK_CLIB_MUSL),y)
+__embtk_compiler-rt_cflags += -D_FILE_OFFSET_BITS=64
+endif
+
COMPILER-RT_MAKE_OPTS := CC="$(TARGETCC)" CFLAGS="$(__embtk_compiler-rt_cflags)"
COMPILER-RT_MAKE_OPTS += CXX="$(TARGETCXX)" LIBDIR="$(LIBDIR)"
COMPILER-RT_MAKE_OPTS += AR=$(TARGETAR) RANLIB=$(TARGETRANLIB)
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index 688c1a2..2d2dcd5 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -196,8 +196,6 @@ __gcc3_toolchain-$(CONFIG_EMBTK_GCC_LANGUAGE_OBJECTIVECPP) := gcc3_install
ifeq ($(CONFIG_EMBTK_HAVE_COMPILER-RT)$(CONFIG_KEMBTK_UCLIBC_LINUXTHREADS_OLD),yy)
else ifeq ($(CONFIG_EMBTK_HAVE_COMPILER-RT)$(CONFIG_KEMBTK_UCLIBC_LINUXTHREADS_OLD),yy)
-else ifeq ($(CONFIG_EMBTK_HAVE_COMPILER-RT)$(CONFIG_EMBTK_CLIB_MUSL),yy)
-# FIXME: disable compiler-rt when musl is used as C library for the moment
else
__llvm_compiler-rt-$(CONFIG_EMBTK_HAVE_COMPILER-RT) := compiler-rt_install
endif