diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | lib/compiler-rt/compiler-rt.mk | 6 |
2 files changed, 11 insertions, 6 deletions
@@ -169,8 +169,6 @@ endif ################################################################################ # Common sources and include directories ################################################################################ -include lib/compiler-rt/compiler-rt.mk - # Allow overriding the timestamp, for example for reproducible builds, or to # synchronize timestamps across multiple projects. # This must be set to a C string (including quotes where applicable). @@ -191,8 +189,7 @@ BL_COMMON_SOURCES += common/bl_common.c \ plat/common/plat_bl_common.c \ plat/common/plat_log_common.c \ plat/common/${ARCH}/plat_common.c \ - plat/common/${ARCH}/platform_helpers.S \ - ${COMPILER_RT_SRCS} + plat/common/${ARCH}/platform_helpers.S ifeq ($($(ARCH)-cc-id),arm-clang) BL_COMMON_SOURCES += lib/${ARCH}/armclang_printf.S @@ -1017,6 +1014,12 @@ endif #(SPD) include ${MAKE_HELPERS_DIRECTORY}cflags.mk ################################################################################ +# Include compiler-rt. It is built with MAKE_LIB so it must be included after +# some macros are defined, especially BUILD_PLAT +################################################################################ +include lib/compiler-rt/compiler-rt.mk + +################################################################################ # Build targets ################################################################################ diff --git a/lib/compiler-rt/compiler-rt.mk b/lib/compiler-rt/compiler-rt.mk index 2b16504bf..0f9abde53 100644 --- a/lib/compiler-rt/compiler-rt.mk +++ b/lib/compiler-rt/compiler-rt.mk @@ -28,11 +28,11 @@ # POSSIBILITY OF SUCH DAMAGE. # -COMPILER_RT_SRCS := lib/compiler-rt/builtins/popcountdi2.c \ +LIBCOMPILER_RT_SRCS := lib/compiler-rt/builtins/popcountdi2.c \ lib/compiler-rt/builtins/popcountsi2.c ifeq (${ARCH},aarch32) -COMPILER_RT_SRCS += lib/compiler-rt/builtins/arm/aeabi_ldivmod.S \ +LIBCOMPILER_RT_SRCS += lib/compiler-rt/builtins/arm/aeabi_ldivmod.S \ lib/compiler-rt/builtins/arm/aeabi_uldivmod.S \ lib/compiler-rt/builtins/arm/aeabi_memcpy.S \ lib/compiler-rt/builtins/arm/aeabi_memset.S \ @@ -42,3 +42,5 @@ COMPILER_RT_SRCS += lib/compiler-rt/builtins/arm/aeabi_ldivmod.S \ lib/compiler-rt/builtins/lshrdi3.c \ lib/compiler-rt/builtins/udivmoddi4.c endif + +$(eval $(call MAKE_LIB,compiler_rt)) |