Skip to content
Snippets Groups Projects
Commit f58eae99 authored by Stephen Hines's avatar Stephen Hines Committed by Gerrit Code Review
Browse files

Merge "Updated the makefiles to use AArch64 name."

parents 806b35f1 7cfe7b81
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 89 additions and 89 deletions
Android.mk
+ 1
− 1
View file @ f58eae99
......@@ -49,7 +49,7 @@ subdirs += \
lib/Target/ARM/MCTargetDesc \
lib/Target/ARM/TargetInfo
# ARM64 Code Generation Libraries
# AArch64 Code Generation Libraries
subdirs += \
lib/Target/AArch64 \
lib/Target/AArch64/AsmParser \
......
lib/Target/AArch64/Android.mk
+ 8
− 8
View file @ f58eae99
LOCAL_PATH := $(call my-dir)
arm64_codegen_TBLGEN_TABLES := \
aarch64_codegen_TBLGEN_TABLES := \
AArch64GenRegisterInfo.inc \
AArch64GenInstrInfo.inc \
AArch64GenAsmWriter.inc \
......@@ -14,7 +14,7 @@ arm64_codegen_TBLGEN_TABLES := \
AArch64GenDisassemblerTables.inc \
AArch64GenMCPseudoLowering.inc \
arm64_codegen_SRC_FILES := \
aarch64_codegen_SRC_FILES := \
AArch64AddressTypePromotion.cpp \
AArch64AdvSIMDScalarPass.cpp \
AArch64AsmPrinter.cpp \
......@@ -45,12 +45,12 @@ arm64_codegen_SRC_FILES := \
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
LOCAL_MODULE:= libLLVMARM64CodeGen
LOCAL_MODULE:= libLLVMAArch64CodeGen
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(arm64_codegen_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_codegen_SRC_FILES)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
TBLGEN_TABLES := $(arm64_codegen_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_codegen_TBLGEN_TABLES)
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
......@@ -63,12 +63,12 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
LOCAL_MODULE:= libLLVMARM64CodeGen
LOCAL_MODULE:= libLLVMAArch64CodeGen
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(arm64_codegen_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_codegen_SRC_FILES)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
TBLGEN_TABLES := $(arm64_codegen_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_codegen_TBLGEN_TABLES)
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
......
lib/Target/AArch64/AsmParser/Android.mk
+ 17
− 17
View file @ f58eae99
......@@ -4,38 +4,38 @@ LOCAL_PATH := $(call my-dir)
# libARMAsmParser (common)
#===---------------------------------------------------------------===
arm64_asm_parser_SRC_FILES := \
aarch64_asm_parser_SRC_FILES := \
AArch64AsmParser.cpp
arm64_asm_parser_TBLGEN_TABLES := \
aarch64_asm_parser_TBLGEN_TABLES := \
AArch64GenInstrInfo.inc \
AArch64GenRegisterInfo.inc \
AArch64GenAsmMatcher.inc \
AArch64GenSubtargetInfo.inc
arm64_asm_parser_TBLGEN_TD_DIR := $(LOCAL_PATH)/..
aarch64_asm_parser_TBLGEN_TD_DIR := $(LOCAL_PATH)/..
arm64_asm_parser_C_INCLUDES := $(LOCAL_PATH)/..
aarch64_asm_parser_C_INCLUDES := $(LOCAL_PATH)/..
#===---------------------------------------------------------------===
# libARM64AsmParser (host)
# libAArch64AsmParser (host)
#===---------------------------------------------------------------===
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
LOCAL_MODULE:= libLLVMARM64AsmParser
LOCAL_MODULE:= libLLVMAArch64AsmParser
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(arm64_asm_parser_SRC_FILES)
LOCAL_C_INCLUDES += $(arm64_asm_parser_C_INCLUDES)
TBLGEN_TABLES := $(arm64_asm_parser_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(arm64_asm_parser_TBLGEN_TD_DIR)
LOCAL_SRC_FILES := $(aarch64_asm_parser_SRC_FILES)
LOCAL_C_INCLUDES += $(aarch64_asm_parser_C_INCLUDES)
TBLGEN_TABLES := $(aarch64_asm_parser_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(aarch64_asm_parser_TBLGEN_TD_DIR)
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
ifneq (,$(filter windows darwin,$(HOST_OS)))
# Override the default optimization level to work around taking forever (~50m)
# to compile ARM64AsmParser.cpp on Mac with gcc 4.2,
# to compile AArch64AsmParser.cpp on Mac with gcc 4.2,
# or on Linux with mingw32msvc-gcc 4.2, which is used to cross-compile
# the win_sdk.
LOCAL_CFLAGS += -O0
......@@ -44,18 +44,18 @@ include $(BUILD_HOST_STATIC_LIBRARY)
#===---------------------------------------------------------------===
# libARM64AsmParser (target)
# libAArch64AsmParser (target)
#===---------------------------------------------------------------===
ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
LOCAL_MODULE:= libLLVMARM64AsmParser
LOCAL_MODULE:= libLLVMAArch64AsmParser
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(arm64_asm_parser_SRC_FILES)
LOCAL_C_INCLUDES += $(arm64_asm_parser_C_INCLUDES)
TBLGEN_TABLES := $(arm64_asm_parser_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(arm64_asm_parser_TBLGEN_TD_DIR)
LOCAL_SRC_FILES := $(aarch64_asm_parser_SRC_FILES)
LOCAL_C_INCLUDES += $(aarch64_asm_parser_C_INCLUDES)
TBLGEN_TABLES := $(aarch64_asm_parser_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(aarch64_asm_parser_TBLGEN_TD_DIR)
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
......
lib/Target/AArch64/Disassembler/Android.mk
+ 8
− 8
View file @ f58eae99
LOCAL_PATH := $(call my-dir)
arm64_disassembler_TBLGEN_TABLES := \
aarch64_disassembler_TBLGEN_TABLES := \
AArch64GenDisassemblerTables.inc \
AArch64GenInstrInfo.inc \
AArch64GenSubtargetInfo.inc \
AArch64GenRegisterInfo.inc
arm64_disassembler_SRC_FILES := \
aarch64_disassembler_SRC_FILES := \
AArch64Disassembler.cpp \
AArch64ExternalSymbolizer.cpp
......@@ -16,15 +16,15 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
TBLGEN_TABLES := $(arm64_disassembler_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_disassembler_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
LOCAL_SRC_FILES := $(arm64_disassembler_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_disassembler_SRC_FILES)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
LOCAL_MODULE:= libLLVMARM64Disassembler
LOCAL_MODULE:= libLLVMAArch64Disassembler
LOCAL_MODULE_TAGS := optional
......@@ -38,15 +38,15 @@ endif
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
TBLGEN_TABLES := $(arm64_disassembler_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_disassembler_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
LOCAL_SRC_FILES := $(arm64_disassembler_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_disassembler_SRC_FILES)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
LOCAL_MODULE:= libLLVMARM64Disassembler
LOCAL_MODULE:= libLLVMAArch64Disassembler
LOCAL_MODULE_TAGS := optional
......
lib/Target/AArch64/InstPrinter/Android.mk
+ 8
− 8
View file @ f58eae99
LOCAL_PATH := $(call my-dir)
arm64_asm_printer_TBLGEN_TABLES := \
aarch64_asm_printer_TBLGEN_TABLES := \
AArch64GenAsmWriter.inc \
AArch64GenAsmWriter1.inc \
AArch64GenRegisterInfo.inc \
AArch64GenSubtargetInfo.inc \
AArch64GenInstrInfo.inc
arm64_asm_printer_SRC_FILES := \
aarch64_asm_printer_SRC_FILES := \
AArch64InstPrinter.cpp
# For the host
......@@ -15,13 +15,13 @@ arm64_asm_printer_SRC_FILES := \
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
TBLGEN_TABLES := $(arm64_asm_printer_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_asm_printer_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
LOCAL_SRC_FILES := $(arm64_asm_printer_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_asm_printer_SRC_FILES)
LOCAL_MODULE:= libLLVMARM64AsmPrinter
LOCAL_MODULE:= libLLVMAArch64AsmPrinter
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/..
......@@ -38,16 +38,16 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
TBLGEN_TABLES := $(arm64_asm_printer_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_asm_printer_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
LOCAL_SRC_FILES := $(arm64_asm_printer_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_asm_printer_SRC_FILES)
LOCAL_C_INCLUDES+= \
$(LOCAL_PATH)/..
LOCAL_MODULE:= libLLVMARM64AsmPrinter
LOCAL_MODULE:= libLLVMAArch64AsmPrinter
LOCAL_MODULE_TAGS := optional
......
lib/Target/AArch64/MCTargetDesc/Android.mk
+ 8
− 8
View file @ f58eae99
LOCAL_PATH := $(call my-dir)
arm64_mc_desc_TBLGEN_TABLES := \
aarch64_mc_desc_TBLGEN_TABLES := \
AArch64GenRegisterInfo.inc \
AArch64GenInstrInfo.inc \
AArch64GenMCCodeEmitter.inc \
AArch64GenSubtargetInfo.inc
arm64_mc_desc_SRC_FILES := \
aarch64_mc_desc_SRC_FILES := \
AArch64AsmBackend.cpp \
AArch64ELFObjectWriter.cpp \
AArch64ELFStreamer.cpp \
......@@ -22,14 +22,14 @@ include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
LOCAL_MODULE:= libLLVMARM64Desc
LOCAL_MODULE:= libLLVMAArch64Desc
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(arm64_mc_desc_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_mc_desc_SRC_FILES)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
TBLGEN_TABLES := $(arm64_mc_desc_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_mc_desc_TBLGEN_TABLES)
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
......@@ -42,14 +42,14 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
LOCAL_MODULE:= libLLVMARM64Desc
LOCAL_MODULE:= libLLVMAArch64Desc
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(arm64_mc_desc_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_mc_desc_SRC_FILES)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
TBLGEN_TABLES := $(arm64_mc_desc_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_mc_desc_TBLGEN_TABLES)
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
......
lib/Target/AArch64/TargetInfo/Android.mk
+ 8
− 8
View file @ f58eae99
LOCAL_PATH := $(call my-dir)
arm64_target_info_TBLGEN_TABLES := \
aarch64_target_info_TBLGEN_TABLES := \
AArch64GenSubtargetInfo.inc \
AArch64GenRegisterInfo.inc \
AArch64GenInstrInfo.inc
arm64_target_info_SRC_FILES := \
aarch64_target_info_SRC_FILES := \
AArch64TargetInfo.cpp
# For the host
......@@ -13,16 +13,16 @@ arm64_target_info_SRC_FILES := \
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
TBLGEN_TABLES := $(arm64_target_info_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_target_info_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
LOCAL_SRC_FILES := $(arm64_target_info_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_target_info_SRC_FILES)
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/..
LOCAL_MODULE:= libLLVMARM64Info
LOCAL_MODULE:= libLLVMAArch64Info
LOCAL_MODULE_TAGS := optional
......@@ -36,16 +36,16 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
TBLGEN_TABLES := $(arm64_target_info_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_target_info_TBLGEN_TABLES)
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
LOCAL_SRC_FILES := $(arm64_target_info_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_target_info_SRC_FILES)
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/..
LOCAL_MODULE:= libLLVMARM64Info
LOCAL_MODULE:= libLLVMAArch64Info
LOCAL_MODULE_TAGS := optional
......
lib/Target/AArch64/Utils/Android.mk
+ 8
− 8
View file @ f58eae99
LOCAL_PATH := $(call my-dir)
arm64_utils_TBLGEN_TABLES := \
aarch64_utils_TBLGEN_TABLES := \
AArch64GenRegisterInfo.inc \
AArch64GenInstrInfo.inc \
AArch64GenSubtargetInfo.inc
arm64_utils_SRC_FILES := \
aarch64_utils_SRC_FILES := \
AArch64BaseInfo.cpp
# For the device
......@@ -13,16 +13,16 @@ arm64_utils_SRC_FILES := \
ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(arm64_utils_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_utils_SRC_FILES)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
LOCAL_MODULE:= libLLVMARM64Utils
LOCAL_MODULE:= libLLVMAArch64Utils
LOCAL_MODULE_TAGS := optional
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
TBLGEN_TABLES := $(arm64_utils_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_utils_TBLGEN_TABLES)
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
......@@ -34,16 +34,16 @@ endif
# =====================================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(arm64_utils_SRC_FILES)
LOCAL_SRC_FILES := $(aarch64_utils_SRC_FILES)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
LOCAL_MODULE:= libLLVMARM64Utils
LOCAL_MODULE:= libLLVMAArch64Utils
LOCAL_MODULE_TAGS := optional
TBLGEN_TD_DIR := $(LOCAL_PATH)/..
TBLGEN_TABLES := $(arm64_utils_TBLGEN_TABLES)
TBLGEN_TABLES := $(aarch64_utils_TBLGEN_TABLES)
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
......
llvm.mk
+ 1
− 1
View file @ f58eae99
......@@ -8,4 +8,4 @@ LLVM_DEVICE_BUILD_MK := $(LLVM_ROOT_PATH)/llvm-device-build.mk
LLVM_GEN_INTRINSICS_MK := $(LLVM_ROOT_PATH)/llvm-gen-intrinsics.mk
LLVM_TBLGEN_RULES_MK := $(LLVM_ROOT_PATH)/llvm-tblgen-rules.mk
LLVM_SUPPORTED_ARCH := arm arm64 mips mips64 x86 x86_64
LLVM_SUPPORTED_ARCH := arm aarch64 mips mips64 x86 x86_64
shared_llvm.mk
+ 11
− 11
View file @ f58eae99
......@@ -35,14 +35,14 @@ llvm_mips_static_libraries := \
libLLVMMipsAsmPrinter \
libLLVMMipsDisassembler
llvm_arm64_static_libraries := \
libLLVMARM64CodeGen \
libLLVMARM64Info \
libLLVMARM64Desc \
libLLVMARM64AsmParser \
libLLVMARM64AsmPrinter \
libLLVMARM64Utils \
libLLVMARM64Disassembler
llvm_aarch64_static_libraries := \
libLLVMAArch64CodeGen \
libLLVMAArch64Info \
libLLVMAArch64Desc \
libLLVMAArch64AsmParser \
libLLVMAArch64AsmPrinter \
libLLVMAArch64Utils \
libLLVMAArch64Disassembler
llvm_post_static_libraries := \
libLLVMAsmPrinter \
......@@ -88,7 +88,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
$(llvm_arm_static_libraries) \
$(llvm_x86_static_libraries) \
$(llvm_mips_static_libraries) \
$(llvm_arm64_static_libraries) \
$(llvm_aarch64_static_libraries) \
$(llvm_host_static_libraries) \
$(llvm_post_static_libraries)
......@@ -123,8 +123,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_x86_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_x86_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_mips += $(llvm_mips_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_mips64 += $(llvm_mips_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm64_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_aarch64 += $(llvm_aarch64_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_aarch64 += $(llvm_arm_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
......
tools/llc/Android.mk
+ 11
− 11
View file @ f58eae99
......@@ -59,14 +59,14 @@ llvm_llc_STATIC_LIBRARIES := \
libLLVMSupport \
libLLVMObject
llvm_llc_arm64_STATIC_LIBRARIES := \
libLLVMARM64Info \
libLLVMARM64AsmParser \
libLLVMARM64CodeGen \
libLLVMARM64Disassembler \
libLLVMARM64Desc \
libLLVMARM64AsmPrinter \
libLLVMARM64Utils
llvm_llc_aarch64_STATIC_LIBRARIES := \
libLLVMAArch64Info \
libLLVMAArch64AsmParser \
libLLVMAArch64CodeGen \
libLLVMAArch64Disassembler \
libLLVMAArch64Desc \
libLLVMAArch64AsmPrinter \
libLLVMAArch64Utils
......@@ -87,7 +87,7 @@ LOCAL_STATIC_LIBRARIES := \
$(llvm_llc_arm_STATIC_LIBRARIES) \
$(llvm_llc_mips_STATIC_LIBRARIES) \
$(llvm_llc_x86_STATIC_LIBRARIES) \
$(llvm_llc_arm64_STATIC_LIBRARIES) \
$(llvm_llc_aarch64_STATIC_LIBRARIES) \
$(llvm_llc_STATIC_LIBRARIES)
LOCAL_LDLIBS += -lpthread -lm -ldl
......@@ -121,8 +121,8 @@ LOCAL_STATIC_LIBRARIES_arm += $(llvm_llc_arm_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_mips += $(llvm_llc_mips_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_x86 += $(llvm_llc_x86_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_x86_64 += $(llvm_llc_x86_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm64_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_aarch64 += $(llvm_llc_aarch64_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_aarch64 += $(llvm_llc_arm_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment