DO NOT MERGE: android: translate Android.mk build rules for libLLVM80

These changes are applied to build external/llvm80 project
and avoid conflicts with external/llvm project
Changes in mesa main Android.mk are required for libLLVM80
shared library dependency and cflag -DHAVE_LLVM=0x0800

The changelog is described by means of modules and variables
which needed to be renamed:

 #rename LLVM70 to LLVM80
find . -type f -name "*.mk" -exec sed -i 's/LLVM70/LLVM80/g' {} +

 #rename llvm70 to llvm80
find . -type f -name "*.mk" -exec sed -i 's/llvm70/llvm80/g' {} +

 #rename out70 to out80
find . -type f -name "*.mk" -exec sed -i 's/out70/out80/g' {} +

 #rename TBLGEN_TABLES70 to TBLGEN_TABLES80
find . -type f -name "*.mk" -exec sed -i 's/TBLGEN_TABLES70/TBLGEN_TABLES80/g' {} +

 #rename ATTRIBUTETD70 to ATTRIBUTETD80
find . -type f -name "*.mk" -exec sed -i 's/ATTRIBUTETD70/ATTRIBUTETD80/g' {} +

 #rename INTRINSICTD70 to INTRINSICTD80
find . -type f -name "*.mk" -exec sed -i 's/INTRINSICTD70/INTRINSICTD80/g' {} +

 #rename TBLGEN_TD_DIR70 to TBLGEN_TD_DIR80
find . -type f -name "*.mk" -exec sed -i 's/TBLGEN_TD_DIR70/TBLGEN_TD_DIR80/g' {} +

 #rename CLEAR_TBLGEN_VARS70 to CLEAR_TBLGEN_VARS80
find . -type f -name "*.mk" -exec sed -i 's/CLEAR_TBLGEN_VARS70/CLEAR_TBLGEN_VARS80/g' {} +

diff --git a/Android.mk b/Android.mk
index b66edd1..d465da0 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
-LLVM70_ROOT_PATH := $(LOCAL_PATH)
-LLVM70_TBLGEN := $(HOST_OUT_EXECUTABLES)/llvm70-tblgen
+LLVM80_ROOT_PATH := $(LOCAL_PATH)
+LLVM80_TBLGEN := $(HOST_OUT_EXECUTABLES)/llvm80-tblgen
 
 FORCE_BUILD_LLVM_DISABLE_NDEBUG ?= false
 # Legality check: FORCE_BUILD_LLVM_DISABLE_NDEBUG should consist of one word -- either "true" or "false".

diff --git a/CleanSpec.mk b/CleanSpec.mk
index a40572f..85c6e4e 100644 (file)
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,10 +47,10 @@
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/stingray/obj/STATIC_LIBRARIES/libLLVM70*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/stingray/obj/STATIC_LIBRARIES/libLLVM70ARMCodeGen_intermediates*)
-$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_PREBUILT_TAG)/obj/STATIC_LIBRARIES/libLLVM70ARM*)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libLLVM70ARM*)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libLLVM70*)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libLLVM70*)
-$(call add-clean-step, rm -f external/llvm70/tools/llvm-config/BuildVariables.inc)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/stingray/obj/STATIC_LIBRARIES/libLLVM80*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/stingray/obj/STATIC_LIBRARIES/libLLVM80ARMCodeGen_intermediates*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_PREBUILT_TAG)/obj/STATIC_LIBRARIES/libLLVM80ARM*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libLLVM80ARM*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libLLVM80*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libLLVM80*)
+$(call add-clean-step, rm -f external/llvm80/tools/llvm-config/BuildVariables.inc)

diff --git a/clear_tblgen_vars.mk b/clear_tblgen_vars.mk
index f2e6362..f5c4d51 100644 (file)
--- a/clear_tblgen_vars.mk
+++ b/clear_tblgen_vars.mk
@@ -1,2 +1,2 @@
-TBLGEN_TABLES70 :=
-TBLGEN_TD_DIR70 :=
+TBLGEN_TABLES80 :=
+TBLGEN_TD_DIR80 :=

diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index a9b98ba..7ded76a 100644 (file)
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -101,13 +101,13 @@ analysis_SRC_FILES := \
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70Analysis
+LOCAL_MODULE:= libLLVM80Analysis
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(analysis_SRC_FILES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -115,11 +115,11 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70Analysis
+LOCAL_MODULE:= libLLVM80Analysis
 LOCAL_SRC_FILES := $(analysis_SRC_FILES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/AsmParser/Android.mk b/lib/AsmParser/Android.mk
index 2d422f8..d0329c9 100644 (file)
--- a/lib/AsmParser/Android.mk
+++ b/lib/AsmParser/Android.mk
@@ -11,13 +11,13 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(asm_parser_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70AsmParser
+LOCAL_MODULE:= libLLVM80AsmParser
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LOCAL_PATH)/../../llvm-host-build.mk
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -27,10 +27,10 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(asm_parser_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70AsmParser
+LOCAL_MODULE:= libLLVM80AsmParser
 
 include $(LOCAL_PATH)/../../llvm-device-build.mk
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/BinaryFormat/Android.mk b/lib/BinaryFormat/Android.mk
index f8cc4d9..82bd0b3 100644 (file)
--- a/lib/BinaryFormat/Android.mk
+++ b/lib/BinaryFormat/Android.mk
@@ -15,13 +15,13 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(binary_format_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70BinaryFormat
+LOCAL_MODULE:= libLLVM80BinaryFormat
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -31,10 +31,10 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(binary_format_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70BinaryFormat
+LOCAL_MODULE:= libLLVM80BinaryFormat
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Bitcode/Reader/Android.mk b/lib/Bitcode/Reader/Android.mk
index 07b3d0a..060be06 100644 (file)
--- a/lib/Bitcode/Reader/Android.mk
+++ b/lib/Bitcode/Reader/Android.mk
@@ -13,13 +13,13 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(bitcode_reader_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70BitReader
+LOCAL_MODULE:= libLLVM80BitReader
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -29,10 +29,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 LOCAL_SRC_FILES := $(bitcode_reader_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70BitReader
+LOCAL_MODULE:= libLLVM80BitReader
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Bitcode/Writer/Android.mk b/lib/Bitcode/Writer/Android.mk
index f2dbfbe..59f32ba 100644 (file)
--- a/lib/Bitcode/Writer/Android.mk
+++ b/lib/Bitcode/Writer/Android.mk
@@ -12,13 +12,13 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(bitcode_writer_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70BitWriter
+LOCAL_MODULE:= libLLVM80BitWriter
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -28,10 +28,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 LOCAL_SRC_FILES := $(bitcode_writer_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70BitWriter
+LOCAL_MODULE:= libLLVM80BitWriter
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index a8d2b1f..9f706cf 100644 (file)
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -169,13 +169,13 @@ codegen_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(codegen_SRC_FILES)
-LOCAL_MODULE:= libLLVM70CodeGen
+LOCAL_MODULE:= libLLVM80CodeGen
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -184,10 +184,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(codegen_SRC_FILES)
-LOCAL_MODULE:= libLLVM70CodeGen
+LOCAL_MODULE:= libLLVM80CodeGen
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk
index 0500fd3..86a0ae5 100644 (file)
--- a/lib/CodeGen/AsmPrinter/Android.mk
+++ b/lib/CodeGen/AsmPrinter/Android.mk
@@ -32,13 +32,13 @@ codegen_asmprinter_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(codegen_asmprinter_SRC_FILES)
-LOCAL_MODULE:= libLLVM70AsmPrinter
+LOCAL_MODULE:= libLLVM80AsmPrinter
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -47,10 +47,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(codegen_asmprinter_SRC_FILES)
-LOCAL_MODULE:= libLLVM70AsmPrinter
+LOCAL_MODULE:= libLLVM80AsmPrinter
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/GlobalISel/Android.mk b/lib/CodeGen/GlobalISel/Android.mk
index 71d351b..be157a2 100644 (file)
--- a/lib/CodeGen/GlobalISel/Android.mk
+++ b/lib/CodeGen/GlobalISel/Android.mk
@@ -33,13 +33,13 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(global_isel_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70GlobalISel
+LOCAL_MODULE:= libLLVM80GlobalISel
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -49,12 +49,12 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 LOCAL_SRC_FILES := $(global_isel_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70GlobalISel
+LOCAL_MODULE:= libLLVM80GlobalISel
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/MIRParser/Android.mk b/lib/CodeGen/MIRParser/Android.mk
index d7570d6..7be9388 100644 (file)
--- a/lib/CodeGen/MIRParser/Android.mk
+++ b/lib/CodeGen/MIRParser/Android.mk
@@ -11,12 +11,12 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(MIRParser_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70MIRParser
+LOCAL_MODULE:= libLLVM80MIRParser
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -26,11 +26,11 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 LOCAL_SRC_FILES := $(MIRParser_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70MIRParser
+LOCAL_MODULE:= libLLVM80MIRParser
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/SelectionDAG/Android.mk b/lib/CodeGen/SelectionDAG/Android.mk
index b37de72..d85e452 100644 (file)
--- a/lib/CodeGen/SelectionDAG/Android.mk
+++ b/lib/CodeGen/SelectionDAG/Android.mk
@@ -34,13 +34,13 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(codegen_selectiondag_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70SelectionDAG
+LOCAL_MODULE:= libLLVM80SelectionDAG
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -50,10 +50,10 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(codegen_selectiondag_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70SelectionDAG
+LOCAL_MODULE:= libLLVM80SelectionDAG
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/CodeView/Android.mk b/lib/DebugInfo/CodeView/Android.mk
index 7e57321..1266950 100644 (file)
--- a/lib/DebugInfo/CodeView/Android.mk
+++ b/lib/DebugInfo/CodeView/Android.mk
@@ -50,12 +50,12 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(debuginfo_codeview_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70DebugInfoCodeView
+LOCAL_MODULE:= libLLVM80DebugInfoCodeView
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -67,9 +67,9 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(debuginfo_codeview_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70DebugInfoCodeView
+LOCAL_MODULE:= libLLVM80DebugInfoCodeView
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/DWARF/Android.mk b/lib/DebugInfo/DWARF/Android.mk
index bf821e3..dd66f4e 100644 (file)
--- a/lib/DebugInfo/DWARF/Android.mk
+++ b/lib/DebugInfo/DWARF/Android.mk
@@ -37,12 +37,12 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(debuginfo_dwarf_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70DebugInfoDWARF
+LOCAL_MODULE:= libLLVM80DebugInfoDWARF
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -54,9 +54,9 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(debuginfo_dwarf_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70DebugInfoDWARF
+LOCAL_MODULE:= libLLVM80DebugInfoDWARF
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/MSF/Android.mk b/lib/DebugInfo/MSF/Android.mk
index 8c86eec..4181ead 100644 (file)
--- a/lib/DebugInfo/MSF/Android.mk
+++ b/lib/DebugInfo/MSF/Android.mk
@@ -14,12 +14,12 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(debuginfo_msf_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70DebugInfoMSF
+LOCAL_MODULE:= libLLVM80DebugInfoMSF
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -31,9 +31,9 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(debuginfo_msf_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70DebugInfoMSF
+LOCAL_MODULE:= libLLVM80DebugInfoMSF
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/PDB/Android.mk b/lib/DebugInfo/PDB/Android.mk
index 7bd39c9..06033f2 100644 (file)
--- a/lib/DebugInfo/PDB/Android.mk
+++ b/lib/DebugInfo/PDB/Android.mk
@@ -92,12 +92,12 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(debuginfo_pdb_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70DebugInfoPDB
+LOCAL_MODULE:= libLLVM80DebugInfoPDB
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -109,9 +109,9 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(debuginfo_pdb_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70DebugInfoPDB
+LOCAL_MODULE:= libLLVM80DebugInfoPDB
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/Symbolize/Android.mk b/lib/DebugInfo/Symbolize/Android.mk
index 5020421..acb3a35 100644 (file)
--- a/lib/DebugInfo/Symbolize/Android.mk
+++ b/lib/DebugInfo/Symbolize/Android.mk
@@ -11,12 +11,12 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(debuginfo_symbolize_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Symbolize
+LOCAL_MODULE:= libLLVM80Symbolize
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -26,9 +26,9 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(debuginfo_symbolize_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Symbolize
+LOCAL_MODULE:= libLLVM80Symbolize
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Demangle/Android.mk b/lib/Demangle/Android.mk
index 91ca665..21c33fb 100644 (file)
--- a/lib/Demangle/Android.mk
+++ b/lib/Demangle/Android.mk
@@ -7,13 +7,13 @@ demangle_SRC_FILES := \
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70Demangle
+LOCAL_MODULE:= libLLVM80Demangle
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(demangle_SRC_FILES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -21,11 +21,11 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70Demangle
+LOCAL_MODULE:= libLLVM80Demangle
 LOCAL_SRC_FILES := $(demangle_SRC_FILES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk
index e373c15..0851e48 100644 (file)
--- a/lib/ExecutionEngine/Android.mk
+++ b/lib/ExecutionEngine/Android.mk
@@ -11,13 +11,13 @@ executionengine_SRC_FILES := \
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libLLVM70ExecutionEngine
+LOCAL_MODULE := libLLVM80ExecutionEngine
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(executionengine_SRC_FILES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -25,11 +25,11 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libLLVM70ExecutionEngine
+LOCAL_MODULE := libLLVM80ExecutionEngine
 LOCAL_SRC_FILES := $(executionengine_SRC_FILES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ExecutionEngine/Interpreter/Android.mk b/lib/ExecutionEngine/Interpreter/Android.mk
index f242c22..59fe3ac 100644 (file)
--- a/lib/ExecutionEngine/Interpreter/Android.mk
+++ b/lib/ExecutionEngine/Interpreter/Android.mk
@@ -10,13 +10,13 @@ interpreter_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(interpreter_SRC_FILES)
-LOCAL_MODULE := libLLVM70Interpreter
+LOCAL_MODULE := libLLVM80Interpreter
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -25,10 +25,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(interpreter_SRC_FILES)
-LOCAL_MODULE := libLLVM70Interpreter
+LOCAL_MODULE := libLLVM80Interpreter
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ExecutionEngine/MCJIT/Android.mk b/lib/ExecutionEngine/MCJIT/Android.mk
index bf657cf..8a1a607 100644 (file)
--- a/lib/ExecutionEngine/MCJIT/Android.mk
+++ b/lib/ExecutionEngine/MCJIT/Android.mk
@@ -8,13 +8,13 @@ mcjit_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(mcjit_SRC_FILES)
-LOCAL_MODULE := libLLVM70MCJIT
+LOCAL_MODULE := libLLVM80MCJIT
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -23,10 +23,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(mcjit_SRC_FILES)
-LOCAL_MODULE := libLLVM70MCJIT
+LOCAL_MODULE := libLLVM80MCJIT
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ExecutionEngine/Orc/Android.mk b/lib/ExecutionEngine/Orc/Android.mk
index a917018..1943a62 100644 (file)
--- a/lib/ExecutionEngine/Orc/Android.mk
+++ b/lib/ExecutionEngine/Orc/Android.mk
@@ -22,13 +22,13 @@ orcjit_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(orcjit_SRC_FILES)
-LOCAL_MODULE := libLLVM70OrcJIT
+LOCAL_MODULE := libLLVM80OrcJIT
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -37,10 +37,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(orcjit_SRC_FILES)
-LOCAL_MODULE := libLLVM70OrcJIT
+LOCAL_MODULE := libLLVM80OrcJIT
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.mk b/lib/ExecutionEngine/RuntimeDyld/Android.mk
index 3d13d48..b68c384 100644 (file)
--- a/lib/ExecutionEngine/RuntimeDyld/Android.mk
+++ b/lib/ExecutionEngine/RuntimeDyld/Android.mk
@@ -15,13 +15,13 @@ runtimedyld_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(runtimedyld_SRC_FILES)
-LOCAL_MODULE := libLLVM70RuntimeDyld
+LOCAL_MODULE := libLLVM80RuntimeDyld
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -30,10 +30,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(runtimedyld_SRC_FILES)
-LOCAL_MODULE := libLLVM70RuntimeDyld
+LOCAL_MODULE := libLLVM80RuntimeDyld
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Fuzzer/Android.mk b/lib/Fuzzer/Android.mk
index cb5e63e..c14476a 100644 (file)
--- a/lib/Fuzzer/Android.mk
+++ b/lib/Fuzzer/Android.mk
@@ -42,7 +42,7 @@ libfuzzer_srcs := \
 
 include $(CLEAR_VARS)
 LOCAL_CLANG := true
-LOCAL_MODULE := libLLVM70FuzzerNoMain
+LOCAL_MODULE := libLLVM80FuzzerNoMain
 LOCAL_C_INCLUDES := external/compiler-rt/include
 LOCAL_SRC_FILES := $(libfuzzer_srcs)
 LOCAL_SANITIZE := never
@@ -51,16 +51,16 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_CLANG := true
-LOCAL_MODULE := libLLVM70Fuzzer
+LOCAL_MODULE := libLLVM80Fuzzer
 LOCAL_SRC_FILES := FuzzerMain.cpp
-LOCAL_WHOLE_STATIC_LIBRARIES := libLLVM70FuzzerNoMain
+LOCAL_WHOLE_STATIC_LIBRARIES := libLLVM80FuzzerNoMain
 LOCAL_SANITIZE := never
 LOCAL_MULTILIB := both
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_CLANG := true
-LOCAL_MODULE := libLLVM70FuzzerNoMain
+LOCAL_MODULE := libLLVM80FuzzerNoMain
 LOCAL_C_INCLUDES := external/compiler-rt/include
 LOCAL_SRC_FILES := $(libfuzzer_srcs)
 LOCAL_SANITIZE := never
@@ -69,9 +69,9 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_CLANG := true
-LOCAL_MODULE := libLLVM70Fuzzer
+LOCAL_MODULE := libLLVM80Fuzzer
 LOCAL_SRC_FILES := FuzzerMain.cpp
-LOCAL_WHOLE_STATIC_LIBRARIES := libLLVM70FuzzerNoMain
+LOCAL_WHOLE_STATIC_LIBRARIES := libLLVM80FuzzerNoMain
 LOCAL_SANITIZE := never
 LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/IR/Android.mk b/lib/IR/Android.mk
index aa09143..e5204d1 100644 (file)
--- a/lib/IR/Android.mk
+++ b/lib/IR/Android.mk
@@ -63,13 +63,13 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(vmcore_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Core
+LOCAL_MODULE:= libLLVM80Core
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(LOCAL_PATH)/llvm-gen-local.mk
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -82,13 +82,13 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(vmcore_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Core
+LOCAL_MODULE:= libLLVM80Core
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(call local-generated-sources-dir)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(LOCAL_PATH)/llvm-gen-local.mk
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/IR/llvm-gen-local.mk b/lib/IR/llvm-gen-local.mk
index 77fa6fd..44950a6 100644 (file)
--- a/lib/IR/llvm-gen-local.mk
+++ b/lib/IR/llvm-gen-local.mk
@@ -1,11 +1,11 @@
-ATTRIBUTETD70_LOCAL := $(LLVM70_ROOT_PATH)/lib/IR/AttributesCompatFunc.td
+ATTRIBUTETD80_LOCAL := $(LLVM80_ROOT_PATH)/lib/IR/AttributesCompatFunc.td
 
 GENFILE_LOCAL := $(addprefix $(call local-generated-sources-dir)/,AttributesCompatFunc.inc)
 LOCAL_GENERATED_SOURCES += $(GENFILE_LOCAL)
 $(GENFILE_LOCAL): TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
-$(GENFILE_LOCAL): $(ATTRIBUTETD70_LOCAL) | $(LLVM70_TBLGEN)
+$(GENFILE_LOCAL): $(ATTRIBUTETD80_LOCAL) | $(LLVM80_TBLGEN)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-       $(call transform-host-td-to-out70,attrs)
+       $(call transform-host-td-to-out80,attrs)
 else
-       $(call transform-device-td-to-out70,attrs)
+       $(call transform-device-td-to-out80,attrs)
 endif

diff --git a/lib/IRReader/Android.mk b/lib/IRReader/Android.mk
index d83977e..28d3afe 100644 (file)
--- a/lib/IRReader/Android.mk
+++ b/lib/IRReader/Android.mk
@@ -11,13 +11,13 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(irreader_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70IRReader
+LOCAL_MODULE:= libLLVM80IRReader
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -29,10 +29,10 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(irreader_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70IRReader
+LOCAL_MODULE:= libLLVM80IRReader
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/LTO/Android.mk b/lib/LTO/Android.mk
index 2072b28..05f8b6f 100644 (file)
--- a/lib/LTO/Android.mk
+++ b/lib/LTO/Android.mk
@@ -15,13 +15,13 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(lto_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70LTO
+LOCAL_MODULE:= libLLVM80LTO
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -31,12 +31,12 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(lto_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70LTO
+LOCAL_MODULE:= libLLVM80LTO
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/LineEditor/Android.mk b/lib/LineEditor/Android.mk
index 45e1cae..83d812e 100644 (file)
--- a/lib/LineEditor/Android.mk
+++ b/lib/LineEditor/Android.mk
@@ -9,13 +9,13 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(line_editor_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70LineEditor
+LOCAL_MODULE:= libLLVM80LineEditor
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -25,12 +25,12 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(line_editor_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70LineEditor
+LOCAL_MODULE:= libLLVM80LineEditor
 
 LOCAL_MODULE_TAGS := optional
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Linker/Android.mk b/lib/Linker/Android.mk
index a1dd84f..5fa8a5a 100644 (file)
--- a/lib/Linker/Android.mk
+++ b/lib/Linker/Android.mk
@@ -7,16 +7,16 @@ linker_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
 LOCAL_SRC_FILES := $(linker_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Linker
+LOCAL_MODULE:= libLLVM80Linker
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -26,10 +26,10 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(linker_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Linker
+LOCAL_MODULE:= libLLVM80Linker
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index 271d488..8a996c9 100644 (file)
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -62,12 +62,12 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(mc_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70MC
+LOCAL_MODULE:= libLLVM80MC
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -77,8 +77,8 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 LOCAL_SRC_FILES := $(mc_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70MC
+LOCAL_MODULE:= libLLVM80MC
 
-include $(LLVM70_DEVICE_BUILD_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/MC/MCDisassembler/Android.mk b/lib/MC/MCDisassembler/Android.mk
index 0675cdf..7d3091e 100644 (file)
--- a/lib/MC/MCDisassembler/Android.mk
+++ b/lib/MC/MCDisassembler/Android.mk
@@ -13,12 +13,12 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(mc_disassembler_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70MCDisassembler
+LOCAL_MODULE:= libLLVM80MCDisassembler
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -28,10 +28,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 LOCAL_SRC_FILES := $(mc_disassembler_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70MCDisassembler
+LOCAL_MODULE:= libLLVM80MCDisassembler
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_DEVICE_BUILD_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/MC/MCParser/Android.mk b/lib/MC/MCParser/Android.mk
index 2b75df8..8ef7e59 100644 (file)
--- a/lib/MC/MCParser/Android.mk
+++ b/lib/MC/MCParser/Android.mk
@@ -18,11 +18,11 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(mc_parser_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70MCParser
+LOCAL_MODULE:= libLLVM80MCParser
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -32,8 +32,8 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 LOCAL_SRC_FILES := $(mc_parser_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70MCParser
+LOCAL_MODULE:= libLLVM80MCParser
 
-include $(LLVM70_DEVICE_BUILD_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Object/Android.mk b/lib/Object/Android.mk
index d2b1b8f..7bd66b3 100644 (file)
--- a/lib/Object/Android.mk
+++ b/lib/Object/Android.mk
@@ -27,9 +27,9 @@ object_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70Object
+LOCAL_MODULE:= libLLVM80Object
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(object_SRC_FILES)
@@ -37,9 +37,9 @@ LOCAL_SRC_FILES := $(object_SRC_FILES)
 # Our windows cross-compiler triggers a spurious uninitialized warning.
 LOCAL_CFLAGS_windows := -Wno-uninitialized
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -47,12 +47,12 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70Object
+LOCAL_MODULE:= libLLVM80Object
 
 LOCAL_SRC_FILES := $(object_SRC_FILES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ObjectYAML/Android.mk b/lib/ObjectYAML/Android.mk
index ac9a2ef..ddaafbc 100644 (file)
--- a/lib/ObjectYAML/Android.mk
+++ b/lib/ObjectYAML/Android.mk
@@ -18,14 +18,14 @@ object_yaml_SRC_FILES := \
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70ObjectYAML
+LOCAL_MODULE:= libLLVM80ObjectYAML
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(object_yaml_SRC_FILES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -33,12 +33,12 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70ObjectYAML
+LOCAL_MODULE:= libLLVM80ObjectYAML
 
 LOCAL_SRC_FILES := $(object_yaml_SRC_FILES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Option/Android.mk b/lib/Option/Android.mk
index 61896b2..1024b6e 100644 (file)
--- a/lib/Option/Android.mk
+++ b/lib/Option/Android.mk
@@ -15,13 +15,13 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(option_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Option
+LOCAL_MODULE:= libLLVM80Option
 
 LOCAL_CFLAGS := -D__android__
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -31,10 +31,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 LOCAL_SRC_FILES := $(option_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Option
+LOCAL_MODULE:= libLLVM80Option
 
 LOCAL_CFLAGS := -D__android__
 
-include $(LLVM70_DEVICE_BUILD_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Passes/Android.mk b/lib/Passes/Android.mk
index 511726b..8b8010a 100644 (file)
--- a/lib/Passes/Android.mk
+++ b/lib/Passes/Android.mk
@@ -7,13 +7,13 @@ passes_SRC_FILES := \
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70Passes
+LOCAL_MODULE:= libLLVM80Passes
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(passes_SRC_FILES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -21,12 +21,12 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70Passes
+LOCAL_MODULE:= libLLVM80Passes
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(passes_SRC_FILES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ProfileData/Android.mk b/lib/ProfileData/Android.mk
index e3e8a8f..229864b 100644 (file)
--- a/lib/ProfileData/Android.mk
+++ b/lib/ProfileData/Android.mk
@@ -13,13 +13,13 @@ profiledata_SRC_FILES := \
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70ProfileData
+LOCAL_MODULE:= libLLVM80ProfileData
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(profiledata_SRC_FILES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -27,11 +27,11 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70ProfileData
+LOCAL_MODULE:= libLLVM80ProfileData
 LOCAL_SRC_FILES := $(profiledata_SRC_FILES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index e60eb68..52a4ebb 100644 (file)
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 support_SRC_FILES := \
   AArch64TargetParser.cpp \
@@ -134,13 +134,13 @@ REQUIRES_RTTI := 1
 
 LOCAL_SRC_FILES := $(support_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Support
+LOCAL_MODULE:= libLLVM80Support
 
 LOCAL_CFLAGS := -D__android__
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -150,10 +150,10 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(support_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Support
+LOCAL_MODULE:= libLLVM80Support
 
 LOCAL_CFLAGS := -D__android__
 
-include $(LLVM70_DEVICE_BUILD_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/TableGen/Android.mk b/lib/TableGen/Android.mk
index f861e14..f34f918 100644 (file)
--- a/lib/TableGen/Android.mk
+++ b/lib/TableGen/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 libtablegen_SRC_FILES := \
   Error.cpp \
@@ -19,14 +19,14 @@ include $(CLEAR_VARS)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SRC_FILES := $(libtablegen_SRC_FILES)
-LOCAL_MODULE:= libLLVM70TableGen
+LOCAL_MODULE:= libLLVM80TableGen
 
 LOCAL_MODULE_TAGS := optional
 
 REQUIRES_EH := 1
 REQUIRES_RTTI := 1
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 ## For the device
@@ -35,10 +35,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 #include $(CLEAR_VARS)
 #
 #LOCAL_SRC_FILES := $(libtablegen_SRC_FILES)
-#LOCAL_MODULE:= libLLVM70TableGen
+#LOCAL_MODULE:= libLLVM80TableGen
 #
 #LOCAL_MODULE_TAGS := optional
 #
-#include $(LLVM70_DEVICE_BUILD_MK)
+#include $(LLVM80_DEVICE_BUILD_MK)
 #include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/Android.mk b/lib/Target/AArch64/Android.mk
index e8e557b..bac3022 100644 (file)
--- a/lib/Target/AArch64/Android.mk
+++ b/lib/Target/AArch64/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-aarch64_codegen_TBLGEN_TABLES70 := \
+aarch64_codegen_TBLGEN_TABLES80 := \
   AArch64GenRegisterInfo.inc \
   AArch64GenInstrInfo.inc \
   AArch64GenAsmWriter.inc \
@@ -54,7 +54,7 @@ aarch64_codegen_SRC_FILES := \
   AArch64SIMDInstrOpt.cpp
 
 ifeq ($(FORCE_BUILD_LLVM_GLOBAL_ISEL),true)
-aarch64_codegen_TBLGEN_TABLES70 += \
+aarch64_codegen_TBLGEN_TABLES80 += \
   AArch64GenRegisterBank.inc \
   AArch64GenGlobalISel.inc
 
@@ -68,36 +68,36 @@ endif
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70AArch64CodeGen
+LOCAL_MODULE:= libLLVM80AArch64CodeGen
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(aarch64_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
-TBLGEN_TABLES70 := $(aarch64_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(aarch64_codegen_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70AArch64CodeGen
+LOCAL_MODULE:= libLLVM80AArch64CodeGen
 
 LOCAL_SRC_FILES := $(aarch64_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
-TBLGEN_TABLES70 := $(aarch64_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(aarch64_codegen_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/AsmParser/Android.mk b/lib/Target/AArch64/AsmParser/Android.mk
index a4d3e67..ed9a3c1 100644 (file)
--- a/lib/Target/AArch64/AsmParser/Android.mk
+++ b/lib/Target/AArch64/AsmParser/Android.mk
@@ -7,14 +7,14 @@ LOCAL_PATH := $(call my-dir)
 aarch64_asm_parser_SRC_FILES := \
   AArch64AsmParser.cpp
 
-aarch64_asm_parser_TBLGEN_TABLES70 := \
+aarch64_asm_parser_TBLGEN_TABLES80 := \
   AArch64GenInstrInfo.inc \
   AArch64GenRegisterInfo.inc \
   AArch64GenAsmMatcher.inc \
   AArch64GenSubtargetInfo.inc \
   AArch64GenSystemOperands.inc
 
-aarch64_asm_parser_TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+aarch64_asm_parser_TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 aarch64_asm_parser_C_INCLUDES := $(LOCAL_PATH)/..
 
@@ -23,19 +23,19 @@ aarch64_asm_parser_C_INCLUDES := $(LOCAL_PATH)/..
 # libAArch64AsmParser (host)
 #===---------------------------------------------------------------===
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70AArch64AsmParser
+LOCAL_MODULE:= libLLVM80AArch64AsmParser
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(aarch64_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(aarch64_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(aarch64_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(aarch64_asm_parser_TBLGEN_TD_DIR70)
+TBLGEN_TABLES80 := $(aarch64_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(aarch64_asm_parser_TBLGEN_TD_DIR80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 # Override the default optimization level to work around taking forever (~50m)
 # to compile AArch64AsmParser.cpp on Mac with gcc 4.2,
 # or on Linux with mingw32msvc-gcc 4.2, which is used to cross-compile
@@ -50,17 +50,17 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 #===---------------------------------------------------------------===
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70AArch64AsmParser
+LOCAL_MODULE:= libLLVM80AArch64AsmParser
 LOCAL_SRC_FILES := $(aarch64_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(aarch64_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(aarch64_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(aarch64_asm_parser_TBLGEN_TD_DIR70)
+TBLGEN_TABLES80 := $(aarch64_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(aarch64_asm_parser_TBLGEN_TD_DIR80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/Disassembler/Android.mk b/lib/Target/AArch64/Disassembler/Android.mk
index e9eaafe..532eb60 100644 (file)
--- a/lib/Target/AArch64/Disassembler/Android.mk
+++ b/lib/Target/AArch64/Disassembler/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-aarch64_disassembler_TBLGEN_TABLES70 := \
+aarch64_disassembler_TBLGEN_TABLES80 := \
   AArch64GenDisassemblerTables.inc \
   AArch64GenInstrInfo.inc \
   AArch64GenSubtargetInfo.inc \
@@ -15,45 +15,45 @@ aarch64_disassembler_SRC_FILES := \
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(aarch64_disassembler_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(aarch64_disassembler_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(aarch64_disassembler_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70AArch64Disassembler
+LOCAL_MODULE:= libLLVM80AArch64Disassembler
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(aarch64_disassembler_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(aarch64_disassembler_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(aarch64_disassembler_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70AArch64Disassembler
+LOCAL_MODULE:= libLLVM80AArch64Disassembler
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 

diff --git a/lib/Target/AArch64/InstPrinter/Android.mk b/lib/Target/AArch64/InstPrinter/Android.mk
index 1c3e4ad..40092a9 100644 (file)
--- a/lib/Target/AArch64/InstPrinter/Android.mk
+++ b/lib/Target/AArch64/InstPrinter/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-aarch64_asm_printer_TBLGEN_TABLES70 := \
+aarch64_asm_printer_TBLGEN_TABLES80 := \
   AArch64GenAsmWriter.inc \
   AArch64GenAsmWriter1.inc \
   AArch64GenRegisterInfo.inc \
@@ -14,44 +14,44 @@ aarch64_asm_printer_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(aarch64_asm_printer_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(aarch64_asm_printer_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(aarch64_asm_printer_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70AArch64AsmPrinter
+LOCAL_MODULE:= libLLVM80AArch64AsmPrinter
 
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/..
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(aarch64_asm_printer_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(aarch64_asm_printer_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(aarch64_asm_printer_SRC_FILES)
 
 LOCAL_C_INCLUDES+= \
     $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70AArch64AsmPrinter
+LOCAL_MODULE:= libLLVM80AArch64AsmPrinter
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 

diff --git a/lib/Target/AArch64/MCTargetDesc/Android.mk b/lib/Target/AArch64/MCTargetDesc/Android.mk
index cd6ceb9..f438577 100644 (file)
--- a/lib/Target/AArch64/MCTargetDesc/Android.mk
+++ b/lib/Target/AArch64/MCTargetDesc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-aarch64_mc_desc_TBLGEN_TABLES70 := \
+aarch64_mc_desc_TBLGEN_TABLES80 := \
   AArch64GenRegisterInfo.inc \
   AArch64GenInstrInfo.inc \
   AArch64GenMCCodeEmitter.inc \
@@ -23,41 +23,41 @@ aarch64_mc_desc_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
 
-LOCAL_MODULE:= libLLVM70AArch64Desc
+LOCAL_MODULE:= libLLVM80AArch64Desc
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(aarch64_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(aarch64_mc_desc_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(aarch64_mc_desc_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70AArch64Desc
+LOCAL_MODULE:= libLLVM80AArch64Desc
 
 LOCAL_SRC_FILES := $(aarch64_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(aarch64_mc_desc_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(aarch64_mc_desc_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/TargetInfo/Android.mk b/lib/Target/AArch64/TargetInfo/Android.mk
index 5a37fb4..9109cb0 100644 (file)
--- a/lib/Target/AArch64/TargetInfo/Android.mk
+++ b/lib/Target/AArch64/TargetInfo/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-aarch64_target_info_TBLGEN_TABLES70 := \
+aarch64_target_info_TBLGEN_TABLES80 := \
   AArch64GenSubtargetInfo.inc \
   AArch64GenRegisterInfo.inc \
   AArch64GenInstrInfo.inc
@@ -11,43 +11,43 @@ aarch64_target_info_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(aarch64_target_info_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(aarch64_target_info_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(aarch64_target_info_SRC_FILES)
 
 LOCAL_C_INCLUDES +=    \
        $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70AArch64Info
+LOCAL_MODULE:= libLLVM80AArch64Info
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(aarch64_target_info_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(aarch64_target_info_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(aarch64_target_info_SRC_FILES)
 
 LOCAL_C_INCLUDES +=    \
        $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70AArch64Info
+LOCAL_MODULE:= libLLVM80AArch64Info
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/Utils/Android.mk b/lib/Target/AArch64/Utils/Android.mk
index efa5c71..cecedd6 100644 (file)
--- a/lib/Target/AArch64/Utils/Android.mk
+++ b/lib/Target/AArch64/Utils/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-aarch64_utils_TBLGEN_TABLES70 := \
+aarch64_utils_TBLGEN_TABLES80 := \
   AArch64GenRegisterInfo.inc \
   AArch64GenInstrInfo.inc \
   AArch64GenSubtargetInfo.inc \
@@ -18,14 +18,14 @@ LOCAL_SRC_FILES := $(aarch64_utils_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70AArch64Utils
+LOCAL_MODULE:= libLLVM80AArch64Utils
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(aarch64_utils_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(aarch64_utils_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
@@ -37,14 +37,14 @@ LOCAL_SRC_FILES := $(aarch64_utils_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70AArch64Utils
+LOCAL_MODULE:= libLLVM80AArch64Utils
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(aarch64_utils_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(aarch64_utils_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/Target/AMDGPU/Android.mk b/lib/Target/AMDGPU/Android.mk
index 0403861..d749aff 100644 (file)
--- a/lib/Target/AMDGPU/Android.mk
+++ b/lib/Target/AMDGPU/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-amdgpu_codegen_TBLGEN_TABLES70 := \
+amdgpu_codegen_TBLGEN_TABLES80 := \
   AMDGPUGenRegisterInfo.inc \
   AMDGPUGenInstrInfo.inc \
   AMDGPUGenDAGISel.inc  \
@@ -114,7 +114,7 @@ amdgpu_codegen_SRC_FILES := \
   SIModeRegister.cpp
 
 ifeq ($(FORCE_BUILD_LLVM_GLOBAL_ISEL),true)
-amdgpu_codegen_TBLGEN_TABLES70 += \
+amdgpu_codegen_TBLGEN_TABLES80 += \
   AMDGPUGenRegisterBank.inc
 
 amdgpu_codegen_SRC_FILES += \
@@ -127,37 +127,37 @@ endif
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(amdgpu_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(amdgpu_codegen_TBLGEN_TABLES80)
 
 LOCAL_SRC_FILES := $(amdgpu_codegen_SRC_FILES)
 
-LOCAL_MODULE := libLLVM70AMDGPUCodeGen
+LOCAL_MODULE := libLLVM80AMDGPUCodeGen
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(amdgpu_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(amdgpu_codegen_TBLGEN_TABLES80)
 
 LOCAL_SRC_FILES := $(amdgpu_codegen_SRC_FILES)
 
-LOCAL_MODULE := libLLVM70AMDGPUCodeGen
+LOCAL_MODULE := libLLVM80AMDGPUCodeGen
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AMDGPU/AsmParser/Android.mk b/lib/Target/AMDGPU/AsmParser/Android.mk
index 2bfe29c..8c9ad47 100644 (file)
--- a/lib/Target/AMDGPU/AsmParser/Android.mk
+++ b/lib/Target/AMDGPU/AsmParser/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 amdgpu_asm_parser_SRC_FILES := \
   AMDGPUAsmParser.cpp
 
-amdgpu_asm_parser_TBLGEN_TABLES70 := \
+amdgpu_asm_parser_TBLGEN_TABLES80 := \
   AMDGPUGenAsmMatcher.inc \
   AMDGPUGenInstrInfo.inc \
   AMDGPUGenRegisterInfo.inc \
@@ -13,7 +13,7 @@ amdgpu_asm_parser_TBLGEN_TABLES70 := \
   R600GenRegisterInfo.inc \
   R600GenSubtargetInfo.inc
 
-amdgpu_asm_parser_TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+amdgpu_asm_parser_TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 amdgpu_asm_parser_C_INCLUDES :=        $(LOCAL_PATH)/..
 
@@ -21,19 +21,19 @@ amdgpu_asm_parser_C_INCLUDES :=     $(LOCAL_PATH)/..
 # libAMDGPUAsmParser (host)
 #===---------------------------------------------------------------===
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUAsmParser
+LOCAL_MODULE := libLLVM80AMDGPUAsmParser
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(amdgpu_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES := $(amdgpu_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(amdgpu_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(amdgpu_asm_parser_TBLGEN_TD_DIR70)
+TBLGEN_TABLES80 := $(amdgpu_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(amdgpu_asm_parser_TBLGEN_TD_DIR80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
@@ -42,17 +42,17 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 #===---------------------------------------------------------------===
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUAsmParser
+LOCAL_MODULE := libLLVM80AMDGPUAsmParser
 LOCAL_SRC_FILES := $(amdgpu_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES := $(amdgpu_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(amdgpu_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(amdgpu_asm_parser_TBLGEN_TD_DIR70)
+TBLGEN_TABLES80 := $(amdgpu_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(amdgpu_asm_parser_TBLGEN_TD_DIR80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AMDGPU/Disassembler/Android.mk b/lib/Target/AMDGPU/Disassembler/Android.mk
index bce5e8d..51dba20 100644 (file)
--- a/lib/Target/AMDGPU/Disassembler/Android.mk
+++ b/lib/Target/AMDGPU/Disassembler/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-amdgpu_disassembler_TBLGEN_TABLES70 := \
+amdgpu_disassembler_TBLGEN_TABLES80 := \
   AMDGPUGenAsmWriter.inc \
   AMDGPUGenInstrInfo.inc \
   AMDGPUGenRegisterInfo.inc \
@@ -12,36 +12,36 @@ amdgpu_disassembler_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUAsmDisassembler
+LOCAL_MODULE := libLLVM80AMDGPUAsmDisassembler
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(amdgpu_disassembler_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TABLES70 := $(amdgpu_disassembler_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_disassembler_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUDisassembler
+LOCAL_MODULE := libLLVM80AMDGPUDisassembler
 
 LOCAL_SRC_FILES := $(amdgpu_disassembler_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TABLES70 := $(amdgpu_disassembler_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_disassembler_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AMDGPU/InstPrinter/Android.mk b/lib/Target/AMDGPU/InstPrinter/Android.mk
index 5a235e0..587d519 100644 (file)
--- a/lib/Target/AMDGPU/InstPrinter/Android.mk
+++ b/lib/Target/AMDGPU/InstPrinter/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-amdgpu_instprinter_TBLGEN_TABLES70 := \
+amdgpu_instprinter_TBLGEN_TABLES80 := \
   AMDGPUGenAsmWriter.inc \
   AMDGPUGenInstrInfo.inc \
   AMDGPUGenRegisterInfo.inc \
@@ -17,36 +17,36 @@ amdgpu_instprinter_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUAsmPrinter
+LOCAL_MODULE := libLLVM80AMDGPUAsmPrinter
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(amdgpu_instprinter_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TABLES70 := $(amdgpu_instprinter_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_instprinter_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUAsmPrinter
+LOCAL_MODULE := libLLVM80AMDGPUAsmPrinter
 
 LOCAL_SRC_FILES := $(amdgpu_instprinter_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TABLES70 := $(amdgpu_instprinter_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_instprinter_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AMDGPU/MCTargetDesc/Android.mk b/lib/Target/AMDGPU/MCTargetDesc/Android.mk
index cabda03..837de7a 100644 (file)
--- a/lib/Target/AMDGPU/MCTargetDesc/Android.mk
+++ b/lib/Target/AMDGPU/MCTargetDesc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-amdgpu_mc_desc_TBLGEN_TABLES70 := \
+amdgpu_mc_desc_TBLGEN_TABLES80 := \
   AMDGPUGenRegisterInfo.inc \
   AMDGPUGenInstrInfo.inc \
   AMDGPUGenMCCodeEmitter.inc \
@@ -26,40 +26,40 @@ amdgpu_mc_desc_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUDesc
+LOCAL_MODULE := libLLVM80AMDGPUDesc
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(amdgpu_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(amdgpu_mc_desc_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_mc_desc_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUDesc
+LOCAL_MODULE := libLLVM80AMDGPUDesc
 
 LOCAL_SRC_FILES := $(amdgpu_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(amdgpu_mc_desc_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_mc_desc_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AMDGPU/TargetInfo/Android.mk b/lib/Target/AMDGPU/TargetInfo/Android.mk
index ca5449e..5d47edf 100644 (file)
--- a/lib/Target/AMDGPU/TargetInfo/Android.mk
+++ b/lib/Target/AMDGPU/TargetInfo/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-amdgpu_target_info_TBLGEN_TABLES70 := \
+amdgpu_target_info_TBLGEN_TABLES80 := \
   AMDGPUGenInstrInfo.inc \
   AMDGPUGenIntrinsicEnums.inc \
   AMDGPUGenIntrinsicImpl.inc \
@@ -17,40 +17,40 @@ amdgpu_target_info_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUInfo
+LOCAL_MODULE := libLLVM80AMDGPUInfo
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-TBLGEN_TABLES70 := $(amdgpu_target_info_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_target_info_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(amdgpu_target_info_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := libLLVM70AMDGPUInfo
+LOCAL_MODULE := libLLVM80AMDGPUInfo
 
-TBLGEN_TABLES70 := $(amdgpu_target_info_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_target_info_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(amdgpu_target_info_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AMDGPU/Utils/Android.mk b/lib/Target/AMDGPU/Utils/Android.mk
index 3d4d13f..43454b8 100644 (file)
--- a/lib/Target/AMDGPU/Utils/Android.mk
+++ b/lib/Target/AMDGPU/Utils/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-amdgpu_utils_TBLGEN_TABLES70 := \
+amdgpu_utils_TBLGEN_TABLES80 := \
   AMDGPUGenRegisterInfo.inc \
   AMDGPUGenSubtargetInfo.inc \
   AMDGPUGenInstrInfo.inc \
@@ -24,17 +24,17 @@ LOCAL_SRC_FILES := $(amdgpu_utils_SRC_FILES)
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-LOCAL_MODULE := libLLVM70AMDGPUUtils
+LOCAL_MODULE := libLLVM80AMDGPUUtils
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(amdgpu_utils_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_utils_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -46,14 +46,14 @@ LOCAL_SRC_FILES := $(amdgpu_utils_SRC_FILES)
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-LOCAL_MODULE := libLLVM70AMDGPUUtils
+LOCAL_MODULE := libLLVM80AMDGPUUtils
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(amdgpu_utils_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(amdgpu_utils_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index b121a60..e266a68 100644 (file)
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-arm_codegen_TBLGEN_TABLES70 := \
+arm_codegen_TBLGEN_TABLES80 := \
   ARMGenRegisterInfo.inc \
   ARMGenInstrInfo.inc \
   ARMGenCodeEmitter.inc \
@@ -52,7 +52,7 @@ arm_codegen_SRC_FILES := \
   ARMComputeBlockSize.cpp
 
 ifeq ($(FORCE_BUILD_LLVM_GLOBAL_ISEL),true)
-arm_codegen_TBLGEN_TABLES70 += \
+arm_codegen_TBLGEN_TABLES80 += \
   ARMGenRegisterBank.inc \
   ARMGenGlobalISel.inc
 
@@ -66,36 +66,36 @@ endif
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70ARMCodeGen
+LOCAL_MODULE:= libLLVM80ARMCodeGen
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
-TBLGEN_TABLES70 := $(arm_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(arm_codegen_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70ARMCodeGen
+LOCAL_MODULE:= libLLVM80ARMCodeGen
 
 LOCAL_SRC_FILES := $(arm_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
-TBLGEN_TABLES70 := $(arm_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(arm_codegen_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk
index f930c01..d507471 100644 (file)
--- a/lib/Target/ARM/AsmParser/Android.mk
+++ b/lib/Target/ARM/AsmParser/Android.mk
@@ -7,14 +7,14 @@ LOCAL_PATH := $(call my-dir)
 arm_asm_parser_SRC_FILES := \
   ARMAsmParser.cpp
 
-arm_asm_parser_TBLGEN_TABLES70 := \
+arm_asm_parser_TBLGEN_TABLES80 := \
   ARMGenInstrInfo.inc \
   ARMGenRegisterInfo.inc \
   ARMGenAsmMatcher.inc \
   ARMGenSubtargetInfo.inc \
   ARMGenSystemRegister.inc
 
-arm_asm_parser_TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+arm_asm_parser_TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 arm_asm_parser_C_INCLUDES := $(LOCAL_PATH)/..
 
@@ -23,17 +23,17 @@ arm_asm_parser_C_INCLUDES := $(LOCAL_PATH)/..
 # libARMAsmParser (host)
 #===---------------------------------------------------------------===
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70ARMAsmParser
+LOCAL_MODULE:= libLLVM80ARMAsmParser
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(arm_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(arm_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(arm_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(arm_asm_parser_TBLGEN_TD_DIR70)
+TBLGEN_TABLES80 := $(arm_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(arm_asm_parser_TBLGEN_TD_DIR80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 # Override the default optimization level to work around taking forever (~50m)
 # to compile ARMAsmParser.cpp on Mac with gcc 4.2,
 # or on Linux with mingw32msvc-gcc 4.2, which is used to cross-compile
@@ -48,15 +48,15 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 #===---------------------------------------------------------------===
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70ARMAsmParser
+LOCAL_MODULE:= libLLVM80ARMAsmParser
 LOCAL_SRC_FILES := $(arm_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(arm_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(arm_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(arm_asm_parser_TBLGEN_TD_DIR70)
+TBLGEN_TABLES80 := $(arm_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(arm_asm_parser_TBLGEN_TD_DIR80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index 6993966..09eb672 100644 (file)
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-arm_disassembler_TBLGEN_TABLES70 := \
+arm_disassembler_TBLGEN_TABLES80 := \
   ARMGenDisassemblerTables.inc \
   ARMGenInstrInfo.inc \
   ARMGenSubtargetInfo.inc \
@@ -14,41 +14,41 @@ arm_disassembler_SRC_FILES := \
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(arm_disassembler_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(arm_disassembler_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(arm_disassembler_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70ARMDisassembler
+LOCAL_MODULE:= libLLVM80ARMDisassembler
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(arm_disassembler_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(arm_disassembler_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(arm_disassembler_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70ARMDisassembler
+LOCAL_MODULE:= libLLVM80ARMDisassembler
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 

diff --git a/lib/Target/ARM/InstPrinter/Android.mk b/lib/Target/ARM/InstPrinter/Android.mk
index 3b962a8..1bcd714 100644 (file)
--- a/lib/Target/ARM/InstPrinter/Android.mk
+++ b/lib/Target/ARM/InstPrinter/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-arm_asm_printer_TBLGEN_TABLES70 := \
+arm_asm_printer_TBLGEN_TABLES80 := \
   ARMGenAsmWriter.inc \
   ARMGenRegisterInfo.inc \
   ARMGenSubtargetInfo.inc \
@@ -13,48 +13,48 @@ arm_asm_printer_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(arm_asm_printer_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(arm_asm_printer_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(arm_asm_printer_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70ARMAsmPrinter
+LOCAL_MODULE:= libLLVM80ARMAsmPrinter
 
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/..
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(arm_asm_printer_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(arm_asm_printer_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(arm_asm_printer_SRC_FILES)
 
 LOCAL_C_INCLUDES+= \
     $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70ARMAsmPrinter
+LOCAL_MODULE:= libLLVM80ARMAsmPrinter
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 

diff --git a/lib/Target/ARM/MCTargetDesc/Android.mk b/lib/Target/ARM/MCTargetDesc/Android.mk
index 42b88ba..f49c1e5 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/Android.mk
+++ b/lib/Target/ARM/MCTargetDesc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-arm_mc_desc_TBLGEN_TABLES70 := \
+arm_mc_desc_TBLGEN_TABLES80 := \
   ARMGenRegisterInfo.inc \
   ARMGenInstrInfo.inc \
   ARMGenMCCodeEmitter.inc \
@@ -25,42 +25,42 @@ arm_mc_desc_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
 
-LOCAL_MODULE:= libLLVM70ARMDesc
+LOCAL_MODULE:= libLLVM80ARMDesc
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(arm_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(arm_mc_desc_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(arm_mc_desc_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70ARMDesc
+LOCAL_MODULE:= libLLVM80ARMDesc
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(arm_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(arm_mc_desc_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(arm_mc_desc_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index ea505b1..5025f11 100644 (file)
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-arm_target_info_TBLGEN_TABLES70 := \
+arm_target_info_TBLGEN_TABLES80 := \
   ARMGenSubtargetInfo.inc \
   ARMGenRegisterInfo.inc \
   ARMGenInstrInfo.inc
@@ -11,45 +11,45 @@ arm_target_info_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(arm_target_info_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(arm_target_info_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(arm_target_info_SRC_FILES)
 
 LOCAL_C_INCLUDES +=    \
        $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70ARMInfo
+LOCAL_MODULE:= libLLVM80ARMInfo
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(arm_target_info_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(arm_target_info_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(arm_target_info_SRC_FILES)
 
 LOCAL_C_INCLUDES +=    \
        $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70ARMInfo
+LOCAL_MODULE:= libLLVM80ARMInfo
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/Utils/Android.mk b/lib/Target/ARM/Utils/Android.mk
index b69e6f8..3005a48 100644 (file)
--- a/lib/Target/ARM/Utils/Android.mk
+++ b/lib/Target/ARM/Utils/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-arm_utils_TBLGEN_TABLES70 := \
+arm_utils_TBLGEN_TABLES80 := \
   ARMGenRegisterInfo.inc \
   ARMGenInstrInfo.inc \
   ARMGenSubtargetInfo.inc \
@@ -19,14 +19,14 @@ LOCAL_SRC_FILES := $(arm_utils_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70ARMUtils
+LOCAL_MODULE:= libLLVM80ARMUtils
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(arm_utils_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(arm_utils_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
@@ -38,14 +38,14 @@ LOCAL_SRC_FILES := $(arm_utils_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70ARMUtils
+LOCAL_MODULE:= libLLVM80ARMUtils
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(arm_utils_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(arm_utils_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk
index 520a39f..f523e65 100644 (file)
--- a/lib/Target/Android.mk
+++ b/lib/Target/Android.mk
@@ -13,13 +13,13 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(target_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Target
+LOCAL_MODULE:= libLLVM80Target
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -29,10 +29,10 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(target_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Target
+LOCAL_MODULE:= libLLVM80Target
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index c112979..125df84 100644 (file)
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-mips_codegen_TBLGEN_TABLES70 := \
+mips_codegen_TBLGEN_TABLES80 := \
   MipsGenRegisterBank.inc \
   MipsGenRegisterInfo.inc \
   MipsGenInstrInfo.inc \
@@ -59,38 +59,38 @@ mips_codegen_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsCodeGen
+LOCAL_MODULE:= libLLVM80MipsCodeGen
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(mips_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
 
-TBLGEN_TABLES70 := $(mips_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(mips_codegen_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsCodeGen
+LOCAL_MODULE:= libLLVM80MipsCodeGen
 
 LOCAL_SRC_FILES := $(mips_codegen_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/MCTargetDesc
 
-TBLGEN_TABLES70 := $(mips_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(mips_codegen_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/Mips/AsmParser/Android.mk b/lib/Target/Mips/AsmParser/Android.mk
index 7a6d526..609237a 100644 (file)
--- a/lib/Target/Mips/AsmParser/Android.mk
+++ b/lib/Target/Mips/AsmParser/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 #===---------------------------------------------------------------===
-# libLLVM70MipsAsmParser (common)
+# libLLVM80MipsAsmParser (common)
 #===---------------------------------------------------------------===
 
 mips_asm_parser_SRC_FILES := \
@@ -9,49 +9,49 @@ mips_asm_parser_SRC_FILES := \
 
 mips_asm_parser_C_INCLUDES := $(LOCAL_PATH)/..
 
-mips_asm_parser_TBLGEN_TABLES70 := \
+mips_asm_parser_TBLGEN_TABLES80 := \
   MipsGenAsmMatcher.inc \
   MipsGenInstrInfo.inc \
   MipsGenRegisterInfo.inc \
   MipsGenSubtargetInfo.inc
 
-mips_asm_parser_TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+mips_asm_parser_TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 
 #===---------------------------------------------------------------===
-# libLLVM70MipsAsmParser (host)
+# libLLVM80MipsAsmParser (host)
 #===---------------------------------------------------------------===
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsAsmParser
+LOCAL_MODULE:= libLLVM80MipsAsmParser
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(mips_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(mips_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(mips_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
 #===---------------------------------------------------------------===
-# libLLVM70MipsAsmParser (target)
+# libLLVM80MipsAsmParser (target)
 #===---------------------------------------------------------------===
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsAsmParser
+LOCAL_MODULE:= libLLVM80MipsAsmParser
 LOCAL_SRC_FILES := $(mips_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(mips_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(mips_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/Mips/Disassembler/Android.mk b/lib/Target/Mips/Disassembler/Android.mk
index 824c067..fa69913 100644 (file)
--- a/lib/Target/Mips/Disassembler/Android.mk
+++ b/lib/Target/Mips/Disassembler/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-mips_disassembler_TBLGEN_TABLES70 := \
+mips_disassembler_TBLGEN_TABLES80 := \
   MipsGenDisassemblerTables.inc \
   MipsGenInstrInfo.inc \
   MipsGenRegisterInfo.inc \
@@ -13,39 +13,39 @@ mips_disassembler_SRC_FILES := \
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsDisassembler
+LOCAL_MODULE:= libLLVM80MipsDisassembler
 
 LOCAL_SRC_FILES := $(mips_disassembler_SRC_FILES)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-TBLGEN_TABLES70 := $(mips_disassembler_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_disassembler_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsDisassembler
+LOCAL_MODULE:= libLLVM80MipsDisassembler
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(mips_disassembler_SRC_FILES)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-TBLGEN_TABLES70 := $(mips_disassembler_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_disassembler_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/Target/Mips/InstPrinter/Android.mk b/lib/Target/Mips/InstPrinter/Android.mk
index 5d37e50..702526f 100644 (file)
--- a/lib/Target/Mips/InstPrinter/Android.mk
+++ b/lib/Target/Mips/InstPrinter/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-mips_asm_printer_TBLGEN_TABLES70 := \
+mips_asm_printer_TBLGEN_TABLES80 := \
   MipsGenAsmWriter.inc \
   MipsGenRegisterInfo.inc \
   MipsGenSubtargetInfo.inc \
@@ -12,40 +12,40 @@ mips_asm_printer_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsAsmPrinter
+LOCAL_MODULE:= libLLVM80MipsAsmPrinter
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-TBLGEN_TABLES70 := $(mips_asm_printer_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_asm_printer_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(mips_asm_printer_SRC_FILES)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsAsmPrinter
+LOCAL_MODULE:= libLLVM80MipsAsmPrinter
 
-TBLGEN_TABLES70 := $(mips_asm_printer_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_asm_printer_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(mips_asm_printer_SRC_FILES)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/Mips/MCTargetDesc/Android.mk b/lib/Target/Mips/MCTargetDesc/Android.mk
index 87d8aa4..a6a33f1 100644 (file)
--- a/lib/Target/Mips/MCTargetDesc/Android.mk
+++ b/lib/Target/Mips/MCTargetDesc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-mips_mc_desc_TBLGEN_TABLES70 := \
+mips_mc_desc_TBLGEN_TABLES80 := \
   MipsGenRegisterInfo.inc \
   MipsGenInstrInfo.inc \
   MipsGenMCCodeEmitter.inc \
@@ -23,40 +23,40 @@ mips_mc_desc_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsDesc
+LOCAL_MODULE:= libLLVM80MipsDesc
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(mips_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(mips_mc_desc_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_mc_desc_TBLGEN_TABLES80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsDesc
+LOCAL_MODULE:= libLLVM80MipsDesc
 
 LOCAL_SRC_FILES := $(mips_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(mips_mc_desc_TBLGEN_TABLES70)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_mc_desc_TBLGEN_TABLES80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/Mips/TargetInfo/Android.mk b/lib/Target/Mips/TargetInfo/Android.mk
index 5626ec9..4631773 100644 (file)
--- a/lib/Target/Mips/TargetInfo/Android.mk
+++ b/lib/Target/Mips/TargetInfo/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-mips_target_info_TBLGEN_TABLES70 := \
+mips_target_info_TBLGEN_TABLES80 := \
   MipsGenInstrInfo.inc \
   MipsGenRegisterInfo.inc \
   MipsGenSubtargetInfo.inc
@@ -11,40 +11,40 @@ mips_target_info_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsInfo
+LOCAL_MODULE:= libLLVM80MipsInfo
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-TBLGEN_TABLES70 := $(mips_target_info_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_target_info_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(mips_target_info_SRC_FILES)
 LOCAL_C_INCLUDES +=    $(LOCAL_PATH)/..
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70MipsInfo
+LOCAL_MODULE:= libLLVM80MipsInfo
 
-TBLGEN_TABLES70 := $(mips_target_info_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(mips_target_info_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(mips_target_info_SRC_FILES)
 LOCAL_C_INCLUDES +=    $(LOCAL_PATH)/..
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index a135708..fd303ef 100644 (file)
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-x86_codegen_TBLGEN_TABLES70 := \
+x86_codegen_TBLGEN_TABLES80 := \
   X86GenAsmMatcher.inc \
   X86GenAsmWriter.inc \
   X86GenAsmWriter1.inc \
@@ -59,7 +59,7 @@ x86_codegen_SRC_FILES := \
   X86WinEHState.cpp \
 
 ifeq ($(FORCE_BUILD_LLVM_GLOBAL_ISEL),true)
-x86_codegen_TBLGEN_TABLES70 += \
+x86_codegen_TBLGEN_TABLES80 += \
   X86GenRegisterBank.inc \
   X86GenGlobalISel.inc
 
@@ -73,37 +73,37 @@ endif
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(x86_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(x86_codegen_TBLGEN_TABLES80)
 
 LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70X86CodeGen
+LOCAL_MODULE:= libLLVM80X86CodeGen
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(x86_codegen_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(x86_codegen_TBLGEN_TABLES80)
 
 LOCAL_SRC_FILES := $(x86_codegen_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70X86CodeGen
+LOCAL_MODULE:= libLLVM80X86CodeGen
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/AsmParser/Android.mk b/lib/Target/X86/AsmParser/Android.mk
index ac230a1..65194cc 100644 (file)
--- a/lib/Target/X86/AsmParser/Android.mk
+++ b/lib/Target/X86/AsmParser/Android.mk
@@ -3,19 +3,19 @@ LOCAL_PATH := $(call my-dir)
 # For the device only
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
 x86_asm_parser_SRC_FILES :=    \
        X86AsmInstrumentation.cpp \
        X86AsmParser.cpp
 
-x86_asm_parser_TBLGEN_TABLES70 :=      \
+x86_asm_parser_TBLGEN_TABLES80 :=      \
        X86GenAsmMatcher.inc    \
        X86GenInstrInfo.inc     \
        X86GenRegisterInfo.inc \
        X86GenSubtargetInfo.inc
 
-x86_asm_parser_TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+x86_asm_parser_TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 x86_asm_parser_C_INCLUDES +=   \
        $(LOCAL_PATH)/..
@@ -25,19 +25,19 @@ x86_asm_parser_C_INCLUDES +=        \
 # libX86AsmParser (host)
 #===---------------------------------------------------------------===
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70X86AsmParser
+LOCAL_MODULE:= libLLVM80X86AsmParser
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(x86_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(x86_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(x86_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(x86_asm_parser_TBLGEN_TD_DIR70)
+TBLGEN_TABLES80 := $(x86_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(x86_asm_parser_TBLGEN_TD_DIR80)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
@@ -46,17 +46,17 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 #===---------------------------------------------------------------===
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70X86AsmParser
+LOCAL_MODULE:= libLLVM80X86AsmParser
 LOCAL_SRC_FILES := $(x86_asm_parser_SRC_FILES)
 LOCAL_C_INCLUDES += $(x86_asm_parser_C_INCLUDES)
-TBLGEN_TABLES70 := $(x86_asm_parser_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(x86_asm_parser_TBLGEN_TD_DIR70)
+TBLGEN_TABLES80 := $(x86_asm_parser_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(x86_asm_parser_TBLGEN_TD_DIR80)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/Disassembler/Android.mk b/lib/Target/X86/Disassembler/Android.mk
index fb8ed31..c848636 100644 (file)
--- a/lib/Target/X86/Disassembler/Android.mk
+++ b/lib/Target/X86/Disassembler/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-x86_disassembler_TBLGEN_TABLES70 := \
+x86_disassembler_TBLGEN_TABLES80 := \
   X86GenDisassemblerTables.inc \
   X86GenInstrInfo.inc \
   X86GenRegisterInfo.inc \
@@ -15,41 +15,41 @@ x86_disassembler_SRC_FILES := \
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(x86_disassembler_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(x86_disassembler_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(x86_disassembler_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70X86Disassembler
+LOCAL_MODULE:= libLLVM80X86Disassembler
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(x86_disassembler_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(x86_disassembler_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(x86_disassembler_SRC_FILES)
 
 LOCAL_C_INCLUDES +=    \
        $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70X86Disassembler
+LOCAL_MODULE:= libLLVM80X86Disassembler
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/Target/X86/InstPrinter/Android.mk b/lib/Target/X86/InstPrinter/Android.mk
index 567b26f..ce20ea5 100644 (file)
--- a/lib/Target/X86/InstPrinter/Android.mk
+++ b/lib/Target/X86/InstPrinter/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-x86_instprinter_TBLGEN_TABLES70 := \
+x86_instprinter_TBLGEN_TABLES80 := \
   X86GenAsmWriter.inc \
   X86GenAsmWriter1.inc \
   X86GenInstrInfo.inc \
@@ -17,44 +17,44 @@ x86_instprinter_SRC_FILES := \
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(x86_instprinter_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(x86_instprinter_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(x86_instprinter_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70X86AsmPrinter
+LOCAL_MODULE:= libLLVM80X86AsmPrinter
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(x86_instprinter_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(x86_instprinter_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(x86_instprinter_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE := libLLVM70X86AsmPrinter
+LOCAL_MODULE := libLLVM80X86AsmPrinter
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
index 5ae7372..84cc6ce 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ b/lib/Target/X86/MCTargetDesc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-x86_mc_desc_TBLGEN_TABLES70 := \
+x86_mc_desc_TBLGEN_TABLES80 := \
   X86GenRegisterInfo.inc \
   X86GenInstrInfo.inc \
   X86GenSubtargetInfo.inc
@@ -19,37 +19,37 @@ x86_mc_desc_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE:= libLLVM70X86Desc
+LOCAL_MODULE:= libLLVM80X86Desc
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(x86_mc_desc_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(x86_mc_desc_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
 
-LOCAL_MODULE:= libLLVM70X86Desc
+LOCAL_MODULE:= libLLVM80X86Desc
 
 LOCAL_SRC_FILES := $(x86_mc_desc_SRC_FILES)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
-TBLGEN_TABLES70 := $(x86_mc_desc_TBLGEN_TABLES70)
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TABLES80 := $(x86_mc_desc_TBLGEN_TABLES80)
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk
index 1d9b3ef..52f87c5 100644 (file)
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ b/lib/Target/X86/TargetInfo/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-x86_target_info_TBLGEN_TABLES70 := \
+x86_target_info_TBLGEN_TABLES80 := \
   X86GenRegisterInfo.inc \
   X86GenSubtargetInfo.inc \
   X86GenInstrInfo.inc
@@ -11,43 +11,43 @@ x86_target_info_SRC_FILES := \
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(x86_target_info_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(x86_target_info_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(x86_target_info_SRC_FILES)
 
 LOCAL_C_INCLUDES +=    \
        $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70X86Info
+LOCAL_MODULE:= libLLVM80X86Info
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
 # =====================================================
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-TBLGEN_TABLES70 := $(x86_target_info_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(x86_target_info_TBLGEN_TABLES80)
 
-TBLGEN_TD_DIR70 := $(LOCAL_PATH)/..
+TBLGEN_TD_DIR80 := $(LOCAL_PATH)/..
 
 LOCAL_SRC_FILES := $(x86_target_info_SRC_FILES)
 
 LOCAL_C_INCLUDES +=     \
         $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70X86Info
+LOCAL_MODULE:= libLLVM80X86Info
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/Utils/Android.mk b/lib/Target/X86/Utils/Android.mk
index c05edaf..4349527 100644 (file)
--- a/lib/Target/X86/Utils/Android.mk
+++ b/lib/Target/X86/Utils/Android.mk
@@ -12,9 +12,9 @@ LOCAL_SRC_FILES := $(x86_utils_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70X86Utils
+LOCAL_MODULE:= libLLVM80X86Utils
 
-include $(LLVM70_DEVICE_BUILD_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
@@ -26,9 +26,9 @@ LOCAL_SRC_FILES := $(x86_utils_SRC_FILES)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_MODULE:= libLLVM70X86Utils
+LOCAL_MODULE:= libLLVM80X86Utils
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/ToolDrivers/llvm-lib/Android.mk b/lib/ToolDrivers/llvm-lib/Android.mk
index da39e12..8bea626 100644 (file)
--- a/lib/ToolDrivers/llvm-lib/Android.mk
+++ b/lib/ToolDrivers/llvm-lib/Android.mk
@@ -3,38 +3,38 @@ LOCAL_PATH:= $(call my-dir)
 LibDriver_SRC_FILES := \
   LibDriver.cpp
 
-LibDriver_TBLGEN_TABLES70 := \
+LibDriver_TBLGEN_TABLES80 := \
   Options.inc
 
 
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
 LOCAL_SRC_FILES := $(LibDriver_SRC_FILES)
-TBLGEN_TABLES70 := $(LibDriver_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(LibDriver_TBLGEN_TABLES80)
 
-LOCAL_MODULE:= libLLVM70LibDriver
+LOCAL_MODULE:= libLLVM80LibDriver
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 
 LOCAL_SRC_FILES := $(LibDriver_SRC_FILES)
-TBLGEN_TABLES70 := $(LibDriver_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(LibDriver_TBLGEN_TABLES80)
 
-LOCAL_MODULE:= libLLVM70LibDriver
+LOCAL_MODULE:= libLLVM80LibDriver
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/AggressiveInstCombine/Android.mk b/lib/Transforms/AggressiveInstCombine/Android.mk
index 6392c4a..c95f832 100644 (file)
--- a/lib/Transforms/AggressiveInstCombine/Android.mk
+++ b/lib/Transforms/AggressiveInstCombine/Android.mk
@@ -9,13 +9,13 @@ transforms_aggressive_inst_combine_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_aggressive_inst_combine_SRC_FILES)
-LOCAL_MODULE:= libLLVM70AggressiveInstCombine
+LOCAL_MODULE:= libLLVM80AggressiveInstCombine
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -24,10 +24,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_aggressive_inst_combine_SRC_FILES)
-LOCAL_MODULE:= libLLVM70AggressiveInstCombine
+LOCAL_MODULE:= libLLVM80AggressiveInstCombine
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Coroutines/Android.mk b/lib/Transforms/Coroutines/Android.mk
index 52626f8..d4dcdf2 100644 (file)
--- a/lib/Transforms/Coroutines/Android.mk
+++ b/lib/Transforms/Coroutines/Android.mk
@@ -15,13 +15,13 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES :=     \
        $(transforms_coroutines_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70Coroutines
+LOCAL_MODULE:= libLLVM80Coroutines
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -30,10 +30,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_coroutines_SRC_FILES)
-LOCAL_MODULE:= libLLVM70Coroutines
+LOCAL_MODULE:= libLLVM80Coroutines
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Hello/Android.mk b/lib/Transforms/Hello/Android.mk
index 4086357..824a6e3 100644 (file)
--- a/lib/Transforms/Hello/Android.mk
+++ b/lib/Transforms/Hello/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../../..
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../../..
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 transforms_hello_SRC_FILES := \
   Hello.cpp
@@ -12,10 +12,10 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_hello_SRC_FILES)
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE:= LLVM70Hello
+LOCAL_MODULE:= LLVM80Hello
 
 LOCAL_LDFLAGS_darwin := -Wl,-undefined -Wl,dynamic_lookup
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/lib/Transforms/IPO/Android.mk b/lib/Transforms/IPO/Android.mk
index afb9392..f5ce7b7 100644 (file)
--- a/lib/Transforms/IPO/Android.mk
+++ b/lib/Transforms/IPO/Android.mk
@@ -43,13 +43,13 @@ transforms_ipo_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_ipo_SRC_FILES)
-LOCAL_MODULE:= libLLVM70ipo
+LOCAL_MODULE:= libLLVM80ipo
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -58,10 +58,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_ipo_SRC_FILES)
-LOCAL_MODULE:= libLLVM70ipo
+LOCAL_MODULE:= libLLVM80ipo
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/InstCombine/Android.mk b/lib/Transforms/InstCombine/Android.mk
index ec9f9f5..eff8589 100644 (file)
--- a/lib/Transforms/InstCombine/Android.mk
+++ b/lib/Transforms/InstCombine/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 
-transforms_inst_combine_TBLGEN_TABLES70 := \
+transforms_inst_combine_TBLGEN_TABLES80 := \
   InstCombineTables.inc
 
 transforms_inst_combine_SRC_FILES := \
@@ -22,16 +22,16 @@ transforms_inst_combine_SRC_FILES := \
 # =====================================================
 include $(CLEAR_VARS)
 
-TBLGEN_TABLES70 := $(transforms_inst_combine_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(transforms_inst_combine_TBLGEN_TABLES80)
 LOCAL_SRC_FILES := $(transforms_inst_combine_SRC_FILES)
-LOCAL_MODULE:= libLLVM70InstCombine
+LOCAL_MODULE:= libLLVM80InstCombine
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -39,13 +39,13 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-TBLGEN_TABLES70 := $(transforms_inst_combine_TBLGEN_TABLES70)
+TBLGEN_TABLES80 := $(transforms_inst_combine_TBLGEN_TABLES80)
 LOCAL_SRC_FILES := $(transforms_inst_combine_SRC_FILES)
-LOCAL_MODULE:= libLLVM70InstCombine
+LOCAL_MODULE:= libLLVM80InstCombine
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_TBLGEN_RULES_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index eebad3d..d042e0a 100644 (file)
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -21,13 +21,13 @@ instrumentation_SRC_FILES := \
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70Instrumentation
+LOCAL_MODULE:= libLLVM80Instrumentation
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(instrumentation_SRC_FILES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the target
@@ -35,11 +35,11 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70Instrumentation
+LOCAL_MODULE:= libLLVM80Instrumentation
 LOCAL_SRC_FILES := $(instrumentation_SRC_FILES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/ObjCARC/Android.mk b/lib/Transforms/ObjCARC/Android.mk
index 9ad5cb9..0902146 100644 (file)
--- a/lib/Transforms/ObjCARC/Android.mk
+++ b/lib/Transforms/ObjCARC/Android.mk
@@ -16,13 +16,13 @@ transforms_objcarc_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_objcarc_SRC_FILES)
-LOCAL_MODULE:= libLLVM70TransformObjCARC
+LOCAL_MODULE:= libLLVM80TransformObjCARC
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -31,10 +31,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_objcarc_SRC_FILES)
-LOCAL_MODULE:= libLLVM70TransformObjCARC
+LOCAL_MODULE:= libLLVM80TransformObjCARC
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index 53e8fd3..b3c50c5 100644 (file)
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -80,13 +80,13 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES :=     \
        $(transforms_scalar_SRC_FILES)
 
-LOCAL_MODULE:= libLLVM70ScalarOpts
+LOCAL_MODULE:= libLLVM80ScalarOpts
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -95,10 +95,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_scalar_SRC_FILES)
-LOCAL_MODULE:= libLLVM70ScalarOpts
+LOCAL_MODULE:= libLLVM80ScalarOpts
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 41fb9bc..15e8717 100644 (file)
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -66,13 +66,13 @@ transforms_utils_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_utils_SRC_FILES)
-LOCAL_MODULE:= libLLVM70TransformUtils
+LOCAL_MODULE:= libLLVM80TransformUtils
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -81,10 +81,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_utils_SRC_FILES)
-LOCAL_MODULE:= libLLVM70TransformUtils
+LOCAL_MODULE:= libLLVM80TransformUtils
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Vectorize/Android.mk b/lib/Transforms/Vectorize/Android.mk
index 682f43d..fc86cc4 100644 (file)
--- a/lib/Transforms/Vectorize/Android.mk
+++ b/lib/Transforms/Vectorize/Android.mk
@@ -17,13 +17,13 @@ transforms_vectorize_SRC_FILES := \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_vectorize_SRC_FILES)
-LOCAL_MODULE:= libLLVM70Vectorize
+LOCAL_MODULE:= libLLVM80Vectorize
 
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -32,10 +32,10 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(transforms_vectorize_SRC_FILES)
-LOCAL_MODULE:= libLLVM70Vectorize
+LOCAL_MODULE:= libLLVM80Vectorize
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/XRay/Android.mk b/lib/XRay/Android.mk
index b4a656e..63f945b 100644 (file)
--- a/lib/XRay/Android.mk
+++ b/lib/XRay/Android.mk
@@ -8,13 +8,13 @@ xray_SRC_FILES := \
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70XRay
+LOCAL_MODULE:= libLLVM80XRay
 LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(xray_SRC_FILES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -22,11 +22,11 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70XRay
+LOCAL_MODULE:= libLLVM80XRay
 LOCAL_SRC_FILES := $(xray_SRC_FILES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 0292dd6..5439795 100644 (file)
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -1,4 +1,4 @@
-LOCAL_MODULE_TARGET_ARCH := $(LLVM70_SUPPORTED_ARCH)
+LOCAL_MODULE_TARGET_ARCH := $(LLVM80_SUPPORTED_ARCH)
 
 LOCAL_CLANG := true
 
@@ -64,22 +64,22 @@ LOCAL_CPPFLAGS :=   \
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=    \
        bionic \
-       $(LLVM70_ROOT_PATH)     \
-       $(LLVM70_ROOT_PATH)/include     \
-       $(LLVM70_ROOT_PATH)/device/include      \
+       $(LLVM80_ROOT_PATH)     \
+       $(LLVM80_ROOT_PATH)/include     \
+       $(LLVM80_ROOT_PATH)/device/include      \
        $(LOCAL_C_INCLUDES)
 
 ###########################################################
 ## Commands for running tblgen to compile a td file
 ###########################################################
-define transform-device-td-to-out70
+define transform-device-td-to-out80
 @mkdir -p $(dir $@)
 @echo "Device TableGen (gen-$(1)): $(TBLGEN_LOCAL_MODULE) <= $<"
-$(hide) $(LLVM70_TBLGEN) \
+$(hide) $(LLVM80_TBLGEN) \
        -I $(dir $<)    \
-       -I $(LLVM70_ROOT_PATH)/include  \
-       -I $(LLVM70_ROOT_PATH)/device/include   \
-       -I $(LLVM70_ROOT_PATH)/lib/Target       \
+       -I $(LLVM80_ROOT_PATH)/include  \
+       -I $(LLVM80_ROOT_PATH)/device/include   \
+       -I $(LLVM80_ROOT_PATH)/lib/Target       \
     -gen-$(strip $(1)) \
     -o $@ $<
 endef

diff --git a/llvm-gen-attributes.mk b/llvm-gen-attributes.mk
index 13c85e3..98f6ae2 100644 (file)
--- a/llvm-gen-attributes.mk
+++ b/llvm-gen-attributes.mk
@@ -1,4 +1,4 @@
-ATTRIBUTETD70 := $(LLVM70_ROOT_PATH)/include/llvm/IR/Attributes.td
+ATTRIBUTETD80 := $(LLVM80_ROOT_PATH)/include/llvm/IR/Attributes.td
 
 ifeq ($(LOCAL_MODULE_CLASS),)
        LOCAL_MODULE_CLASS := STATIC_LIBRARIES
@@ -7,9 +7,9 @@ endif
 GENFILE := $(addprefix $(call local-generated-sources-dir)/llvm/IR/,Attributes.inc)
 LOCAL_GENERATED_SOURCES += $(GENFILE)
 $(GENFILE): TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
-$(GENFILE): $(ATTRIBUTETD70) | $(LLVM70_TBLGEN)
+$(GENFILE): $(ATTRIBUTETD80) | $(LLVM80_TBLGEN)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-       $(call transform-host-td-to-out70,attrs)
+       $(call transform-host-td-to-out80,attrs)
 else
-       $(call transform-device-td-to-out70,attrs)
+       $(call transform-device-td-to-out80,attrs)
 endif

diff --git a/llvm-gen-intrinsics.mk b/llvm-gen-intrinsics.mk
index 7445e87..02d69f4 100644 (file)
--- a/llvm-gen-intrinsics.mk
+++ b/llvm-gen-intrinsics.mk
@@ -1,6 +1,6 @@
 # We treat Intrinsics.td as a very special target just like what lib/VMCore/Makefile does
-INTRINSICTD70 := $(LLVM70_ROOT_PATH)/include/llvm/IR/Intrinsics.td
-INTRINSICTD70S := $(wildcard $(dir $(INTRINSICTD70))/Intrinsics*.td)
+INTRINSICTD80 := $(LLVM80_ROOT_PATH)/include/llvm/IR/Intrinsics.td
+INTRINSICTD80S := $(wildcard $(dir $(INTRINSICTD80))/Intrinsics*.td)
 
 ifeq ($(LOCAL_MODULE_CLASS),)
        LOCAL_MODULE_CLASS := STATIC_LIBRARIES
@@ -9,19 +9,19 @@ endif
 GENFILE := $(addprefix $(call local-generated-sources-dir)/llvm/IR/,IntrinsicEnums.inc)
 LOCAL_GENERATED_SOURCES += $(GENFILE)
 $(GENFILE): TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
-$(GENFILE): $(INTRINSICTD70) $(INTRINSICTD70S) | $(LLVM70_TBLGEN)
+$(GENFILE): $(INTRINSICTD80) $(INTRINSICTD80S) | $(LLVM80_TBLGEN)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-       $(call transform-host-td-to-out70,intrinsic-enums)
+       $(call transform-host-td-to-out80,intrinsic-enums)
 else
-       $(call transform-device-td-to-out70,intrinsic-enums)
+       $(call transform-device-td-to-out80,intrinsic-enums)
 endif
 
 GENFILE := $(addprefix $(call local-generated-sources-dir)/llvm/IR/,IntrinsicImpl.inc)
 LOCAL_GENERATED_SOURCES += $(GENFILE)
 $(GENFILE): TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
-$(GENFILE): $(INTRINSICTD70) $(INTRINSICTD70S) | $(LLVM70_TBLGEN)
+$(GENFILE): $(INTRINSICTD80) $(INTRINSICTD80S) | $(LLVM80_TBLGEN)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-       $(call transform-host-td-to-out70,intrinsic-impl)
+       $(call transform-host-td-to-out80,intrinsic-impl)
 else
-       $(call transform-device-td-to-out70,intrinsic-impl)
+       $(call transform-device-td-to-out80,intrinsic-impl)
 endif

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 7dd80cb..870a579 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -65,9 +65,9 @@ LOCAL_CPPFLAGS_darwin += \
 
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=    \
-       $(LLVM70_ROOT_PATH)     \
-       $(LLVM70_ROOT_PATH)/include     \
-       $(LLVM70_ROOT_PATH)/host/include        \
+       $(LLVM80_ROOT_PATH)     \
+       $(LLVM80_ROOT_PATH)/include     \
+       $(LLVM80_ROOT_PATH)/host/include        \
        $(LOCAL_C_INCLUDES)
 
 # Add on ncurses to have support for terminfo
@@ -80,8 +80,8 @@ LOCAL_IS_HOST_MODULE := true
 ifeq ($(HOST_PREFER_32_BIT),true)
 LOCAL_MULTILIB := 32
 else
-ifeq (libLLVM70, $(filter libLLVM70,$(LOCAL_SHARED_LIBRARIES)$(LOCAL_SHARED_LIBRARIES_$(HOST_OS))))
-# Skip building a 32-bit shared object if they are using libLLVM70.
+ifeq (libLLVM80, $(filter libLLVM80,$(LOCAL_SHARED_LIBRARIES)$(LOCAL_SHARED_LIBRARIES_$(HOST_OS))))
+# Skip building a 32-bit shared object if they are using libLLVM80.
 LOCAL_MULTILIB := first
 endif
 endif
@@ -89,14 +89,14 @@ endif
 ###########################################################
 ## Commands for running tblgen to compile a td file
 ###########################################################
-define transform-host-td-to-out70
+define transform-host-td-to-out80
 @mkdir -p $(dir $@)
 @echo "Host TableGen: $(TBLGEN_LOCAL_MODULE) (gen-$(1)) <= $<"
-$(hide) $(LLVM70_TBLGEN) \
+$(hide) $(LLVM80_TBLGEN) \
        -I $(dir $<)    \
-       -I $(LLVM70_ROOT_PATH)/include  \
-       -I $(LLVM70_ROOT_PATH)/host/include     \
-       -I $(LLVM70_ROOT_PATH)/lib/Target       \
+       -I $(LLVM80_ROOT_PATH)/include  \
+       -I $(LLVM80_ROOT_PATH)/host/include     \
+       -I $(LLVM80_ROOT_PATH)/lib/Target       \
        $(if $(strip $(CLANG_ROOT_PATH)),-I $(CLANG_ROOT_PATH)/include,)        \
        -gen-$(strip $(1))      \
        -o $@ $<

diff --git a/llvm-tblgen-rules.mk b/llvm-tblgen-rules.mk
index 0569d86..7affae4 100644 (file)
--- a/llvm-tblgen-rules.mk
+++ b/llvm-tblgen-rules.mk
@@ -1,10 +1,10 @@
 ###########################################################
 ## Commands for running tblgen to compile a td file
 ##########################################################
-define transform-td-to-out70
+define transform-td-to-out80
 $(if $(LOCAL_IS_HOST_MODULE),  \
-       $(call transform-host-td-to-out70,$(1)),        \
-       $(call transform-device-td-to-out70,$(1)))
+       $(call transform-host-td-to-out80,$(1)),        \
+       $(call transform-device-td-to-out80,$(1)))
 endef
 
 ###########################################################
@@ -17,15 +17,15 @@ ifeq ($(LOCAL_MODULE_CLASS),)
        LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 endif
 
-ifneq ($(strip $(TBLGEN_TABLES70)),)
+ifneq ($(strip $(TBLGEN_TABLES80)),)
 
 generated_sources := $(call local-generated-sources-dir)
-tblgen_gen_tables := $(addprefix $(generated_sources)/,$(TBLGEN_TABLES70))
+tblgen_gen_tables := $(addprefix $(generated_sources)/,$(TBLGEN_TABLES80))
 LOCAL_GENERATED_SOURCES += $(tblgen_gen_tables)
 
 tblgen_source_dir := $(LOCAL_PATH)
-ifneq ($(TBLGEN_TD_DIR70),)
-tblgen_source_dir := $(TBLGEN_TD_DIR70)
+ifneq ($(TBLGEN_TD_DIR80),)
+tblgen_source_dir := $(TBLGEN_TD_DIR80)
 endif
 
 ifneq (,$(filter $(tblgen_source_dir),MCTargetDesc))
@@ -38,247 +38,247 @@ tblgen_td_deps := $(wildcard $(tblgen_td_deps))
 #
 # The directory and the .td directory is not the same.
 #
-ifeq ($(tblgen_source_dir),$(LLVM70_ROOT_PATH)/lib/Target/ARM/MCTargetDesc)
+ifeq ($(tblgen_source_dir),$(LLVM80_ROOT_PATH)/lib/Target/ARM/MCTargetDesc)
 $(generated_sources)/%GenRegisterInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenRegisterInfo.inc: $(tblgen_source_dir)/../%.td \
-                                       $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70, register-info)
+                                       $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80, register-info)
 
 $(generated_sources)/%GenInstrInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenInstrInfo.inc: $(tblgen_source_dir)/../%.td \
-                                    $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,instr-info)
+                                    $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,instr-info)
 
 $(generated_sources)/%GenSubtargetInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/../%.td \
-                                        $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,subtarget)
+                                        $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,subtarget)
 endif
 
-ifeq ($(tblgen_source_dir),$(LLVM70_ROOT_PATH)/lib/Target/X86/MCTargetDesc)
+ifeq ($(tblgen_source_dir),$(LLVM80_ROOT_PATH)/lib/Target/X86/MCTargetDesc)
 $(generated_sources)/%GenRegisterInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenRegisterInfo.inc: $(tblgen_source_dir)/../%.td \
-                                       $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70, register-info)
+                                       $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80, register-info)
 
 $(generated_sources)/%GenInstrInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenInstrInfo.inc: $(tblgen_source_dir)/../%.td \
-                                    $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,instr-info)
+                                    $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,instr-info)
 
 $(generated_sources)/%GenSubtargetInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/../%.td \
-                                        $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,subtarget)
+                                        $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,subtarget)
 endif
 
-ifeq ($(tblgen_source_dir),$(LLVM70_ROOT_PATH)/lib/Target/Mips/MCTargetDesc)
+ifeq ($(tblgen_source_dir),$(LLVM80_ROOT_PATH)/lib/Target/Mips/MCTargetDesc)
 $(generated_sources)/%GenRegisterInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenRegisterInfo.inc: $(tblgen_source_dir)/../%.td \
-                                       $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70, register-info)
+                                       $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80, register-info)
 
 $(generated_sources)/%GenInstrInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenInstrInfo.inc: $(tblgen_source_dir)/../%.td \
-                                    $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,instr-info)
+                                    $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,instr-info)
 
 $(generated_sources)/%GenSubtargetInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/../%.td \
-                                        $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,subtarget)
+                                        $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,subtarget)
 endif
 
 ifneq ($(filter %GenRegisterInfo.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenRegisterInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenRegisterInfo.inc: $(tblgen_source_dir)/%.td \
-                                       $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,register-info)
+                                       $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,register-info)
 endif
 
 ifneq ($(filter %GenInstrInfo.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenInstrInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenInstrInfo.inc: $(tblgen_source_dir)/%.td \
-                                    $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,instr-info)
+                                    $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,instr-info)
 endif
 
 ifneq ($(filter %GenAsmWriter.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenAsmWriter.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenAsmWriter.inc: $(tblgen_source_dir)/%.td \
-                                    $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,asm-writer)
+                                    $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,asm-writer)
 endif
 
 ifneq ($(filter %GenAsmWriter1.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenAsmWriter1.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenAsmWriter1.inc: $(tblgen_source_dir)/%.td \
-                                     $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,asm-writer -asmwriternum=1)
+                                     $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,asm-writer -asmwriternum=1)
 endif
 
 ifneq ($(filter %GenAsmMatcher.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenAsmMatcher.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenAsmMatcher.inc: $(tblgen_source_dir)/%.td \
-                                     $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,asm-matcher)
+                                     $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,asm-matcher)
 endif
 
 # TODO(srhines): Is this needed
 ifneq ($(filter %GenCodeEmitter.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenCodeEmitter.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenCodeEmitter.inc: $(tblgen_source_dir)/%.td \
-                                      $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,emitter)
+                                      $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,emitter)
 endif
 
 ifneq ($(filter %GenMCCodeEmitter.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenMCCodeEmitter.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenMCCodeEmitter.inc: $(tblgen_source_dir)/%.td \
-                                        $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,emitter)
+                                        $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,emitter)
 endif
 
 ifneq ($(filter %GenMCPseudoLowering.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenMCPseudoLowering.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenMCPseudoLowering.inc: $(tblgen_source_dir)/%.td \
-                                           $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,pseudo-lowering)
+                                           $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,pseudo-lowering)
 endif
 
 ifneq ($(filter %GenDAGISel.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenDAGISel.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenDAGISel.inc: $(tblgen_source_dir)/%.td \
-                                  $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,dag-isel)
+                                  $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,dag-isel)
 endif
 
 ifneq ($(filter %GenRegisterBank.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenRegisterBank.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenRegisterBank.inc: $(tblgen_source_dir)/%.td \
-                                  $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,register-bank)
+                                  $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,register-bank)
 endif
 
 ifneq ($(filter %GenDisassemblerTables.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenDisassemblerTables.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenDisassemblerTables.inc: $(tblgen_source_dir)/%.td \
-                                             $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,disassembler)
+                                             $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,disassembler)
 endif
 
 ifneq ($(filter %GenEDInfo.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenEDInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenEDInfo.inc: $(tblgen_source_dir)/%.td \
-                                 $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,enhanced-disassembly-info)
+                                 $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,enhanced-disassembly-info)
 endif
 
 ifneq ($(filter %GenFastISel.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenFastISel.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenFastISel.inc: $(tblgen_source_dir)/%.td \
-                                   $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,fast-isel)
+                                   $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,fast-isel)
 endif
 
 ifneq ($(filter %GenGlobalISel.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenGlobalISel.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenGlobalISel.inc: $(tblgen_source_dir)/%.td \
-                                   $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,global-isel)
+                                   $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,global-isel)
 endif
 
 ifneq ($(filter %GenSubtargetInfo.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenSubtargetInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenSubtargetInfo.inc: $(tblgen_source_dir)/%.td \
-                                        $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,subtarget)
+                                        $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,subtarget)
 endif
 
 ifneq ($(filter %GenCallingConv.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenCallingConv.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenCallingConv.inc: $(tblgen_source_dir)/%.td \
-                                      $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,callingconv)
+                                      $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,callingconv)
 endif
 
 ifneq ($(filter %GenIntrinsicEnums.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenIntrinsicEnums.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenIntrinsicEnums.inc: $(tblgen_source_dir)/%.td \
-                                     $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,tgt-intrinsic-enums)
+                                     $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,tgt-intrinsic-enums)
 endif
 
 ifneq ($(filter %GenIntrinsicImpl.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenIntrinsicImpl.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenIntrinsicImpl.inc: $(tblgen_source_dir)/%.td \
-                                     $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,tgt-intrinsic-impl)
+                                     $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,tgt-intrinsic-impl)
 endif
 
 ifneq ($(filter %GenSearchableTables.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenSearchableTables.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenSearchableTables.inc: $(tblgen_source_dir)/%.td \
-                                     $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,searchable-tables)
+                                     $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,searchable-tables)
 endif
 
 ifneq ($(filter %GenSystemOperands.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenSystemOperands.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenSystemOperands.inc: $(tblgen_source_dir)/%.td \
-                                     $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,searchable-tables)
+                                     $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,searchable-tables)
 endif
 
 ifneq ($(filter %GenDFAPacketizer.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenDFAPacketizer.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenDFAPacketizer.inc: $(tblgen_source_dir)/%.td \
-                                     $(tblgen_td_deps) | $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,dfa-packetizer)
+                                     $(tblgen_td_deps) | $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,dfa-packetizer)
 endif
 
 ifneq ($(filter %GenExegesis.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/%GenExegesis.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/%GenExegesis.inc: $(tblgen_source_dir)/%.td \
-                                     $(tblgen_td_deps) | $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,exegesis)
+                                     $(tblgen_td_deps) | $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,exegesis)
 endif
 
 ifneq ($(findstring ARMGenDecoderTables.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/ARMGenDecoderTables.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/ARMGenDecoderTables.inc: $(tblgen_source_dir)/ARM.td \
-                                          $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,arm-decoder)
+                                          $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,arm-decoder)
 endif
 
 ifneq ($(findstring ARMGenSystemRegister.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/ARMGenSystemRegister.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/ARMGenSystemRegister.inc: $(tblgen_source_dir)/ARM.td \
-                                          $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,searchable-tables)
+                                          $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,searchable-tables)
 endif
 
 ifneq ($(findstring InstCombineTables.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/InstCombineTables.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/InstCombineTables.inc: $(tblgen_source_dir)/InstCombineTables.td \
-                                          $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,searchable-tables)
+                                          $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,searchable-tables)
 endif
 
 ifneq ($(findstring Options.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/Options.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/Options.inc: $(tblgen_source_dir)/Options.td \
                                      $(tblgen_td_deps) \
-                                     $(LLVM70_TBLGEN) \
-                                     $(LLVM70_ROOT_PATH)/include/llvm/Option/OptParser.td
-       $(call transform-td-to-out70,opt-parser-defs)
+                                     $(LLVM80_TBLGEN) \
+                                     $(LLVM80_ROOT_PATH)/include/llvm/Option/OptParser.td
+       $(call transform-td-to-out80,opt-parser-defs)
 endif
 
 ifneq ($(findstring X86GenEVEX2VEXTables.inc,$(tblgen_gen_tables)),)
 $(generated_sources)/X86GenEVEX2VEXTables.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
 $(generated_sources)/X86GenEVEX2VEXTables.inc: $(tblgen_source_dir)/X86.td \
-                                          $(tblgen_td_deps) $(LLVM70_TBLGEN)
-       $(call transform-td-to-out70,x86-EVEX2VEX-tables)
+                                          $(tblgen_td_deps) $(LLVM80_TBLGEN)
+       $(call transform-td-to-out80,x86-EVEX2VEX-tables)
 endif
 
 # Reset local variables

diff --git a/llvm.mk b/llvm.mk
index 9828821..b15af38 100644 (file)
--- a/llvm.mk
+++ b/llvm.mk
@@ -1,12 +1,12 @@
-ifeq ($(LLVM70_ROOT_PATH),)
-$(error Must set variable LLVM70_ROOT_PATH before including this! $(LOCAL_PATH))
+ifeq ($(LLVM80_ROOT_PATH),)
+$(error Must set variable LLVM80_ROOT_PATH before including this! $(LOCAL_PATH))
 endif
 
-CLEAR_TBLGEN_VARS70 := $(LLVM70_ROOT_PATH)/clear_tblgen_vars.mk
-LLVM70_HOST_BUILD_MK := $(LLVM70_ROOT_PATH)/llvm-host-build.mk
-LLVM70_DEVICE_BUILD_MK := $(LLVM70_ROOT_PATH)/llvm-device-build.mk
-LLVM70_GEN_ATTRIBUTES_MK := $(LLVM70_ROOT_PATH)/llvm-gen-attributes.mk
-LLVM70_GEN_INTRINSICS_MK := $(LLVM70_ROOT_PATH)/llvm-gen-intrinsics.mk
-LLVM70_TBLGEN_RULES_MK := $(LLVM70_ROOT_PATH)/llvm-tblgen-rules.mk
+CLEAR_TBLGEN_VARS80 := $(LLVM80_ROOT_PATH)/clear_tblgen_vars.mk
+LLVM80_HOST_BUILD_MK := $(LLVM80_ROOT_PATH)/llvm-host-build.mk
+LLVM80_DEVICE_BUILD_MK := $(LLVM80_ROOT_PATH)/llvm-device-build.mk
+LLVM80_GEN_ATTRIBUTES_MK := $(LLVM80_ROOT_PATH)/llvm-gen-attributes.mk
+LLVM80_GEN_INTRINSICS_MK := $(LLVM80_ROOT_PATH)/llvm-gen-intrinsics.mk
+LLVM80_TBLGEN_RULES_MK := $(LLVM80_ROOT_PATH)/llvm-tblgen-rules.mk
 
-LLVM70_SUPPORTED_ARCH := arm arm64 mips mips64 x86 x86_64
+LLVM80_SUPPORTED_ARCH := arm arm64 mips mips64 x86 x86_64

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 855e743..4d25373 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -1,105 +1,105 @@
 LOCAL_PATH:= $(call my-dir)
 
 llvm_pre_static_libraries := \
-  libLLVM70Linker \
-  libLLVM70ipo \
-  libLLVM70DebugInfoDWARF \
-  libLLVM70DebugInfoPDB \
-  libLLVM70Symbolize \
-  libLLVM70DebugInfoMSF \
-  libLLVM70DebugInfoCodeView \
-  libLLVM70Demangle \
-  libLLVM70IRReader \
-  libLLVM70BitWriter \
-  libLLVM70BitReader \
-  libLLVM70GlobalISel
+  libLLVM80Linker \
+  libLLVM80ipo \
+  libLLVM80DebugInfoDWARF \
+  libLLVM80DebugInfoPDB \
+  libLLVM80Symbolize \
+  libLLVM80DebugInfoMSF \
+  libLLVM80DebugInfoCodeView \
+  libLLVM80Demangle \
+  libLLVM80IRReader \
+  libLLVM80BitWriter \
+  libLLVM80BitReader \
+  libLLVM80GlobalISel
 
 llvm_arm_static_libraries := \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMDisassembler \
-  libLLVM70ARMUtils
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMDisassembler \
+  libLLVM80ARMUtils
 
 llvm_x86_static_libraries := \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmParser \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmParser \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler
 
 ifneq ($(filter radeonsi,$(BOARD_GPU_DRIVERS)),)
 llvm_x86_static_libraries += \
-  libLLVM70AMDGPUCodeGen \
-  libLLVM70AMDGPUInfo \
-  libLLVM70AMDGPUDesc \
-  libLLVM70AMDGPUAsmParser \
-  libLLVM70AMDGPUAsmPrinter \
-  libLLVM70AMDGPUUtils
+  libLLVM80AMDGPUCodeGen \
+  libLLVM80AMDGPUInfo \
+  libLLVM80AMDGPUDesc \
+  libLLVM80AMDGPUAsmParser \
+  libLLVM80AMDGPUAsmPrinter \
+  libLLVM80AMDGPUUtils
 endif
 
 llvm_mips_static_libraries := \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler
 
 llvm_aarch64_static_libraries := \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler
 
 llvm_post_static_libraries := \
-  libLLVM70AsmPrinter \
-  libLLVM70SelectionDAG \
-  libLLVM70CodeGen \
-  libLLVM70Object \
-  libLLVM70ScalarOpts \
-  libLLVM70AggressiveInstCombine \
-  libLLVM70InstCombine \
-  libLLVM70Instrumentation \
-  libLLVM70TransformObjCARC \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70MCDisassembler \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Option \
-  libLLVM70Support \
-  libLLVM70Vectorize \
-  libLLVM70ProfileData \
-  libLLVM70LibDriver \
-  libLLVM70BinaryFormat
+  libLLVM80AsmPrinter \
+  libLLVM80SelectionDAG \
+  libLLVM80CodeGen \
+  libLLVM80Object \
+  libLLVM80ScalarOpts \
+  libLLVM80AggressiveInstCombine \
+  libLLVM80InstCombine \
+  libLLVM80Instrumentation \
+  libLLVM80TransformObjCARC \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80MCDisassembler \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Option \
+  libLLVM80Support \
+  libLLVM80Vectorize \
+  libLLVM80ProfileData \
+  libLLVM80LibDriver \
+  libLLVM80BinaryFormat
 
 llvm_host_static_libraries := \
-  libLLVM70ExecutionEngine \
-  libLLVM70RuntimeDyld \
-  libLLVM70MCJIT \
-  libLLVM70OrcJIT
+  libLLVM80ExecutionEngine \
+  libLLVM80RuntimeDyld \
+  libLLVM80MCJIT \
+  libLLVM80OrcJIT
 
 llvm_device_static_libraries := \
-  libLLVM70ExecutionEngine \
-  libLLVM70RuntimeDyld \
-  libLLVM70MCJIT
+  libLLVM80ExecutionEngine \
+  libLLVM80RuntimeDyld \
+  libLLVM80MCJIT
 
 # HOST LLVM shared library build
 include $(CLEAR_VARS)
 LOCAL_IS_HOST_MODULE := true
 
-LOCAL_MODULE:= libLLVM70
+LOCAL_MODULE:= libLLVM80
 
 LOCAL_MODULE_TAGS := optional
 
@@ -125,10 +125,10 @@ else
 LOCAL_MODULE_HOST_OS := linux
 endif
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)
 
-ifeq (,$(filter $(TARGET_ARCH),$(LLVM70_SUPPORTED_ARCH)))
+ifeq (,$(filter $(TARGET_ARCH),$(LLVM80_SUPPORTED_ARCH)))
 $(warning TODO $(TARGET_ARCH): Enable llvm build)
 endif
 
@@ -136,7 +136,7 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 # DEVICE LLVM shared library build
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= libLLVM70
+LOCAL_MODULE:= libLLVM80
 
 LOCAL_MODULE_TAGS := optional
 
@@ -169,9 +169,9 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
   $(LOCAL_PATH)/device/include \
   $(call local-generated-sources-dir)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_SHARED_LIBRARY)
 
 endif

diff --git a/tools/bugpoint-passes/Android.mk b/tools/bugpoint-passes/Android.mk
index 3604a3b..dafb9d1 100644 (file)
--- a/tools/bugpoint-passes/Android.mk
+++ b/tools/bugpoint-passes/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 bugpoint_passes_SRC_FILES := \
   TestPasses.cpp
@@ -16,7 +16,7 @@ LOCAL_MODULE := BugpointPasses
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES # needed for tblgen
 LOCAL_LDFLAGS_darwin := -Wl,-undefined -Wl,dynamic_lookup
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/tools/bugpoint/Android.mk b/tools/bugpoint/Android.mk
index 579c95a..59e0b13 100644 (file)
--- a/tools/bugpoint/Android.mk
+++ b/tools/bugpoint/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -19,27 +19,27 @@ bugpoint_SRC_FILES := \
   bugpoint.cpp        \
 
 bugpoint_STATIC_LIBRARIES := \
-  libLLVM70BitWriter \
-  libLLVM70CodeGen \
-  libLLVM70ipo \
-  libLLVM70IRReader \
-  libLLVM70BitReader \
-  libLLVM70AsmParser \
-  libLLVM70InstCombine \
-  libLLVM70Instrumentation \
-  libLLVM70Linker \
-  libLLVM70TransformObjCARC \
-  libLLVM70Object \
-  libLLVM70ScalarOpts \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70Core \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70ProfileData \
-  libLLVM70Vectorize \
-  libLLVM70Support \
+  libLLVM80BitWriter \
+  libLLVM80CodeGen \
+  libLLVM80ipo \
+  libLLVM80IRReader \
+  libLLVM80BitReader \
+  libLLVM80AsmParser \
+  libLLVM80InstCombine \
+  libLLVM80Instrumentation \
+  libLLVM80Linker \
+  libLLVM80TransformObjCARC \
+  libLLVM80Object \
+  libLLVM80ScalarOpts \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80Core \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80ProfileData \
+  libLLVM80Vectorize \
+  libLLVM80Support \
 
 include $(CLEAR_VARS)
 
@@ -55,8 +55,8 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 LOCAL_LDFLAGS_darwin := -Wl,-export_dynamic
 LOCAL_LDFLAGS_linux := -Wl,--export-dynamic
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/dsymutil/Android.mk b/tools/dsymutil/Android.mk
index c3925ca..795cb6c 100644 (file)
--- a/tools/dsymutil/Android.mk
+++ b/tools/dsymutil/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 llvm_dsymutil_SRC_FILES := \
   BinaryHolder.cpp \
@@ -12,49 +12,49 @@ llvm_dsymutil_SRC_FILES := \
   MachOUtils.cpp \
 
 llvm_dsymutil_STATIC_LIBRARIES := \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmParser \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70AsmPrinter \
-  libLLVM70SelectionDAG \
-  libLLVM70CodeGen \
-  libLLVM70DebugInfoDWARF \
-  libLLVM70Instrumentation \
-  libLLVM70MCParser \
-  libLLVM70MCDisassembler \
-  libLLVM70Object \
-  libLLVM70BitReader \
-  libLLVM70ScalarOpts \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70Core \
-  libLLVM70MC \
-  libLLVM70Support \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmParser \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80AsmPrinter \
+  libLLVM80SelectionDAG \
+  libLLVM80CodeGen \
+  libLLVM80DebugInfoDWARF \
+  libLLVM80Instrumentation \
+  libLLVM80MCParser \
+  libLLVM80MCDisassembler \
+  libLLVM80Object \
+  libLLVM80BitReader \
+  libLLVM80ScalarOpts \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80Core \
+  libLLVM80MC \
+  libLLVM80Support \
 
 include $(CLEAR_VARS)
 
@@ -66,6 +66,6 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 LOCAL_STATIC_LIBRARIES := $(llvm_dsymutil_STATIC_LIBRARIES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/gold/Android.mk b/tools/gold/Android.mk
index 3823cae..93218d0 100644 (file)
--- a/tools/gold/Android.mk
+++ b/tools/gold/Android.mk
@@ -16,15 +16,15 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../../
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../../
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 # For the host only
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
-LOCAL_MODULE := LLVM70gold
+LOCAL_MODULE := LLVM80gold
 
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
@@ -33,7 +33,7 @@ llvm_gold_SRC_FILES := \
 
 LOCAL_SRC_FILES := $(llvm_gold_SRC_FILES)
 
-LOCAL_SHARED_LIBRARIES := libLLVM70
+LOCAL_SHARED_LIBRARIES := libLLVM80
 
 ifndef USE_MINGW
 LOCAL_LDLIBS += -lpthread -ldl
@@ -41,7 +41,7 @@ endif
 
 LOCAL_C_INCLUDES += toolchain/binutils/binutils-2.25/include
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index 7ccf325..b6d73dc 100644 (file)
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,63 +11,63 @@ llvm_llc_SRC_FILES := \
   llc.cpp
 
 llvm_llc_mips_STATIC_LIBRARIES := \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsInfo \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsInfo \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
 
 llvm_llc_x86_STATIC_LIBRARIES := \
-  libLLVM70X86Info \
-  libLLVM70X86AsmParser \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Disassembler \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils
+  libLLVM80X86Info \
+  libLLVM80X86AsmParser \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Disassembler \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils
 
 llvm_llc_arm_STATIC_LIBRARIES := \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMDisassembler \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMDesc \
-  libLLVM70ARMInfo
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMDisassembler \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMDesc \
+  libLLVM80ARMInfo
 
 llvm_llc_STATIC_LIBRARIES := \
-  libLLVM70AsmPrinter \
-  libLLVM70IRReader \
-  libLLVM70AsmParser \
-  libLLVM70BitReader \
-  libLLVM70BitWriter \
-  libLLVM70SelectionDAG \
-  libLLVM70InstCombine \
-  libLLVM70CodeGen \
-  libLLVM70Instrumentation \
-  libLLVM70Object \
-  libLLVM70ipo \
-  libLLVM70Linker \
-  libLLVM70MCDisassembler \
-  libLLVM70MC \
-  libLLVM70MIRParser \
-  libLLVM70MCParser \
-  libLLVM70ScalarOpts \
-  libLLVM70TransformUtils \
-  libLLVM70Vectorize \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70Core \
-  libLLVM70Support \
-  libLLVM70Object
+  libLLVM80AsmPrinter \
+  libLLVM80IRReader \
+  libLLVM80AsmParser \
+  libLLVM80BitReader \
+  libLLVM80BitWriter \
+  libLLVM80SelectionDAG \
+  libLLVM80InstCombine \
+  libLLVM80CodeGen \
+  libLLVM80Instrumentation \
+  libLLVM80Object \
+  libLLVM80ipo \
+  libLLVM80Linker \
+  libLLVM80MCDisassembler \
+  libLLVM80MC \
+  libLLVM80MIRParser \
+  libLLVM80MCParser \
+  libLLVM80ScalarOpts \
+  libLLVM80TransformUtils \
+  libLLVM80Vectorize \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80Core \
+  libLLVM80Support \
+  libLLVM80Object
 
 llvm_llc_aarch64_STATIC_LIBRARIES := \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Disassembler \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils
+  libLLVM80AArch64Info \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Disassembler \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils
 
 
 
@@ -93,10 +93,10 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
 
@@ -104,7 +104,7 @@ include $(BUILD_HOST_EXECUTABLE)
 # llc command line tool (target)
 #===---------------------------------------------------------------===
 
-ifeq (,$(filter $(TARGET_ARCH),$(LLVM70_SUPPORTED_ARCH)))
+ifeq (,$(filter $(TARGET_ARCH),$(LLVM80_SUPPORTED_ARCH)))
 $(warning TODO $(TARGET_ARCH): Enable llc build)
 endif
 
@@ -128,9 +128,9 @@ LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm_STATIC_LIBRARIES)
 
 LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES)
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/tools/lli/Android.mk b/tools/lli/Android.mk
index a35c723..9af43ba 100644 (file)
--- a/tools/lli/Android.mk
+++ b/tools/lli/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -15,56 +15,56 @@ lli_SRC_FILES := \
   RemoteTargetExternal.cpp \
 
 lli_STATIC_LIBRARIES := \
-  libLLVM70IRReader \
-  libLLVM70BitReader \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86AsmParser \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70AsmPrinter \
-  libLLVM70SelectionDAG \
-  libLLVM70CodeGen \
-  libLLVM70Instrumentation \
-  libLLVM70Linker \
-  libLLVM70Interpreter \
-  libLLVM70ScalarOpts \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70MC \
-  libLLVM70MCJIT \
-  libLLVM70OrcJIT \
-  libLLVM70ExecutionEngine \
-  libLLVM70RuntimeDyld \
-  libLLVM70MCParser \
-  libLLVM70Object \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Option \
-  libLLVM70Support \
-  libLLVM70MCDisassembler \
+  libLLVM80IRReader \
+  libLLVM80BitReader \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86AsmParser \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80AsmPrinter \
+  libLLVM80SelectionDAG \
+  libLLVM80CodeGen \
+  libLLVM80Instrumentation \
+  libLLVM80Linker \
+  libLLVM80Interpreter \
+  libLLVM80ScalarOpts \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80MC \
+  libLLVM80MCJIT \
+  libLLVM80OrcJIT \
+  libLLVM80ExecutionEngine \
+  libLLVM80RuntimeDyld \
+  libLLVM80MCParser \
+  libLLVM80Object \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Option \
+  libLLVM80Support \
+  libLLVM80MCDisassembler \
 
 include $(CLEAR_VARS)
 
@@ -79,8 +79,8 @@ LOCAL_STATIC_LIBRARIES := $(lli_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/lli/ChildTarget/Android.mk b/tools/lli/ChildTarget/Android.mk
index d5ebb80..be72cbe 100644 (file)
--- a/tools/lli/ChildTarget/Android.mk
+++ b/tools/lli/ChildTarget/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../../../
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../../../
 
 
 #===---------------------------------------------------------------===
@@ -21,11 +21,11 @@ LOCAL_IS_HOST_MODULE := true
 LOCAL_SRC_FILES := $(lli_child_target_SRC_FILES)
 
 LOCAL_STATIC_LIBRARIES := \
-  libLLVM70Support
+  libLLVM80Support
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-ar/Android.mk b/tools/llvm-ar/Android.mk
index cc22184..2045e89 100644 (file)
--- a/tools/llvm-ar/Android.mk
+++ b/tools/llvm-ar/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -19,7 +19,7 @@ LOCAL_IS_HOST_MODULE := true
 
 LOCAL_SRC_FILES := $(llvm_ar_SRC_FILES)
 
-LOCAL_SHARED_LIBRARIES := libLLVM70
+LOCAL_SHARED_LIBRARIES := libLLVM80
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
@@ -28,7 +28,7 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 LOCAL_POST_INSTALL_CMD = $(hide) ln -sf llvm-ar $(dir $(LOCAL_INSTALLED_MODULE))llvm-lib \
                                                 && ln -sf llvm-ar $(dir $(LOCAL_INSTALLED_MODULE))llvm-ranlib
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-as/Android.mk b/tools/llvm-as/Android.mk
index ba68d45..3ca0fc3 100644 (file)
--- a/tools/llvm-as/Android.mk
+++ b/tools/llvm-as/Android.mk
@@ -15,11 +15,11 @@ LOCAL_LDLIBS_darwin := -lpthread -ldl
 LOCAL_LDLIBS_linux := -lpthread -ldl
 
 LOCAL_STATIC_LIBRARIES := \
-  libLLVM70AsmParser \
-  libLLVM70BitWriter \
-  libLLVM70Core \
-  libLLVM70Support
+  libLLVM80AsmParser \
+  libLLVM80BitWriter \
+  libLLVM80Core \
+  libLLVM80Support
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-bcanalyzer/Android.mk b/tools/llvm-bcanalyzer/Android.mk
index fef9dab..0a282b7 100644 (file)
--- a/tools/llvm-bcanalyzer/Android.mk
+++ b/tools/llvm-bcanalyzer/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,9 +11,9 @@ llvm_bcanalyzer_SRC_FILES := \
   llvm-bcanalyzer.cpp
 
 llvm_bcanalyzer_STATIC_LIBRARIES := \
-  libLLVM70BitReader                  \
-  libLLVM70Core                       \
-  libLLVM70Support                    \
+  libLLVM80BitReader                  \
+  libLLVM80Core                       \
+  libLLVM80Support                    \
 
 include $(CLEAR_VARS)
 
@@ -29,8 +29,8 @@ LOCAL_STATIC_LIBRARIES := $(llvm_bcanalyzer_STATIC_LIBRARIES)
 LOCAL_LDLIBS += -lpthread -lm -ldl
 LOCAL_C_INCLUDES += external/llvm/include
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-c-test/Android.mk b/tools/llvm-c-test/Android.mk
index 395af30..37a5a7c 100644 (file)
--- a/tools/llvm-c-test/Android.mk
+++ b/tools/llvm-c-test/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -19,45 +19,45 @@ llvm_c_test_SRC_FILES := \
   targets.c              \
 
 llvm_c_test_STATIC_LIBRARIES := \
-  libLLVM70BitReader \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70AsmPrinter \
-  libLLVM70SelectionDAG \
-  libLLVM70CodeGen \
-  libLLVM70Instrumentation \
-  libLLVM70ScalarOpts \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70MC \
-  libLLVM70Object \
-  libLLVM70MCParser \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Option \
-  libLLVM70Support \
-  libLLVM70MCDisassembler \
+  libLLVM80BitReader \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80AsmPrinter \
+  libLLVM80SelectionDAG \
+  libLLVM80CodeGen \
+  libLLVM80Instrumentation \
+  libLLVM80ScalarOpts \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80MC \
+  libLLVM80Object \
+  libLLVM80MCParser \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Option \
+  libLLVM80Support \
+  libLLVM80MCDisassembler \
 
 include $(CLEAR_VARS)
 
@@ -72,7 +72,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_c_test_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-config/Android.mk b/tools/llvm-config/Android.mk
index 1e3ff7b..d122eae 100644 (file)
--- a/tools/llvm-config/Android.mk
+++ b/tools/llvm-config/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 #===---------------------------------------------------------------===
 # llvm-config command line tool
@@ -12,8 +12,8 @@ llvm_config_SRC_FILES := \
   llvm-config.cpp
 
 llvm_config_STATIC_LIBRARIES := \
-  libLLVM70Core \
-  libLLVM70Support
+  libLLVM80Core \
+  libLLVM80Support
 
 LOCAL_MODULE := llvm-config
 LOCAL_MODULE_TAGS := optional
@@ -44,6 +44,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \
   $(LOCAL_PATH)/Android.mk \
   $(LOCAL_GENERATED_SOURCES)
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-cov/Android.mk b/tools/llvm-cov/Android.mk
index 8d45155..8e3ffc5 100644 (file)
--- a/tools/llvm-cov/Android.mk
+++ b/tools/llvm-cov/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -18,13 +18,13 @@ llvm_cov_SRC_FILES := \
   TestingSupport.cpp
 
 llvm_cov_STATIC_LIBRARIES := \
-  libLLVM70Object              \
-  libLLVM70ProfileData         \
-  libLLVM70MC                  \
-  libLLVM70MCParser            \
-  libLLVM70BitReader           \
-  libLLVM70Core                \
-  libLLVM70Support             \
+  libLLVM80Object              \
+  libLLVM80ProfileData         \
+  libLLVM80MC                  \
+  libLLVM80MCParser            \
+  libLLVM80BitReader           \
+  libLLVM80Core                \
+  libLLVM80Support             \
 
 include $(CLEAR_VARS)
 
@@ -39,7 +39,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_cov_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-cxxdump/Android.mk b/tools/llvm-cxxdump/Android.mk
index 03568ab..4e7ae5d 100644 (file)
--- a/tools/llvm-cxxdump/Android.mk
+++ b/tools/llvm-cxxdump/Android.mk
@@ -1,48 +1,48 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 llvm_cxxdump_SRC_FILES := \
   Error.cpp \
   llvm-cxxdump.cpp
 
 llvm_cxxdump_STATIC_LIBRARIES := \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsInfo \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmParser \
-  libLLVM70X86CodeGen \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70AsmPrinter \
-  libLLVM70CodeGen \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70Object \
-  libLLVM70MCParser \
-  libLLVM70MC \
-  libLLVM70MCDisassembler \
-  libLLVM70BitReader \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Support \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsInfo \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmParser \
+  libLLVM80X86CodeGen \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80AsmPrinter \
+  libLLVM80CodeGen \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80Object \
+  libLLVM80MCParser \
+  libLLVM80MC \
+  libLLVM80MCDisassembler \
+  libLLVM80BitReader \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Support \
 
 
 include $(CLEAR_VARS)
@@ -55,6 +55,6 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 LOCAL_STATIC_LIBRARIES := $(llvm_cxxdump_STATIC_LIBRARIES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-diff/Android.mk b/tools/llvm-diff/Android.mk
index cef1a0c..df89813 100644 (file)
--- a/tools/llvm-diff/Android.mk
+++ b/tools/llvm-diff/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -14,11 +14,11 @@ llvm_diff_SRC_FILES := \
   DiffLog.cpp          \
 
 llvm_diff_STATIC_LIBRARIES := \
-  libLLVM70IRReader             \
-  libLLVM70BitReader            \
-  libLLVM70AsmParser            \
-  libLLVM70Core                 \
-  libLLVM70Support              \
+  libLLVM80IRReader             \
+  libLLVM80BitReader            \
+  libLLVM80AsmParser            \
+  libLLVM80Core                 \
+  libLLVM80Support              \
 
 include $(CLEAR_VARS)
 
@@ -33,8 +33,8 @@ LOCAL_STATIC_LIBRARIES := $(llvm_diff_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-dis/Android.mk b/tools/llvm-dis/Android.mk
index c0049b6..5c712ac 100644 (file)
--- a/tools/llvm-dis/Android.mk
+++ b/tools/llvm-dis/Android.mk
@@ -12,12 +12,12 @@ LOCAL_SRC_FILES := $(llvm_dis_SRC_FILES)
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
 LOCAL_STATIC_LIBRARIES := \
-  libLLVM70Analysis \
-  libLLVM70BitReader \
-  libLLVM70Core \
-  libLLVM70Support
+  libLLVM80Analysis \
+  libLLVM80BitReader \
+  libLLVM80Core \
+  libLLVM80Support
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-dwarfdump/Android.mk b/tools/llvm-dwarfdump/Android.mk
index 9955e3b..d040a7a 100644 (file)
--- a/tools/llvm-dwarfdump/Android.mk
+++ b/tools/llvm-dwarfdump/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,14 +11,14 @@ llvm_dwarfdump_SRC_FILES := \
   llvm-dwarfdump.cpp
 
 llvm_dwarfdump_STATIC_LIBRARIES := \
-  libLLVM70DebugInfoDWARF            \
-  libLLVM70DebugInfoPDB              \
-  libLLVM70Object                    \
-  libLLVM70BitReader                 \
-  libLLVM70MC                        \
-  libLLVM70MCParser                  \
-  libLLVM70Core                      \
-  libLLVM70Support                   \
+  libLLVM80DebugInfoDWARF            \
+  libLLVM80DebugInfoPDB              \
+  libLLVM80Object                    \
+  libLLVM80BitReader                 \
+  libLLVM80MC                        \
+  libLLVM80MCParser                  \
+  libLLVM80Core                      \
+  libLLVM80Support                   \
 
 include $(CLEAR_VARS)
 
@@ -33,7 +33,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_dwarfdump_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-dwp/Android.mk b/tools/llvm-dwp/Android.mk
index 791511a..94da005 100644 (file)
--- a/tools/llvm-dwp/Android.mk
+++ b/tools/llvm-dwp/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,60 +11,60 @@ llvm_dwp_SRC_FILES := \
   llvm-dwp.cpp
 
 llvm_dwp_STATIC_LIBRARIES := \
-  libLLVM70DebugInfoDWARF \
-  libLLVM70Object \
-  libLLVM70BitReader \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMDisassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmParser \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70ExecutionEngine \
-  libLLVM70RuntimeDyld \
-  libLLVM70MCJIT \
-  libLLVM70OrcJIT \
-  libLLVM70AsmPrinter \
-  libLLVM70SelectionDAG \
-  libLLVM70CodeGen \
-  libLLVM70Object \
-  libLLVM70ScalarOpts \
-  libLLVM70InstCombine \
-  libLLVM70Instrumentation \
-  libLLVM70TransformObjCARC \
-  libLLVM70TransformUtils \
-  libLLVM70Vectorize \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70MCDisassembler \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Option \
-  libLLVM70LTO \
-  libLLVM70Support \
-  libLLVM70ProfileData
+  libLLVM80DebugInfoDWARF \
+  libLLVM80Object \
+  libLLVM80BitReader \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMDisassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmParser \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80ExecutionEngine \
+  libLLVM80RuntimeDyld \
+  libLLVM80MCJIT \
+  libLLVM80OrcJIT \
+  libLLVM80AsmPrinter \
+  libLLVM80SelectionDAG \
+  libLLVM80CodeGen \
+  libLLVM80Object \
+  libLLVM80ScalarOpts \
+  libLLVM80InstCombine \
+  libLLVM80Instrumentation \
+  libLLVM80TransformObjCARC \
+  libLLVM80TransformUtils \
+  libLLVM80Vectorize \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80MCDisassembler \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Option \
+  libLLVM80LTO \
+  libLLVM80Support \
+  libLLVM80ProfileData
 
 include $(CLEAR_VARS)
 
@@ -79,7 +79,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_dwp_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-extract/Android.mk b/tools/llvm-extract/Android.mk
index 0debcf9..6443c1a 100644 (file)
--- a/tools/llvm-extract/Android.mk
+++ b/tools/llvm-extract/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,17 +11,17 @@ llvm_extract_SRC_FILES := \
   llvm-extract.cpp
 
 llvm_extract_STATIC_LIBRARIES := \
-  libLLVM70IRReader                \
-  libLLVM70AsmParser               \
-  libLLVM70Object                  \
-  libLLVM70BitReader               \
-  libLLVM70BitWriter               \
-  libLLVM70ipo                     \
-  libLLVM70TransformUtils          \
-  libLLVM70Analysis                \
-  libLLVM70Target                  \
-  libLLVM70Core                    \
-  libLLVM70Support                 \
+  libLLVM80IRReader                \
+  libLLVM80AsmParser               \
+  libLLVM80Object                  \
+  libLLVM80BitReader               \
+  libLLVM80BitWriter               \
+  libLLVM80ipo                     \
+  libLLVM80TransformUtils          \
+  libLLVM80Analysis                \
+  libLLVM80Target                  \
+  libLLVM80Core                    \
+  libLLVM80Support                 \
 
 include $(CLEAR_VARS)
 
@@ -36,8 +36,8 @@ LOCAL_STATIC_LIBRARIES := $(llvm_extract_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-link/Android.mk b/tools/llvm-link/Android.mk
index 691d7b1..c8b96eb 100644 (file)
--- a/tools/llvm-link/Android.mk
+++ b/tools/llvm-link/Android.mk
@@ -4,19 +4,19 @@ llvm_link_SRC_FILES := \
   llvm-link.cpp
 
 llvm_link_STATIC_LIBRARIES := \
-  libLLVM70Linker \
-  libLLVM70IRReader \
-  libLLVM70Object \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70BitReader \
-  libLLVM70BitWriter \
-  libLLVM70AsmParser \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70Core \
-  libLLVM70Support
+  libLLVM80Linker \
+  libLLVM80IRReader \
+  libLLVM80Object \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80BitReader \
+  libLLVM80BitWriter \
+  libLLVM80AsmParser \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80Core \
+  libLLVM80Support
 
 #===---------------------------------------------------------------===
 # llvm-link command line tool (host)
@@ -31,8 +31,8 @@ LOCAL_SRC_FILES := $(llvm_link_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_link_STATIC_LIBRARIES)
 LOCAL_LDLIBS += -lpthread
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
 #===---------------------------------------------------------------===
@@ -48,7 +48,7 @@ LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := $(llvm_link_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_link_STATIC_LIBRARIES)
 
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/tools/llvm-lto/Android.mk b/tools/llvm-lto/Android.mk
index 06609df..1080e61 100644 (file)
--- a/tools/llvm-lto/Android.mk
+++ b/tools/llvm-lto/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,57 +11,57 @@ llvm_lto_SRC_FILES := \
   llvm-lto.cpp
 
 llvm_lto_STATIC_LIBRARIES := \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86AsmParser \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70AsmPrinter \
-  libLLVM70SelectionDAG \
-  libLLVM70LTO \
-  libLLVM70CodeGen \
-  libLLVM70Target \
-  libLLVM70BitReader \
-  libLLVM70BitWriter \
-  libLLVM70Linker \
-  libLLVM70ipo \
-  libLLVM70IRReader \
-  libLLVM70TransformObjCARC \
-  libLLVM70ScalarOpts \
-  libLLVM70InstCombine \
-  libLLVM70Vectorize \
-  libLLVM70Instrumentation \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70MCDisassembler \
-  libLLVM70Object \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Option \
-  libLLVM70Support \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86AsmParser \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80AsmPrinter \
+  libLLVM80SelectionDAG \
+  libLLVM80LTO \
+  libLLVM80CodeGen \
+  libLLVM80Target \
+  libLLVM80BitReader \
+  libLLVM80BitWriter \
+  libLLVM80Linker \
+  libLLVM80ipo \
+  libLLVM80IRReader \
+  libLLVM80TransformObjCARC \
+  libLLVM80ScalarOpts \
+  libLLVM80InstCombine \
+  libLLVM80Vectorize \
+  libLLVM80Instrumentation \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80MCDisassembler \
+  libLLVM80Object \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Option \
+  libLLVM80Support \
 
 include $(CLEAR_VARS)
 
@@ -76,8 +76,8 @@ LOCAL_STATIC_LIBRARIES := $(llvm_lto_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-mc/Android.mk b/tools/llvm-mc/Android.mk
index 7778fa2..fffaefa 100644 (file)
--- a/tools/llvm-mc/Android.mk
+++ b/tools/llvm-mc/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -12,42 +12,42 @@ llvm_mc_SRC_FILES := \
   Disassembler.cpp
 
 llvm_mc_STATIC_LIBRARIES := \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsInfo \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmParser \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70AsmPrinter \
-  libLLVM70CodeGen \
-  libLLVM70TransformUtils \
-  libLLVM70Target \
-  libLLVM70Analysis \
-  libLLVM70MC \
-  libLLVM70Object \
-  libLLVM70BitReader \
-  libLLVM70MCParser \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Support \
-  libLLVM70MCDisassembler \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsInfo \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmParser \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80AsmPrinter \
+  libLLVM80CodeGen \
+  libLLVM80TransformUtils \
+  libLLVM80Target \
+  libLLVM80Analysis \
+  libLLVM80MC \
+  libLLVM80Object \
+  libLLVM80BitReader \
+  libLLVM80MCParser \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Support \
+  libLLVM80MCDisassembler \
 
 include $(CLEAR_VARS)
 
@@ -62,7 +62,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_mc_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-mcmarkup/Android.mk b/tools/llvm-mcmarkup/Android.mk
index 8315456..92fd3c7 100644 (file)
--- a/tools/llvm-mcmarkup/Android.mk
+++ b/tools/llvm-mcmarkup/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,8 +11,8 @@ llvm_mcmarkup_SRC_FILES := \
   llvm-mcmarkup.cpp
 
 llvm_mcmarkup_STATIC_LIBRARIES := \
-  libLLVM70Core \
-  libLLVM70Support \
+  libLLVM80Core \
+  libLLVM80Support \
 
 include $(CLEAR_VARS)
 
@@ -27,7 +27,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_mcmarkup_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-nm/Android.mk b/tools/llvm-nm/Android.mk
index 9bcfb63..4f1c70b 100644 (file)
--- a/tools/llvm-nm/Android.mk
+++ b/tools/llvm-nm/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,43 +11,43 @@ llvm_nm_SRC_FILES := \
   llvm-nm.cpp
 
 llvm_nm_STATIC_LIBRARIES := \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86AsmParser \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70CodeGen \
-  libLLVM70TransformUtils \
-  libLLVM70Target \
-  libLLVM70Analysis \
-  libLLVM70Object             \
-  libLLVM70BitReader          \
-  libLLVM70MC                 \
-  libLLVM70MCParser           \
-  libLLVM70Core               \
-  libLLVM70Support            \
-  libLLVM70MCDisassembler \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86AsmParser \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80CodeGen \
+  libLLVM80TransformUtils \
+  libLLVM80Target \
+  libLLVM80Analysis \
+  libLLVM80Object             \
+  libLLVM80BitReader          \
+  libLLVM80MC                 \
+  libLLVM80MCParser           \
+  libLLVM80Core               \
+  libLLVM80Support            \
+  libLLVM80MCDisassembler \
 
 include $(CLEAR_VARS)
 
@@ -62,8 +62,8 @@ LOCAL_STATIC_LIBRARIES := $(llvm_nm_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-objdump/Android.mk b/tools/llvm-objdump/Android.mk
index c10fb4b..0efdf75 100644 (file)
--- a/tools/llvm-objdump/Android.mk
+++ b/tools/llvm-objdump/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -14,44 +14,44 @@ llvm_objdump_SRC_FILES := \
   MachODump.cpp \
 
 llvm_objdump_STATIC_LIBRARIES := \
-  libLLVM70DebugInfoDWARF \
-  libLLVM70DebugInfoPDB \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsInfo \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmParser \
-  libLLVM70X86CodeGen \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70AsmPrinter \
-  libLLVM70CodeGen \
-  libLLVM70TransformUtils \
-  libLLVM70Target \
-  libLLVM70Analysis \
-  libLLVM70Object \
-  libLLVM70MCParser \
-  libLLVM70MC \
-  libLLVM70MCDisassembler \
-  libLLVM70BitReader \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Support \
+  libLLVM80DebugInfoDWARF \
+  libLLVM80DebugInfoPDB \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsInfo \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmParser \
+  libLLVM80X86CodeGen \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80AsmPrinter \
+  libLLVM80CodeGen \
+  libLLVM80TransformUtils \
+  libLLVM80Target \
+  libLLVM80Analysis \
+  libLLVM80Object \
+  libLLVM80MCParser \
+  libLLVM80MC \
+  libLLVM80MCDisassembler \
+  libLLVM80BitReader \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Support \
 
 include $(CLEAR_VARS)
 
@@ -66,7 +66,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_objdump_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-profdata/Android.mk b/tools/llvm-profdata/Android.mk
index 0a9fe45..ec98502 100644 (file)
--- a/tools/llvm-profdata/Android.mk
+++ b/tools/llvm-profdata/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,10 +11,10 @@ llvm_profdata_SRC_FILES := \
   llvm-profdata.cpp
 
 llvm_profdata_STATIC_LIBRARIES := \
-  libLLVM70Object                   \
-  libLLVM70ProfileData              \
-  libLLVM70Core                     \
-  libLLVM70Support                  \
+  libLLVM80Object                   \
+  libLLVM80ProfileData              \
+  libLLVM80Core                     \
+  libLLVM80Support                  \
 
 include $(CLEAR_VARS)
 
@@ -29,8 +29,8 @@ LOCAL_STATIC_LIBRARIES := $(llvm_profdata_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-readobj/Android.mk b/tools/llvm-readobj/Android.mk
index c0ca229..816e2c8 100644 (file)
--- a/tools/llvm-readobj/Android.mk
+++ b/tools/llvm-readobj/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -21,16 +21,16 @@ llvm_readobj_SRC_FILES := \
   Win64EHDumper.cpp \
 
 llvm_readobj_STATIC_LIBRARIES := \
-  libLLVM70ARMInfo \
-  libLLVM70AArch64Info \
-  libLLVM70MipsInfo \
-  libLLVM70X86Info \
-  libLLVM70Object \
-  libLLVM70BitReader \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70Core \
-  libLLVM70Support \
+  libLLVM80ARMInfo \
+  libLLVM80AArch64Info \
+  libLLVM80MipsInfo \
+  libLLVM80X86Info \
+  libLLVM80Object \
+  libLLVM80BitReader \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80Core \
+  libLLVM80Support \
 
 include $(CLEAR_VARS)
 
@@ -45,7 +45,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_readobj_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-rtdyld/Android.mk b/tools/llvm-rtdyld/Android.mk
index 4b3d229..371f501 100644 (file)
--- a/tools/llvm-rtdyld/Android.mk
+++ b/tools/llvm-rtdyld/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,44 +11,44 @@ llvm_rtdyld_SRC_FILES := \
   llvm-rtdyld.cpp
 
 llvm_rtdyld_STATIC_LIBRARIES := \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86AsmParser \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70DebugInfoDWARF \
-  libLLVM70DebugInfoPDB \
-  libLLVM70ExecutionEngine    \
-  libLLVM70CodeGen \
-  libLLVM70Object             \
-  libLLVM70MC                 \
-  libLLVM70MCParser           \
-  libLLVM70RuntimeDyld        \
-  libLLVM70BitReader          \
-  libLLVM70Core               \
-  libLLVM70Support            \
-  libLLVM70MCDisassembler \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86AsmParser \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80DebugInfoDWARF \
+  libLLVM80DebugInfoPDB \
+  libLLVM80ExecutionEngine    \
+  libLLVM80CodeGen \
+  libLLVM80Object             \
+  libLLVM80MC                 \
+  libLLVM80MCParser           \
+  libLLVM80RuntimeDyld        \
+  libLLVM80BitReader          \
+  libLLVM80Core               \
+  libLLVM80Support            \
+  libLLVM80MCDisassembler \
 
 include $(CLEAR_VARS)
 
@@ -63,7 +63,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_rtdyld_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-size/Android.mk b/tools/llvm-size/Android.mk
index a771aeb..c70dd68 100644 (file)
--- a/tools/llvm-size/Android.mk
+++ b/tools/llvm-size/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,12 +11,12 @@ llvm_size_SRC_FILES := \
   llvm-size.cpp
 
 llvm_size_STATIC_LIBRARIES := \
-  libLLVM70Object               \
-  libLLVM70MC                   \
-  libLLVM70MCParser             \
-  libLLVM70BitReader            \
-  libLLVM70Core                 \
-  libLLVM70Support
+  libLLVM80Object               \
+  libLLVM80MC                   \
+  libLLVM80MCParser             \
+  libLLVM80BitReader            \
+  libLLVM80Core                 \
+  libLLVM80Support
 
 include $(CLEAR_VARS)
 
@@ -31,7 +31,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_size_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-split/Android.mk b/tools/llvm-split/Android.mk
index ac293e1..0ab33ba 100644 (file)
--- a/tools/llvm-split/Android.mk
+++ b/tools/llvm-split/Android.mk
@@ -15,15 +15,15 @@ LOCAL_LDLIBS_darwin := -lpthread -ldl
 LOCAL_LDLIBS_linux := -lpthread -ldl
 
 LOCAL_STATIC_LIBRARIES := \
-  libLLVM70IRReader \
-  libLLVM70BitReader \
-  libLLVM70BitWriter \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Support
+  libLLVM80IRReader \
+  libLLVM80BitReader \
+  libLLVM80BitWriter \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Support
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-symbolizer/Android.mk b/tools/llvm-symbolizer/Android.mk
index 5438797..be32616 100644 (file)
--- a/tools/llvm-symbolizer/Android.mk
+++ b/tools/llvm-symbolizer/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 llvm_symbolizer_SRC_FILES := \
   llvm-symbolizer.cpp
@@ -15,18 +15,18 @@ LOCAL_SRC_FILES := $(llvm_symbolizer_SRC_FILES)
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
 LOCAL_STATIC_LIBRARIES := \
-  libLLVM70Symbolize \
-  libLLVM70DebugInfoDWARF \
-  libLLVM70DebugInfoPDB \
-  libLLVM70Object \
-  libLLVM70BitReader \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70Core \
-  libLLVM70Support
-
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+  libLLVM80Symbolize \
+  libLLVM80DebugInfoDWARF \
+  libLLVM80DebugInfoPDB \
+  libLLVM80Object \
+  libLLVM80BitReader \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80Core \
+  libLLVM80Support
+
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -35,8 +35,8 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 LOCAL_MODULE := llvm-symbolizer
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := $(llvm_symbolizer_SRC_FILES)
-LOCAL_SHARED_LIBRARIES := libLLVM70
+LOCAL_SHARED_LIBRARIES := libLLVM80
 
-include $(LLVM70_DEVICE_BUILD_MK)
+include $(LLVM80_DEVICE_BUILD_MK)
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/tools/lto/Android.mk b/tools/lto/Android.mk
index 4bba2a7..cfda063 100644 (file)
--- a/tools/lto/Android.mk
+++ b/tools/lto/Android.mk
@@ -16,13 +16,13 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../../
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../../
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 # For the host only
 # =====================================================
 include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS70)
+include $(CLEAR_TBLGEN_VARS80)
 
 LOCAL_MODULE := libLTO
 
@@ -35,71 +35,71 @@ llvm_lto_SRC_FILES := \
 LOCAL_SRC_FILES := $(llvm_lto_SRC_FILES)
 
 llvm_lto_STATIC_LIBRARIES := \
-  libLLVM70Linker \
-  libLLVM70ipo \
-  libLLVM70DebugInfoDWARF \
-  libLLVM70DebugInfoPDB \
-  libLLVM70IRReader \
-  libLLVM70BitWriter \
-  libLLVM70BitReader \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMAsmParser \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMDisassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmParser \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmParser \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmParser \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70ExecutionEngine \
-  libLLVM70RuntimeDyld \
-  libLLVM70MCJIT \
-  libLLVM70OrcJIT \
-  libLLVM70AsmPrinter \
-  libLLVM70SelectionDAG \
-  libLLVM70CodeGen \
-  libLLVM70Object \
-  libLLVM70ScalarOpts \
-  libLLVM70InstCombine \
-  libLLVM70Instrumentation \
-  libLLVM70TransformObjCARC \
-  libLLVM70TransformUtils \
-  libLLVM70Vectorize \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70MCDisassembler \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Option \
-  libLLVM70LTO \
-  libLLVM70Support \
-  libLLVM70ProfileData
+  libLLVM80Linker \
+  libLLVM80ipo \
+  libLLVM80DebugInfoDWARF \
+  libLLVM80DebugInfoPDB \
+  libLLVM80IRReader \
+  libLLVM80BitWriter \
+  libLLVM80BitReader \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMAsmParser \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMDisassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmParser \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmParser \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmParser \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80ExecutionEngine \
+  libLLVM80RuntimeDyld \
+  libLLVM80MCJIT \
+  libLLVM80OrcJIT \
+  libLLVM80AsmPrinter \
+  libLLVM80SelectionDAG \
+  libLLVM80CodeGen \
+  libLLVM80Object \
+  libLLVM80ScalarOpts \
+  libLLVM80InstCombine \
+  libLLVM80Instrumentation \
+  libLLVM80TransformObjCARC \
+  libLLVM80TransformUtils \
+  libLLVM80Vectorize \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80MCDisassembler \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Option \
+  libLLVM80LTO \
+  libLLVM80Support \
+  libLLVM80ProfileData
 
 LOCAL_LDLIBS_darwin := -lpthread -ldl
 LOCAL_LDLIBS_linux := -lpthread -ldl
 
 LOCAL_STATIC_LIBRARIES := $(llvm_lto_STATIC_LIBRARIES) $(llvm_lto_STATIC_LIBRARIES)
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/tools/obj2yaml/Android.mk b/tools/obj2yaml/Android.mk
index 22032b9..ff75787 100644 (file)
--- a/tools/obj2yaml/Android.mk
+++ b/tools/obj2yaml/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -14,12 +14,12 @@ obj2yaml_SRC_FILES := \
   Error.cpp \
 
 obj2yaml_STATIC_LIBRARIES := \
-  libLLVM70Object             \
-  libLLVM70MC                 \
-  libLLVM70MCParser           \
-  libLLVM70BitReader          \
-  libLLVM70Core               \
-  libLLVM70Support            \
+  libLLVM80Object             \
+  libLLVM80MC                 \
+  libLLVM80MCParser           \
+  libLLVM80BitReader          \
+  libLLVM80Core               \
+  libLLVM80Support            \
 
 include $(CLEAR_VARS)
 
@@ -34,7 +34,7 @@ LOCAL_STATIC_LIBRARIES := $(obj2yaml_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/opt/Android.mk b/tools/opt/Android.mk
index cf34c9a..4932d47 100644 (file)
--- a/tools/opt/Android.mk
+++ b/tools/opt/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -17,54 +17,54 @@ llvm_opt_SRC_FILES := \
   opt.cpp \
 
 llvm_opt_STATIC_LIBRARIES := \
-  libLLVM70IRReader \
-  libLLVM70BitReader \
-  libLLVM70BitWriter \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70AsmPrinter \
-  libLLVM70SelectionDAG \
-  libLLVM70CodeGen \
-  libLLVM70TransformObjCARC \
-  libLLVM70Vectorize \
-  libLLVM70ScalarOpts \
-  libLLVM70Passes \
-  libLLVM70ipo \
-  libLLVM70Linker \
-  libLLVM70InstCombine \
-  libLLVM70Instrumentation \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70Object \
-  libLLVM70ProfileData \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Option \
-  libLLVM70Support \
-  libLLVM70MCDisassembler \
+  libLLVM80IRReader \
+  libLLVM80BitReader \
+  libLLVM80BitWriter \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80AsmPrinter \
+  libLLVM80SelectionDAG \
+  libLLVM80CodeGen \
+  libLLVM80TransformObjCARC \
+  libLLVM80Vectorize \
+  libLLVM80ScalarOpts \
+  libLLVM80Passes \
+  libLLVM80ipo \
+  libLLVM80Linker \
+  libLLVM80InstCombine \
+  libLLVM80Instrumentation \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80Object \
+  libLLVM80ProfileData \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Option \
+  libLLVM80Support \
+  libLLVM80MCDisassembler \
 
 include $(CLEAR_VARS)
 
@@ -79,10 +79,10 @@ LOCAL_LDLIBS += -lpthread -ldl
 LOCAL_LDFLAGS_darwin := -Wl,-export_dynamic
 LOCAL_LDFLAGS_linux := -Wl,--export-dynamic
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
 
@@ -96,9 +96,9 @@ LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := $(llvm_opt_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_opt_STATIC_LIBRARIES)
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_DEVICE_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/tools/sancov/Android.mk b/tools/sancov/Android.mk
index dcc3228..58e8773 100644 (file)
--- a/tools/sancov/Android.mk
+++ b/tools/sancov/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,57 +11,57 @@ llvm_sancov_SRC_FILES := \
   sancov.cc \
 
 llvm_sancov_STATIC_LIBRARIES := \
-  libLLVM70IRReader \
-  libLLVM70ARMCodeGen \
-  libLLVM70ARMInfo \
-  libLLVM70ARMDesc \
-  libLLVM70ARMAsmPrinter \
-  libLLVM70ARMDisassembler \
-  libLLVM70AArch64CodeGen \
-  libLLVM70AArch64Info \
-  libLLVM70AArch64Desc \
-  libLLVM70AArch64AsmPrinter \
-  libLLVM70AArch64Utils \
-  libLLVM70AArch64Disassembler \
-  libLLVM70MipsCodeGen \
-  libLLVM70MipsInfo \
-  libLLVM70MipsDesc \
-  libLLVM70MipsAsmPrinter \
-  libLLVM70MipsDisassembler \
-  libLLVM70X86CodeGen \
-  libLLVM70X86Info \
-  libLLVM70X86Desc \
-  libLLVM70X86AsmPrinter \
-  libLLVM70X86Utils \
-  libLLVM70X86Disassembler \
-  libLLVM70Symbolize \
-  libLLVM70DebugInfoDWARF \
-  libLLVM70DebugInfoPDB \
-  libLLVM70AsmPrinter \
-  libLLVM70SelectionDAG \
-  libLLVM70CodeGen \
-  libLLVM70TransformObjCARC \
-  libLLVM70Vectorize \
-  libLLVM70ScalarOpts \
-  libLLVM70Passes \
-  libLLVM70ipo \
-  libLLVM70Linker \
-  libLLVM70InstCombine \
-  libLLVM70Instrumentation \
-  libLLVM70TransformUtils \
-  libLLVM70Analysis \
-  libLLVM70Target \
-  libLLVM70Object \
-  libLLVM70BitReader \
-  libLLVM70BitWriter \
-  libLLVM70MC \
-  libLLVM70MCParser \
-  libLLVM70ProfileData \
-  libLLVM70Core \
-  libLLVM70AsmParser \
-  libLLVM70Option \
-  libLLVM70Support \
-  libLLVM70MCDisassembler \
+  libLLVM80IRReader \
+  libLLVM80ARMCodeGen \
+  libLLVM80ARMInfo \
+  libLLVM80ARMDesc \
+  libLLVM80ARMAsmPrinter \
+  libLLVM80ARMDisassembler \
+  libLLVM80AArch64CodeGen \
+  libLLVM80AArch64Info \
+  libLLVM80AArch64Desc \
+  libLLVM80AArch64AsmPrinter \
+  libLLVM80AArch64Utils \
+  libLLVM80AArch64Disassembler \
+  libLLVM80MipsCodeGen \
+  libLLVM80MipsInfo \
+  libLLVM80MipsDesc \
+  libLLVM80MipsAsmPrinter \
+  libLLVM80MipsDisassembler \
+  libLLVM80X86CodeGen \
+  libLLVM80X86Info \
+  libLLVM80X86Desc \
+  libLLVM80X86AsmPrinter \
+  libLLVM80X86Utils \
+  libLLVM80X86Disassembler \
+  libLLVM80Symbolize \
+  libLLVM80DebugInfoDWARF \
+  libLLVM80DebugInfoPDB \
+  libLLVM80AsmPrinter \
+  libLLVM80SelectionDAG \
+  libLLVM80CodeGen \
+  libLLVM80TransformObjCARC \
+  libLLVM80Vectorize \
+  libLLVM80ScalarOpts \
+  libLLVM80Passes \
+  libLLVM80ipo \
+  libLLVM80Linker \
+  libLLVM80InstCombine \
+  libLLVM80Instrumentation \
+  libLLVM80TransformUtils \
+  libLLVM80Analysis \
+  libLLVM80Target \
+  libLLVM80Object \
+  libLLVM80BitReader \
+  libLLVM80BitWriter \
+  libLLVM80MC \
+  libLLVM80MCParser \
+  libLLVM80ProfileData \
+  libLLVM80Core \
+  libLLVM80AsmParser \
+  libLLVM80Option \
+  libLLVM80Support \
+  libLLVM80MCDisassembler \
 
 include $(CLEAR_VARS)
 
@@ -71,6 +71,6 @@ LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := $(llvm_sancov_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_sancov_STATIC_LIBRARIES)
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/verify-uselistorder/Android.mk b/tools/verify-uselistorder/Android.mk
index 41a5f26..8fbbc1c 100644 (file)
--- a/tools/verify-uselistorder/Android.mk
+++ b/tools/verify-uselistorder/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 verify_uselistorder_SRC_FILES := \
   verify-uselistorder.cpp
@@ -15,14 +15,14 @@ LOCAL_SRC_FILES := $(verify_uselistorder_SRC_FILES)
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
 LOCAL_STATIC_LIBRARIES := \
-  libLLVM70AsmParser \
-  libLLVM70BitReader \
-  libLLVM70BitWriter \
-  libLLVM70Core \
-  libLLVM70IRReader \
-  libLLVM70Support
+  libLLVM80AsmParser \
+  libLLVM80BitReader \
+  libLLVM80BitWriter \
+  libLLVM80Core \
+  libLLVM80IRReader \
+  libLLVM80Support
 
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_ATTRIBUTES_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_ATTRIBUTES_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/yaml2obj/Android.mk b/tools/yaml2obj/Android.mk
index cce74d7..2a3c21d 100644 (file)
--- a/tools/yaml2obj/Android.mk
+++ b/tools/yaml2obj/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -13,12 +13,12 @@ yaml2obj_SRC_FILES := \
   yaml2elf.cpp        \
 
 yaml2obj_STATIC_LIBRARIES := \
-  libLLVM70Object              \
-  libLLVM70MC                  \
-  libLLVM70MCParser            \
-  libLLVM70BitReader           \
-  libLLVM70Core                \
-  libLLVM70Support             \
+  libLLVM80Object              \
+  libLLVM80MC                  \
+  libLLVM80MCParser            \
+  libLLVM80BitReader           \
+  libLLVM80Core                \
+  libLLVM80Support             \
 
 include $(CLEAR_VARS)
 
@@ -33,7 +33,7 @@ LOCAL_STATIC_LIBRARIES := $(yaml2obj_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM70_GEN_INTRINSICS_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
+include $(LLVM80_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/utils/FileCheck/Android.mk b/utils/FileCheck/Android.mk
index 9459474..f0d1143 100644 (file)
--- a/utils/FileCheck/Android.mk
+++ b/utils/FileCheck/Android.mk
@@ -4,7 +4,7 @@ filecheck_SRC_FILES := \
   FileCheck.cpp
 
 filecheck_STATIC_LIBRARIES := \
-  libLLVM70Support
+  libLLVM80Support
 
 include $(CLEAR_VARS)
 
@@ -18,5 +18,5 @@ LOCAL_CFLAGS += -D __STDC_LIMIT_MACROS -D __STDC_CONSTANT_MACROS
 #REQUIRES_EH := 1
 #REQUIRES_RTTI := 1
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index 16dd86c..671f0b4 100644 (file)
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
-include $(LLVM70_ROOT_PATH)/llvm.mk
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM80_ROOT_PATH)/llvm.mk
 
 tablegen_SRC_FILES := \
   AsmMatcherEmitter.cpp \
@@ -54,7 +54,7 @@ tablegen_SRC_FILES := \
 include $(CLEAR_VARS)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
-LOCAL_MODULE := llvm70-tblgen
+LOCAL_MODULE := llvm80-tblgen
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(tablegen_SRC_FILES)
 
@@ -62,13 +62,13 @@ REQUIRES_EH := 1
 REQUIRES_RTTI := 1
 
 LOCAL_STATIC_LIBRARIES := \
-  libLLVM70TableGen \
-  libLLVM70Support
+  libLLVM80TableGen \
+  libLLVM80Support
 
 LOCAL_LDLIBS += -lm
 LOCAL_LDLIBS_windows := -limagehlp -lpsapi
 LOCAL_LDLIBS_darwin := -lpthread -ldl
 LOCAL_LDLIBS_linux := -lpthread -ldl
 
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/utils/count/Android.mk b/utils/count/Android.mk
index 1071fc5..b0e5669 100644 (file)
--- a/utils/count/Android.mk
+++ b/utils/count/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -21,6 +21,6 @@ LOCAL_SRC_FILES := $(count_SRC_FILES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/utils/not/Android.mk b/utils/not/Android.mk
index de9002a..f78ddad 100644 (file)
--- a/utils/not/Android.mk
+++ b/utils/not/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 #===---------------------------------------------------------------===
@@ -11,8 +11,8 @@ not_SRC_FILES := \
   not.cpp
 
 not_STATIC_LIBRARIES := \
-  libLLVM70Core               \
-  libLLVM70Support            \
+  libLLVM80Core               \
+  libLLVM80Support            \
 
 include $(CLEAR_VARS)
 
@@ -27,6 +27,6 @@ LOCAL_STATIC_LIBRARIES := $(not_STATIC_LIBRARIES)
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/utils/yaml-bench/Android.mk b/utils/yaml-bench/Android.mk
index c1b738a..3276d6b 100644 (file)
--- a/utils/yaml-bench/Android.mk
+++ b/utils/yaml-bench/Android.mk
@@ -1,13 +1,13 @@
 LOCAL_PATH := $(call my-dir)
 
-LLVM70_ROOT_PATH := $(LOCAL_PATH)/../..
+LLVM80_ROOT_PATH := $(LOCAL_PATH)/../..
 
 
 yaml_bench_SRC_FILES := \
   YAMLBench.cpp
 
 yaml_bench_STATIC_LIBRARIES := \
-  libLLVM70Support \
+  libLLVM80Support \
 
 # yaml-bench executable for the host
 # =====================================================
@@ -23,6 +23,6 @@ LOCAL_SRC_FILES := $(yaml_bench_SRC_FILES)
 
 LOCAL_STATIC_LIBRARIES := $(yaml_bench_STATIC_LIBRARIES)
 
-include $(LLVM70_ROOT_PATH)/llvm.mk
-include $(LLVM70_HOST_BUILD_MK)
+include $(LLVM80_ROOT_PATH)/llvm.mk
+include $(LLVM80_HOST_BUILD_MK)
 include $(BUILD_HOST_EXECUTABLE)