From b5f333bbefafcac188a8b7dd0bef9a733064567e Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Fri, 7 Mar 2014 13:18:44 -0800 Subject: [PATCH] Work in progress to enable build system support for Clang. Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c --- core/clang/TARGET_arm64.mk | 4 ++-- core/combo/TARGET_linux-arm64.mk | 2 +- target/board/generic_arm64/BoardConfig.mk | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/clang/TARGET_arm64.mk b/core/clang/TARGET_arm64.mk index 16027fafb..9134f1d57 100644 --- a/core/clang/TARGET_arm64.mk +++ b/core/clang/TARGET_arm64.mk @@ -1,7 +1,7 @@ include $(BUILD_SYSTEM)/clang/arm64.mk -CLANG_CONFIG_arm64_TARGET_TRIPLE := aarch64-linux-androideabi +CLANG_CONFIG_arm64_TARGET_TRIPLE := aarch64-linux-android CLANG_CONFIG_arm64_TARGET_TOOLCHAIN_PREFIX := \ $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm64_TARGET_TRIPLE)/bin @@ -51,4 +51,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ $(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS) $(warning Incorrect arm64 RS_TRIPLE, fix me!) -RS_TRIPLE := armv7-none-linux-gnueabi +RS_TRIPLE := aarch64-linux-android diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 290cebe69..15228340c 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -48,7 +48,7 @@ $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT)) endif # TODO: Enable Clang when aarch64 prebuilt is added -WITHOUT_TARGET_CLANG := true +# WITHOUT_TARGET_CLANG := true include $(TARGET_ARCH_SPECIFIC_MAKEFILE) diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 0bdcd9914..4e056d102 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -55,9 +55,4 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 512 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true -# FIXME -# Temporarily disable linking against compiler_rt until there is an arm64 -# version -WITHOUT_LIBCOMPILER_RT := true - BUILD_EMULATOR := false