Merge "Updated the makefiles to use AArch64 name."

7 files changed, 65 insertions, 65 deletions

diff --git a/lib/Target/AArch64/Android.mk b/lib/Target/AArch64/Android.mk
index d0a50da..6b29c77 100644
--- a/lib/Target/AArch64/Android.mk
+++ b/lib/Target/AArch64/Android.mk
@@ -1,6 +1,6 @@
 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)
diff --git a/lib/Target/AArch64/AsmParser/Android.mk b/lib/Target/AArch64/AsmParser/Android.mk
index 0588511..b7a5e9e 100644
--- a/lib/Target/AArch64/AsmParser/Android.mk
+++ b/lib/Target/AArch64/AsmParser/Android.mk
@@ -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)
diff --git a/lib/Target/AArch64/Disassembler/Android.mk b/lib/Target/AArch64/Disassembler/Android.mk
index b89538d..53a65b8 100644
--- a/lib/Target/AArch64/Disassembler/Android.mk
+++ b/lib/Target/AArch64/Disassembler/Android.mk
@@ -1,12 +1,12 @@
 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
 
diff --git a/lib/Target/AArch64/InstPrinter/Android.mk b/lib/Target/AArch64/InstPrinter/Android.mk
index de6aa89..51b4415 100644
--- a/lib/Target/AArch64/InstPrinter/Android.mk
+++ b/lib/Target/AArch64/InstPrinter/Android.mk
@@ -1,13 +1,13 @@
 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
 
diff --git a/lib/Target/AArch64/MCTargetDesc/Android.mk b/lib/Target/AArch64/MCTargetDesc/Android.mk
index c0cdb2b..e9d2323 100644
--- a/lib/Target/AArch64/MCTargetDesc/Android.mk
+++ b/lib/Target/AArch64/MCTargetDesc/Android.mk
@@ -1,12 +1,12 @@
 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)
diff --git a/lib/Target/AArch64/TargetInfo/Android.mk b/lib/Target/AArch64/TargetInfo/Android.mk
index cc650f6..677f860 100644
--- a/lib/Target/AArch64/TargetInfo/Android.mk
+++ b/lib/Target/AArch64/TargetInfo/Android.mk
@@ -1,11 +1,11 @@
 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
 
diff --git a/lib/Target/AArch64/Utils/Android.mk b/lib/Target/AArch64/Utils/Android.mk
index 3c1d194..a3614fa 100644
--- a/lib/Target/AArch64/Utils/Android.mk
+++ b/lib/Target/AArch64/Utils/Android.mk
@@ -1,11 +1,11 @@
 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)