summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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