LLVM_GEN_ to LLVM70_GEN_

find . -type f -name "*.mk" -exec sed -i 's/LLVM_GEN_/LLVM70_GEN_/g' {} +

Change-Id: Ia0680db15a1318cac2750a09c07b1c8c8870cb5c

diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 6ec1610..4a4c762 100644 (file)
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -94,8 +94,8 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(analysis_SRC_FILES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -107,7 +107,7 @@ LOCAL_MODULE:= libLLVM70Analysis
 LOCAL_SRC_FILES := $(analysis_SRC_FILES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/AsmParser/Android.mk b/lib/AsmParser/Android.mk
index 900d54a..2d422f8 100644 (file)
--- a/lib/AsmParser/Android.mk
+++ b/lib/AsmParser/Android.mk
@@ -16,8 +16,8 @@ LOCAL_MODULE:= libLLVM70AsmParser
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LOCAL_PATH)/../../llvm-host-build.mk
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(asm_parser_SRC_FILES)
 LOCAL_MODULE:= libLLVM70AsmParser
 
 include $(LOCAL_PATH)/../../llvm-device-build.mk
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/BinaryFormat/Android.mk b/lib/BinaryFormat/Android.mk
index 1ff1711..8f14476 100644 (file)
--- a/lib/BinaryFormat/Android.mk
+++ b/lib/BinaryFormat/Android.mk
@@ -15,8 +15,8 @@ LOCAL_MODULE:= libLLVM70BinaryFormat
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -29,7 +29,7 @@ LOCAL_SRC_FILES := $(binary_format_SRC_FILES)
 LOCAL_MODULE:= libLLVM70BinaryFormat
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Bitcode/Reader/Android.mk b/lib/Bitcode/Reader/Android.mk
index e613608..07b3d0a 100644 (file)
--- a/lib/Bitcode/Reader/Android.mk
+++ b/lib/Bitcode/Reader/Android.mk
@@ -18,8 +18,8 @@ LOCAL_MODULE:= libLLVM70BitReader
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES := $(bitcode_reader_SRC_FILES)
 LOCAL_MODULE:= libLLVM70BitReader
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Bitcode/Writer/Android.mk b/lib/Bitcode/Writer/Android.mk
index 09ebdbb..f2dbfbe 100644 (file)
--- a/lib/Bitcode/Writer/Android.mk
+++ b/lib/Bitcode/Writer/Android.mk
@@ -17,8 +17,8 @@ LOCAL_MODULE:= libLLVM70BitWriter
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := $(bitcode_writer_SRC_FILES)
 LOCAL_MODULE:= libLLVM70BitWriter
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index 71e7c71..fc7d448 100644 (file)
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -166,8 +166,8 @@ LOCAL_MODULE:= libLLVM70CodeGen
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -179,7 +179,7 @@ LOCAL_SRC_FILES := $(codegen_SRC_FILES)
 LOCAL_MODULE:= libLLVM70CodeGen
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk
index 899e7e2..373eedb 100644 (file)
--- a/lib/CodeGen/AsmPrinter/Android.mk
+++ b/lib/CodeGen/AsmPrinter/Android.mk
@@ -35,8 +35,8 @@ LOCAL_MODULE:= libLLVM70AsmPrinter
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -48,7 +48,7 @@ LOCAL_SRC_FILES := $(codegen_asmprinter_SRC_FILES)
 LOCAL_MODULE:= libLLVM70AsmPrinter
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/GlobalISel/Android.mk b/lib/CodeGen/GlobalISel/Android.mk
index 47bc7f4..851849b 100644 (file)
--- a/lib/CodeGen/GlobalISel/Android.mk
+++ b/lib/CodeGen/GlobalISel/Android.mk
@@ -31,8 +31,8 @@ LOCAL_MODULE:= libLLVM70GlobalISel
 LOCAL_MODULE_TAGS := optional
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -47,7 +47,7 @@ LOCAL_MODULE:= libLLVM70GlobalISel
 LOCAL_MODULE_TAGS := optional
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/MIRParser/Android.mk b/lib/CodeGen/MIRParser/Android.mk
index 30668ec..d7570d6 100644 (file)
--- a/lib/CodeGen/MIRParser/Android.mk
+++ b/lib/CodeGen/MIRParser/Android.mk
@@ -16,7 +16,7 @@ LOCAL_MODULE:= libLLVM70MIRParser
 LOCAL_MODULE_TAGS := optional
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -31,6 +31,6 @@ LOCAL_MODULE:= libLLVM70MIRParser
 LOCAL_MODULE_TAGS := optional
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/CodeGen/SelectionDAG/Android.mk b/lib/CodeGen/SelectionDAG/Android.mk
index 39ab40d..b37de72 100644 (file)
--- a/lib/CodeGen/SelectionDAG/Android.mk
+++ b/lib/CodeGen/SelectionDAG/Android.mk
@@ -39,8 +39,8 @@ LOCAL_MODULE:= libLLVM70SelectionDAG
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -53,7 +53,7 @@ LOCAL_SRC_FILES := $(codegen_selectiondag_SRC_FILES)
 LOCAL_MODULE:= libLLVM70SelectionDAG
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/CodeView/Android.mk b/lib/DebugInfo/CodeView/Android.mk
index c9bc478..9970c1d 100644 (file)
--- a/lib/DebugInfo/CodeView/Android.mk
+++ b/lib/DebugInfo/CodeView/Android.mk
@@ -48,7 +48,7 @@ LOCAL_MODULE:= libLLVM70DebugInfoCodeView
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -63,6 +63,6 @@ LOCAL_SRC_FILES := $(debuginfo_codeview_SRC_FILES)
 LOCAL_MODULE:= libLLVM70DebugInfoCodeView
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/DWARF/Android.mk b/lib/DebugInfo/DWARF/Android.mk
index d96bb1a..2292d8a 100644 (file)
--- a/lib/DebugInfo/DWARF/Android.mk
+++ b/lib/DebugInfo/DWARF/Android.mk
@@ -38,7 +38,7 @@ LOCAL_MODULE:= libLLVM70DebugInfoDWARF
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -53,6 +53,6 @@ LOCAL_SRC_FILES := $(debuginfo_dwarf_SRC_FILES)
 LOCAL_MODULE:= libLLVM70DebugInfoDWARF
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/MSF/Android.mk b/lib/DebugInfo/MSF/Android.mk
index 0235ee9..8c86eec 100644 (file)
--- a/lib/DebugInfo/MSF/Android.mk
+++ b/lib/DebugInfo/MSF/Android.mk
@@ -19,7 +19,7 @@ LOCAL_MODULE:= libLLVM70DebugInfoMSF
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -34,6 +34,6 @@ LOCAL_SRC_FILES := $(debuginfo_msf_SRC_FILES)
 LOCAL_MODULE:= libLLVM70DebugInfoMSF
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/PDB/Android.mk b/lib/DebugInfo/PDB/Android.mk
index 34cc942..6b00c02 100644 (file)
--- a/lib/DebugInfo/PDB/Android.mk
+++ b/lib/DebugInfo/PDB/Android.mk
@@ -88,7 +88,7 @@ LOCAL_MODULE:= libLLVM70DebugInfoPDB
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -103,6 +103,6 @@ LOCAL_SRC_FILES := $(debuginfo_pdb_SRC_FILES)
 LOCAL_MODULE:= libLLVM70DebugInfoPDB
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/DebugInfo/Symbolize/Android.mk b/lib/DebugInfo/Symbolize/Android.mk
index ecc5a51..5020421 100644 (file)
--- a/lib/DebugInfo/Symbolize/Android.mk
+++ b/lib/DebugInfo/Symbolize/Android.mk
@@ -16,7 +16,7 @@ LOCAL_MODULE:= libLLVM70Symbolize
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -29,6 +29,6 @@ LOCAL_SRC_FILES := $(debuginfo_symbolize_SRC_FILES)
 LOCAL_MODULE:= libLLVM70Symbolize
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Demangle/Android.mk b/lib/Demangle/Android.mk
index 6d94fcb..91ca665 100644 (file)
--- a/lib/Demangle/Android.mk
+++ b/lib/Demangle/Android.mk
@@ -12,8 +12,8 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(demangle_SRC_FILES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -25,7 +25,7 @@ LOCAL_MODULE:= libLLVM70Demangle
 LOCAL_SRC_FILES := $(demangle_SRC_FILES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk
index 4eb28fc..e373c15 100644 (file)
--- a/lib/ExecutionEngine/Android.mk
+++ b/lib/ExecutionEngine/Android.mk
@@ -16,8 +16,8 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(executionengine_SRC_FILES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -29,7 +29,7 @@ LOCAL_MODULE := libLLVM70ExecutionEngine
 LOCAL_SRC_FILES := $(executionengine_SRC_FILES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ExecutionEngine/Interpreter/Android.mk b/lib/ExecutionEngine/Interpreter/Android.mk
index 6c0c8e7..f242c22 100644 (file)
--- a/lib/ExecutionEngine/Interpreter/Android.mk
+++ b/lib/ExecutionEngine/Interpreter/Android.mk
@@ -15,8 +15,8 @@ LOCAL_MODULE := libLLVM70Interpreter
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(interpreter_SRC_FILES)
 LOCAL_MODULE := libLLVM70Interpreter
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ExecutionEngine/MCJIT/Android.mk b/lib/ExecutionEngine/MCJIT/Android.mk
index 6b56658..bf657cf 100644 (file)
--- a/lib/ExecutionEngine/MCJIT/Android.mk
+++ b/lib/ExecutionEngine/MCJIT/Android.mk
@@ -13,8 +13,8 @@ LOCAL_MODULE := libLLVM70MCJIT
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(mcjit_SRC_FILES)
 LOCAL_MODULE := libLLVM70MCJIT
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ExecutionEngine/Orc/Android.mk b/lib/ExecutionEngine/Orc/Android.mk
index fa9ca01..4f7541d 100644 (file)
--- a/lib/ExecutionEngine/Orc/Android.mk
+++ b/lib/ExecutionEngine/Orc/Android.mk
@@ -20,8 +20,8 @@ LOCAL_MODULE := libLLVM70OrcJIT
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -33,7 +33,7 @@ LOCAL_SRC_FILES := $(orcjit_SRC_FILES)
 LOCAL_MODULE := libLLVM70OrcJIT
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/IR/Android.mk b/lib/IR/Android.mk
index 95b8432..e0fdb5c 100644 (file)
--- a/lib/IR/Android.mk
+++ b/lib/IR/Android.mk
@@ -66,8 +66,8 @@ LOCAL_MODULE:= libLLVM70Core
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(LOCAL_PATH)/llvm-gen-local.mk
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -85,8 +85,8 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(call local-generated-sources-dir)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(LOCAL_PATH)/llvm-gen-local.mk
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/IRReader/Android.mk b/lib/IRReader/Android.mk
index 14454a4..d83977e 100644 (file)
--- a/lib/IRReader/Android.mk
+++ b/lib/IRReader/Android.mk
@@ -16,8 +16,8 @@ LOCAL_MODULE:= libLLVM70IRReader
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES := $(irreader_SRC_FILES)
 LOCAL_MODULE:= libLLVM70IRReader
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/LTO/Android.mk b/lib/LTO/Android.mk
index 200469e..2072b28 100644 (file)
--- a/lib/LTO/Android.mk
+++ b/lib/LTO/Android.mk
@@ -20,8 +20,8 @@ LOCAL_MODULE:= libLLVM70LTO
 LOCAL_MODULE_TAGS := optional
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -36,7 +36,7 @@ LOCAL_MODULE:= libLLVM70LTO
 LOCAL_MODULE_TAGS := optional
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/LineEditor/Android.mk b/lib/LineEditor/Android.mk
index 5d81eb2..45e1cae 100644 (file)
--- a/lib/LineEditor/Android.mk
+++ b/lib/LineEditor/Android.mk
@@ -14,8 +14,8 @@ LOCAL_MODULE:= libLLVM70LineEditor
 LOCAL_MODULE_TAGS := optional
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -30,7 +30,7 @@ LOCAL_MODULE:= libLLVM70LineEditor
 LOCAL_MODULE_TAGS := optional
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Linker/Android.mk b/lib/Linker/Android.mk
index a01ea3b..ca534bc 100644 (file)
--- a/lib/Linker/Android.mk
+++ b/lib/Linker/Android.mk
@@ -15,8 +15,8 @@ LOCAL_MODULE:= libLLVM70Linker
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -29,7 +29,7 @@ LOCAL_SRC_FILES := $(linker_SRC_FILES)
 LOCAL_MODULE:= libLLVM70Linker
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Object/Android.mk b/lib/Object/Android.mk
index f6505dc..a9c4c04 100644 (file)
--- a/lib/Object/Android.mk
+++ b/lib/Object/Android.mk
@@ -38,8 +38,8 @@ LOCAL_SRC_FILES := $(object_SRC_FILES)
 LOCAL_CFLAGS_windows := -Wno-uninitialized
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -52,7 +52,7 @@ LOCAL_MODULE:= libLLVM70Object
 LOCAL_SRC_FILES := $(object_SRC_FILES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ObjectYAML/Android.mk b/lib/ObjectYAML/Android.mk
index 491c514..ac9a2ef 100644 (file)
--- a/lib/ObjectYAML/Android.mk
+++ b/lib/ObjectYAML/Android.mk
@@ -24,8 +24,8 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(object_yaml_SRC_FILES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -38,7 +38,7 @@ LOCAL_MODULE:= libLLVM70ObjectYAML
 LOCAL_SRC_FILES := $(object_yaml_SRC_FILES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Passes/Android.mk b/lib/Passes/Android.mk
index 166c2de..511726b 100644 (file)
--- a/lib/Passes/Android.mk
+++ b/lib/Passes/Android.mk
@@ -12,8 +12,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(passes_SRC_FILES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -26,7 +26,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(passes_SRC_FILES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/ProfileData/Android.mk b/lib/ProfileData/Android.mk
index dd20dfd..e3e8a8f 100644 (file)
--- a/lib/ProfileData/Android.mk
+++ b/lib/ProfileData/Android.mk
@@ -18,8 +18,8 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(profiledata_SRC_FILES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -31,7 +31,7 @@ LOCAL_MODULE:= libLLVM70ProfileData
 LOCAL_SRC_FILES := $(profiledata_SRC_FILES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/Android.mk b/lib/Target/AArch64/Android.mk
index 2c71132..e564ef0 100644 (file)
--- a/lib/Target/AArch64/Android.mk
+++ b/lib/Target/AArch64/Android.mk
@@ -73,8 +73,8 @@ TBLGEN_TABLES := $(aarch64_codegen_TBLGEN_TABLES)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -91,7 +91,7 @@ TBLGEN_TABLES := $(aarch64_codegen_TBLGEN_TABLES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 2bfc3cc..e9cdda0 100644 (file)
--- a/lib/Target/AArch64/Disassembler/Android.mk
+++ b/lib/Target/AArch64/Disassembler/Android.mk
@@ -29,8 +29,8 @@ LOCAL_MODULE:= libLLVM70AArch64Disassembler
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
@@ -53,7 +53,7 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 

diff --git a/lib/Target/AArch64/MCTargetDesc/Android.mk b/lib/Target/AArch64/MCTargetDesc/Android.mk
index 869762f..426c482 100644 (file)
--- a/lib/Target/AArch64/MCTargetDesc/Android.mk
+++ b/lib/Target/AArch64/MCTargetDesc/Android.mk
@@ -37,8 +37,8 @@ TBLGEN_TABLES := $(aarch64_mc_desc_TBLGEN_TABLES)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -57,7 +57,7 @@ TBLGEN_TABLES := $(aarch64_mc_desc_TBLGEN_TABLES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AArch64/Utils/Android.mk b/lib/Target/AArch64/Utils/Android.mk
index 024c04a..8c2d562 100644 (file)
--- a/lib/Target/AArch64/Utils/Android.mk
+++ b/lib/Target/AArch64/Utils/Android.mk
@@ -25,7 +25,7 @@ TBLGEN_TABLES := $(aarch64_utils_TBLGEN_TABLES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
@@ -46,5 +46,5 @@ TBLGEN_TABLES := $(aarch64_utils_TBLGEN_TABLES)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/lib/Target/AMDGPU/Android.mk b/lib/Target/AMDGPU/Android.mk
index 2a5750b..9889e55 100644 (file)
--- a/lib/Target/AMDGPU/Android.mk
+++ b/lib/Target/AMDGPU/Android.mk
@@ -108,8 +108,8 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -126,7 +126,7 @@ LOCAL_MODULE := libLLVM70AMDGPUCodeGen
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 05224a2..4a1d1f1 100644 (file)
--- a/lib/Target/AMDGPU/AsmParser/Android.mk
+++ b/lib/Target/AMDGPU/AsmParser/Android.mk
@@ -28,8 +28,8 @@ TBLGEN_TD_DIR := $(amdgpu_asm_parser_TBLGEN_TD_DIR)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
@@ -48,7 +48,7 @@ TBLGEN_TD_DIR := $(amdgpu_asm_parser_TBLGEN_TD_DIR)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/AMDGPU/MCTargetDesc/Android.mk b/lib/Target/AMDGPU/MCTargetDesc/Android.mk
index 2f8f78e..7bf82b5 100644 (file)
--- a/lib/Target/AMDGPU/MCTargetDesc/Android.mk
+++ b/lib/Target/AMDGPU/MCTargetDesc/Android.mk
@@ -34,8 +34,8 @@ TBLGEN_TABLES := $(amdgpu_mc_desc_TBLGEN_TABLES)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -54,7 +54,7 @@ TBLGEN_TABLES := $(amdgpu_mc_desc_TBLGEN_TABLES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 bf28449..d3f1d4a 100644 (file)
--- a/lib/Target/AMDGPU/TargetInfo/Android.mk
+++ b/lib/Target/AMDGPU/TargetInfo/Android.mk
@@ -25,8 +25,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -45,7 +45,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 0b95f99..71a5137 100644 (file)
--- a/lib/Target/AMDGPU/Utils/Android.mk
+++ b/lib/Target/AMDGPU/Utils/Android.mk
@@ -27,8 +27,8 @@ TBLGEN_TABLES := $(amdgpu_utils_TBLGEN_TABLES)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -47,7 +47,7 @@ TBLGEN_TABLES := $(amdgpu_utils_TBLGEN_TABLES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 66c07fd..1b792bc 100644 (file)
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -74,8 +74,8 @@ TBLGEN_TABLES := $(arm_codegen_TBLGEN_TABLES)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -92,7 +92,7 @@ TBLGEN_TABLES := $(arm_codegen_TBLGEN_TABLES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 af66304..e87562a 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/Android.mk
+++ b/lib/Target/ARM/MCTargetDesc/Android.mk
@@ -38,8 +38,8 @@ TBLGEN_TABLES := $(arm_mc_desc_TBLGEN_TABLES)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -59,7 +59,7 @@ TBLGEN_TABLES := $(arm_mc_desc_TBLGEN_TABLES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 df265bb..a7dc3db 100644 (file)
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -28,7 +28,7 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -50,6 +50,6 @@ LOCAL_MODULE:= libLLVM70ARMInfo
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk
index 231b0f5..520a39f 100644 (file)
--- a/lib/Target/Android.mk
+++ b/lib/Target/Android.mk
@@ -18,8 +18,8 @@ LOCAL_MODULE:= libLLVM70Target
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES := $(target_SRC_FILES)
 LOCAL_MODULE:= libLLVM70Target
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index 71c1165..e6c1a0e 100644 (file)
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -65,8 +65,8 @@ TBLGEN_TABLES := $(mips_codegen_TBLGEN_TABLES)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -84,7 +84,7 @@ TBLGEN_TABLES := $(mips_codegen_TBLGEN_TABLES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 0e5aa71..0c5b6ba 100644 (file)
--- a/lib/Target/Mips/AsmParser/Android.mk
+++ b/lib/Target/Mips/AsmParser/Android.mk
@@ -33,7 +33,7 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
@@ -52,6 +52,6 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 454a266..712698f 100644 (file)
--- a/lib/Target/Mips/Disassembler/Android.mk
+++ b/lib/Target/Mips/Disassembler/Android.mk
@@ -25,8 +25,8 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
@@ -46,6 +46,6 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 1281247..d9e8074 100644 (file)
--- a/lib/Target/Mips/InstPrinter/Android.mk
+++ b/lib/Target/Mips/InstPrinter/Android.mk
@@ -25,7 +25,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -44,6 +44,6 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/Mips/MCTargetDesc/Android.mk b/lib/Target/Mips/MCTargetDesc/Android.mk
index 3d5a9a1..ab558b1 100644 (file)
--- a/lib/Target/Mips/MCTargetDesc/Android.mk
+++ b/lib/Target/Mips/MCTargetDesc/Android.mk
@@ -36,8 +36,8 @@ TBLGEN_TABLES := $(mips_mc_desc_TBLGEN_TABLES)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -56,7 +56,7 @@ TBLGEN_TABLES := $(mips_mc_desc_TBLGEN_TABLES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 b32f5a9..bc56488 100644 (file)
--- a/lib/Target/Mips/TargetInfo/Android.mk
+++ b/lib/Target/Mips/TargetInfo/Android.mk
@@ -24,7 +24,7 @@ LOCAL_C_INCLUDES +=   $(LOCAL_PATH)/..
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -43,6 +43,6 @@ LOCAL_C_INCLUDES +=   $(LOCAL_PATH)/..
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index e926ab9..656859b 100644 (file)
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -73,8 +73,8 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -91,7 +91,7 @@ LOCAL_MODULE:= libLLVM70X86CodeGen
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_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 c4f1308..1611502 100644 (file)
--- a/lib/Target/X86/AsmParser/Android.mk
+++ b/lib/Target/X86/AsmParser/Android.mk
@@ -36,8 +36,8 @@ TBLGEN_TD_DIR := $(x86_asm_parser_TBLGEN_TD_DIR)
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
@@ -56,7 +56,7 @@ TBLGEN_TD_DIR := $(x86_asm_parser_TBLGEN_TD_DIR)
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/X86/MCTargetDesc/Android.mk b/lib/Target/X86/MCTargetDesc/Android.mk
index c4ce5eb..353093b 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/Android.mk
+++ b/lib/Target/X86/MCTargetDesc/Android.mk
@@ -30,7 +30,7 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 include $(LLVM70_HOST_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device only
@@ -49,6 +49,6 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
 include $(LLVM70_DEVICE_BUILD_MK)
 include $(LLVM70_TBLGEN_RULES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Coroutines/Android.mk b/lib/Transforms/Coroutines/Android.mk
index 9b0348b..52626f8 100644 (file)
--- a/lib/Transforms/Coroutines/Android.mk
+++ b/lib/Transforms/Coroutines/Android.mk
@@ -20,8 +20,8 @@ LOCAL_MODULE:= libLLVM70Coroutines
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -33,7 +33,7 @@ LOCAL_SRC_FILES := $(transforms_coroutines_SRC_FILES)
 LOCAL_MODULE:= libLLVM70Coroutines
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Hello/Android.mk b/lib/Transforms/Hello/Android.mk
index 9d52b73..4086357 100644 (file)
--- a/lib/Transforms/Hello/Android.mk
+++ b/lib/Transforms/Hello/Android.mk
@@ -17,5 +17,5 @@ LOCAL_MODULE:= LLVM70Hello
 LOCAL_LDFLAGS_darwin := -Wl,-undefined -Wl,dynamic_lookup
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/lib/Transforms/IPO/Android.mk b/lib/Transforms/IPO/Android.mk
index 8d2fd02..7bae7be 100644 (file)
--- a/lib/Transforms/IPO/Android.mk
+++ b/lib/Transforms/IPO/Android.mk
@@ -43,8 +43,8 @@ LOCAL_MODULE:= libLLVM70ipo
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -56,7 +56,7 @@ LOCAL_SRC_FILES := $(transforms_ipo_SRC_FILES)
 LOCAL_MODULE:= libLLVM70ipo
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/InstCombine/Android.mk b/lib/Transforms/InstCombine/Android.mk
index 91057e7..37fffea 100644 (file)
--- a/lib/Transforms/InstCombine/Android.mk
+++ b/lib/Transforms/InstCombine/Android.mk
@@ -25,8 +25,8 @@ LOCAL_MODULE:= libLLVM70InstCombine
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -38,7 +38,7 @@ LOCAL_SRC_FILES := $(transforms_inst_combine_SRC_FILES)
 LOCAL_MODULE:= libLLVM70InstCombine
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index 19f5434..b4bfce5 100644 (file)
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -24,8 +24,8 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(instrumentation_SRC_FILES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the target
@@ -37,7 +37,7 @@ LOCAL_MODULE:= libLLVM70Instrumentation
 LOCAL_SRC_FILES := $(instrumentation_SRC_FILES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/ObjCARC/Android.mk b/lib/Transforms/ObjCARC/Android.mk
index 57213e8..9ad5cb9 100644 (file)
--- a/lib/Transforms/ObjCARC/Android.mk
+++ b/lib/Transforms/ObjCARC/Android.mk
@@ -21,8 +21,8 @@ LOCAL_MODULE:= libLLVM70TransformObjCARC
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -34,7 +34,7 @@ LOCAL_SRC_FILES := $(transforms_objcarc_SRC_FILES)
 LOCAL_MODULE:= libLLVM70TransformObjCARC
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index 770c820..81e6b7e 100644 (file)
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -77,8 +77,8 @@ LOCAL_MODULE:= libLLVM70ScalarOpts
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -90,7 +90,7 @@ LOCAL_SRC_FILES := $(transforms_scalar_SRC_FILES)
 LOCAL_MODULE:= libLLVM70ScalarOpts
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 60db734..2c6506a 100644 (file)
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -67,8 +67,8 @@ LOCAL_MODULE:= libLLVM70TransformUtils
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -80,7 +80,7 @@ LOCAL_SRC_FILES := $(transforms_utils_SRC_FILES)
 LOCAL_MODULE:= libLLVM70TransformUtils
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Transforms/Vectorize/Android.mk b/lib/Transforms/Vectorize/Android.mk
index d515fab..7c87ea8 100644 (file)
--- a/lib/Transforms/Vectorize/Android.mk
+++ b/lib/Transforms/Vectorize/Android.mk
@@ -16,8 +16,8 @@ LOCAL_MODULE:= libLLVM70Vectorize
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -29,7 +29,7 @@ LOCAL_SRC_FILES := $(transforms_vectorize_SRC_FILES)
 LOCAL_MODULE:= libLLVM70Vectorize
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/XRay/Android.mk b/lib/XRay/Android.mk
index bdd29cf..b4a656e 100644 (file)
--- a/lib/XRay/Android.mk
+++ b/lib/XRay/Android.mk
@@ -13,8 +13,8 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_SRC_FILES := $(xray_SRC_FILES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
@@ -26,7 +26,7 @@ LOCAL_MODULE:= libLLVM70XRay
 LOCAL_SRC_FILES := $(xray_SRC_FILES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/llvm.mk b/llvm.mk
index f79d437..2b11b3b 100644 (file)
--- a/llvm.mk
+++ b/llvm.mk
@@ -5,8 +5,8 @@ endif
 CLEAR_TBLGEN_VARS := $(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
-LLVM_GEN_ATTRIBUTES_MK := $(LLVM70_ROOT_PATH)/llvm-gen-attributes.mk
-LLVM_GEN_INTRINSICS_MK := $(LLVM70_ROOT_PATH)/llvm-gen-intrinsics.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
 
 LLVM_SUPPORTED_ARCH := arm arm64 mips mips64 x86 x86_64

diff --git a/tools/bugpoint-passes/Android.mk b/tools/bugpoint-passes/Android.mk
index f66455e..3604a3b 100644 (file)
--- a/tools/bugpoint-passes/Android.mk
+++ b/tools/bugpoint-passes/Android.mk
@@ -17,6 +17,6 @@ LOCAL_MODULE_CLASS := SHARED_LIBRARIES # needed for tblgen
 LOCAL_LDFLAGS_darwin := -Wl,-undefined -Wl,dynamic_lookup
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/tools/bugpoint/Android.mk b/tools/bugpoint/Android.mk
index 34ecb75..579c95a 100644 (file)
--- a/tools/bugpoint/Android.mk
+++ b/tools/bugpoint/Android.mk
@@ -57,6 +57,6 @@ LOCAL_LDFLAGS_linux := -Wl,--export-dynamic
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/dsymutil/Android.mk b/tools/dsymutil/Android.mk
index 7fe9c1c..c3925ca 100644 (file)
--- a/tools/dsymutil/Android.mk
+++ b/tools/dsymutil/Android.mk
@@ -67,5 +67,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 LOCAL_STATIC_LIBRARIES := $(llvm_dsymutil_STATIC_LIBRARIES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/gold/Android.mk b/tools/gold/Android.mk
index 254f99a..18c2c60 100644 (file)
--- a/tools/gold/Android.mk
+++ b/tools/gold/Android.mk
@@ -42,6 +42,6 @@ endif
 LOCAL_C_INCLUDES += toolchain/binutils/binutils-2.25/include
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index 6feba44..36499ee 100644 (file)
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -95,8 +95,8 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
 
@@ -130,7 +130,7 @@ LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES)
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/tools/lli/Android.mk b/tools/lli/Android.mk
index e70f5dc..a35c723 100644 (file)
--- a/tools/lli/Android.mk
+++ b/tools/lli/Android.mk
@@ -81,6 +81,6 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/lli/ChildTarget/Android.mk b/tools/lli/ChildTarget/Android.mk
index e616f08..d5ebb80 100644 (file)
--- a/tools/lli/ChildTarget/Android.mk
+++ b/tools/lli/ChildTarget/Android.mk
@@ -27,5 +27,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-ar/Android.mk b/tools/llvm-ar/Android.mk
index a7e12ad..cc22184 100644 (file)
--- a/tools/llvm-ar/Android.mk
+++ b/tools/llvm-ar/Android.mk
@@ -30,5 +30,5 @@ LOCAL_POST_INSTALL_CMD = $(hide) ln -sf llvm-ar $(dir $(LOCAL_INSTALLED_MODULE))
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-as/Android.mk b/tools/llvm-as/Android.mk
index 1e0a0f8..ba68d45 100644 (file)
--- a/tools/llvm-as/Android.mk
+++ b/tools/llvm-as/Android.mk
@@ -21,5 +21,5 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVM70Support
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-bcanalyzer/Android.mk b/tools/llvm-bcanalyzer/Android.mk
index f6f8cce..fef9dab 100644 (file)
--- a/tools/llvm-bcanalyzer/Android.mk
+++ b/tools/llvm-bcanalyzer/Android.mk
@@ -31,6 +31,6 @@ LOCAL_C_INCLUDES += external/llvm/include
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-c-test/Android.mk b/tools/llvm-c-test/Android.mk
index 05bc899..395af30 100644 (file)
--- a/tools/llvm-c-test/Android.mk
+++ b/tools/llvm-c-test/Android.mk
@@ -74,5 +74,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-cov/Android.mk b/tools/llvm-cov/Android.mk
index e83c2ef..8d45155 100644 (file)
--- a/tools/llvm-cov/Android.mk
+++ b/tools/llvm-cov/Android.mk
@@ -41,5 +41,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-cxxdump/Android.mk b/tools/llvm-cxxdump/Android.mk
index 1095964..03568ab 100644 (file)
--- a/tools/llvm-cxxdump/Android.mk
+++ b/tools/llvm-cxxdump/Android.mk
@@ -56,5 +56,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 LOCAL_STATIC_LIBRARIES := $(llvm_cxxdump_STATIC_LIBRARIES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-diff/Android.mk b/tools/llvm-diff/Android.mk
index e3c8379..cef1a0c 100644 (file)
--- a/tools/llvm-diff/Android.mk
+++ b/tools/llvm-diff/Android.mk
@@ -35,6 +35,6 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-dis/Android.mk b/tools/llvm-dis/Android.mk
index a330f73..c0049b6 100644 (file)
--- a/tools/llvm-dis/Android.mk
+++ b/tools/llvm-dis/Android.mk
@@ -18,6 +18,6 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVM70Support
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-dwarfdump/Android.mk b/tools/llvm-dwarfdump/Android.mk
index 0147b5e..9955e3b 100644 (file)
--- a/tools/llvm-dwarfdump/Android.mk
+++ b/tools/llvm-dwarfdump/Android.mk
@@ -35,5 +35,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-dwp/Android.mk b/tools/llvm-dwp/Android.mk
index 85297c8..791511a 100644 (file)
--- a/tools/llvm-dwp/Android.mk
+++ b/tools/llvm-dwp/Android.mk
@@ -81,5 +81,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-extract/Android.mk b/tools/llvm-extract/Android.mk
index 423aa44..0debcf9 100644 (file)
--- a/tools/llvm-extract/Android.mk
+++ b/tools/llvm-extract/Android.mk
@@ -38,6 +38,6 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-link/Android.mk b/tools/llvm-link/Android.mk
index 1323ab9..691d7b1 100644 (file)
--- a/tools/llvm-link/Android.mk
+++ b/tools/llvm-link/Android.mk
@@ -32,7 +32,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_link_STATIC_LIBRARIES)
 LOCAL_LDLIBS += -lpthread
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
 #===---------------------------------------------------------------===
@@ -49,6 +49,6 @@ LOCAL_SRC_FILES := $(llvm_link_SRC_FILES)
 LOCAL_STATIC_LIBRARIES := $(llvm_link_STATIC_LIBRARIES)
 
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/tools/llvm-lto/Android.mk b/tools/llvm-lto/Android.mk
index ab1135e..06609df 100644 (file)
--- a/tools/llvm-lto/Android.mk
+++ b/tools/llvm-lto/Android.mk
@@ -78,6 +78,6 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-mc/Android.mk b/tools/llvm-mc/Android.mk
index fe5b097..7778fa2 100644 (file)
--- a/tools/llvm-mc/Android.mk
+++ b/tools/llvm-mc/Android.mk
@@ -64,5 +64,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-mcmarkup/Android.mk b/tools/llvm-mcmarkup/Android.mk
index 42fd891..8315456 100644 (file)
--- a/tools/llvm-mcmarkup/Android.mk
+++ b/tools/llvm-mcmarkup/Android.mk
@@ -29,5 +29,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-nm/Android.mk b/tools/llvm-nm/Android.mk
index 999edbd..9bcfb63 100644 (file)
--- a/tools/llvm-nm/Android.mk
+++ b/tools/llvm-nm/Android.mk
@@ -64,6 +64,6 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-objdump/Android.mk b/tools/llvm-objdump/Android.mk
index 88a6a5a..c10fb4b 100644 (file)
--- a/tools/llvm-objdump/Android.mk
+++ b/tools/llvm-objdump/Android.mk
@@ -68,5 +68,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-profdata/Android.mk b/tools/llvm-profdata/Android.mk
index 43c18da..0a9fe45 100644 (file)
--- a/tools/llvm-profdata/Android.mk
+++ b/tools/llvm-profdata/Android.mk
@@ -31,6 +31,6 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-readobj/Android.mk b/tools/llvm-readobj/Android.mk
index f435e35..c0ca229 100644 (file)
--- a/tools/llvm-readobj/Android.mk
+++ b/tools/llvm-readobj/Android.mk
@@ -47,5 +47,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-rtdyld/Android.mk b/tools/llvm-rtdyld/Android.mk
index bf0cedb..4b3d229 100644 (file)
--- a/tools/llvm-rtdyld/Android.mk
+++ b/tools/llvm-rtdyld/Android.mk
@@ -65,5 +65,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-size/Android.mk b/tools/llvm-size/Android.mk
index 406447a..a771aeb 100644 (file)
--- a/tools/llvm-size/Android.mk
+++ b/tools/llvm-size/Android.mk
@@ -33,5 +33,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-split/Android.mk b/tools/llvm-split/Android.mk
index 173a692..ac293e1 100644 (file)
--- a/tools/llvm-split/Android.mk
+++ b/tools/llvm-split/Android.mk
@@ -25,5 +25,5 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVM70Support
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/llvm-symbolizer/Android.mk b/tools/llvm-symbolizer/Android.mk
index 33cea48..5438797 100644 (file)
--- a/tools/llvm-symbolizer/Android.mk
+++ b/tools/llvm-symbolizer/Android.mk
@@ -26,7 +26,7 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVM70Support
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
 include $(CLEAR_VARS)

diff --git a/tools/lto/Android.mk b/tools/lto/Android.mk
index 0fab238..1850ebc 100644 (file)
--- a/tools/lto/Android.mk
+++ b/tools/lto/Android.mk
@@ -100,6 +100,6 @@ LOCAL_LDLIBS_linux := -lpthread -ldl
 LOCAL_STATIC_LIBRARIES := $(llvm_lto_STATIC_LIBRARIES) $(llvm_lto_STATIC_LIBRARIES)
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)

diff --git a/tools/obj2yaml/Android.mk b/tools/obj2yaml/Android.mk
index 207b545..22032b9 100644 (file)
--- a/tools/obj2yaml/Android.mk
+++ b/tools/obj2yaml/Android.mk
@@ -36,5 +36,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/opt/Android.mk b/tools/opt/Android.mk
index 27a17b4..cf34c9a 100644 (file)
--- a/tools/opt/Android.mk
+++ b/tools/opt/Android.mk
@@ -81,8 +81,8 @@ LOCAL_LDFLAGS_linux := -Wl,--export-dynamic
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
 
@@ -98,7 +98,7 @@ LOCAL_STATIC_LIBRARIES := $(llvm_opt_STATIC_LIBRARIES)
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_DEVICE_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/tools/verify-uselistorder/Android.mk b/tools/verify-uselistorder/Android.mk
index 5356681..41a5f26 100644 (file)
--- a/tools/verify-uselistorder/Android.mk
+++ b/tools/verify-uselistorder/Android.mk
@@ -23,6 +23,6 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVM70Support
 
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_ATTRIBUTES_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_ATTRIBUTES_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)

diff --git a/tools/yaml2obj/Android.mk b/tools/yaml2obj/Android.mk
index 120a365..cce74d7 100644 (file)
--- a/tools/yaml2obj/Android.mk
+++ b/tools/yaml2obj/Android.mk
@@ -35,5 +35,5 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
 
 include $(LLVM70_ROOT_PATH)/llvm.mk
 include $(LLVM70_HOST_BUILD_MK)
-include $(LLVM_GEN_INTRINSICS_MK)
+include $(LLVM70_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_EXECUTABLE)