commit d4558e7cf7f0517997e0628c091e70375d8f4e14
author Tim Murray <timmurray@google.com> Fri Mar 14 17:24:38 2014 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 14 17:24:38 2014 -0700
tree 7e0ffda649cf9333e194cabe3ea94e4dfd40a6a4
parent a5545e1b29685bb20816658d2c2f238b9c60da5f
parent 40b8e5d8a4c13f37a59bd3d2a6dfd8e1cf7d1680

am 40b8e5d8: Merge "Make compiler-rt build for ARM64."

* commit '40b8e5d8a4c13f37a59bd3d2a6dfd8e1cf7d1680':
  Make compiler-rt build for ARM64.

Android.mk

diff --git a/Android.mk b/Android.mk
index f30cf50..2fe6909 100644
--- a/Android.mk
+++ b/Android.mk
@@ -169,6 +169,9 @@
   lib/arm/udivsi3.S \
   lib/arm/umodsi3.S
 
+# ARM64-specific runtimes
+libcompiler_rt_arm64_SRC_FILES :=
+
 # MIPS-specific runtimes
 libcompiler_rt_mips_SRC_FILES := # nothing to add
 
@@ -211,7 +214,8 @@
           $(if $(findstring $(1),x86),$(call get-libcompiler-rt-x86-source-files),
              $(if $(findstring $(1),x86_64),$(call get-libcompiler-rt-x86_64-source-files),
                  $(if $(findstring $(1),x32),$(call get-libcompiler-rt-x86-source-files),
-  $(error Unsupported ARCH $(1)))))))
+                    $(if $(findstring $(1),arm64),$(call get-libcompiler-rt-arm64-source-files),
+  $(error Unsupported ARCH $(1))))))))
 endef
 
 # $(1): source list
@@ -252,6 +256,12 @@
       $(call get-libcompiler-rt-arm-common-source-files))
 endef
 
+define get-libcompiler-rt-arm64-source-files
+  $(call filter-libcompiler-rt-common-source-files,
+      $(libcompiler_rt_common_SRC_FILES) \
+      $(libcompiler_rt_arm64_SRC_FILES),arm64)
+endef
+
 define get-libcompiler-rt-mips-source-files
   $(call filter-libcompiler-rt-common-source-files,
       $(libcompiler_rt_common_SRC_FILES) \
@@ -291,10 +301,6 @@
 
 include $(CLEAR_VARS)
 
-ifeq ($(TARGET_ARCH),arm64)
-$(warning TODOArm64: Enable compiler-rt build)
-endif
-
 ifeq ($(TARGET_ARCH),mips64)
 $(warning TODOMips64: Enable compiler-rt build)
 endif
@@ -304,10 +310,11 @@
 LOCAL_ASFLAGS := -integrated-as
 LOCAL_CLANG := true
 LOCAL_SRC_FILES_arm := $(call get-libcompiler-rt-source-files,arm)
+LOCAL_SRC_FILES_arm64 := $(call get-libcompiler-rt-source-files,arm64)
 LOCAL_SRC_FILES_mips := $(call get-libcompiler-rt-source-files,mips)
 LOCAL_SRC_FILES_x86 := $(call get-libcompiler-rt-source-files,x86)
 LOCAL_SRC_FILES_x86_64 := $(call get-libcompiler-rt-source-files,x86_64)
-LOCAL_MODULE_TARGET_ARCH := arm mips x86 x86_64
+LOCAL_MODULE_TARGET_ARCH := arm arm64 mips x86 x86_64
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 include $(BUILD_STATIC_LIBRARY)
@@ -321,7 +328,7 @@
 LOCAL_MODULE := libcompiler_rt
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_WHOLE_STATIC_LIBRARIES := libcompiler_rt
-LOCAL_MODULE_TARGET_ARCH := arm mips x86 x86_64
+LOCAL_MODULE_TARGET_ARCH := arm arm64 mips x86 x86_64
 
 include $(BUILD_SHARED_LIBRARY)