android: Target/ARM: fix Attributes and Intrinsics dependencies

Needed to avoid following building errors:

In file included from external/llvm90/lib/Target/ARM/AsmParser/ARMAsmParser.cpp:10:
In file included from external/llvm90/lib/Target/ARM/AsmParser/../ARMBaseInstrInfo.h:19:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineBasicBlock.h:21:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineInstr.h:23:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/Analysis/AliasAnalysis.h:44:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/Analysis/MemoryLocation.h:20:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/IR/Instructions.h:26:
external/llvm90/lib/Transforms/Hello/../../../include/llvm/IR/Attributes.h:73:14: fatal error: 'llvm/IR/Attributes.inc' file not found
    #include "llvm/IR/Attributes.inc"
             ^~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

In file included from external/llvm90/lib/Target/ARM/AsmParser/ARMAsmParser.cpp:10:
In file included from external/llvm90/lib/Target/ARM/AsmParser/../ARMBaseInstrInfo.h:19:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineBasicBlock.h:21:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineInstr.h:25:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineOperand.h:18:
external/llvm90/lib/Transforms/Hello/../../../include/llvm/IR/Intrinsics.h:41:10: fatal error: 'llvm/IR/IntrinsicEnums.inc' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

In file included from external/llvm90/lib/Target/ARM/Disassembler/ARMDisassembler.cpp:9:
In file included from external/llvm90/lib/Target/ARM/Disassembler/../ARMBaseInstrInfo.h:19:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineBasicBlock.h:21:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineInstr.h:23:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/Analysis/AliasAnalysis.h:44:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/Analysis/MemoryLocation.h:20:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/IR/Instructions.h:26:
external/llvm90/lib/Transforms/Hello/../../../include/llvm/IR/Attributes.h:73:14: fatal error: 'llvm/IR/Attributes.inc' file not found
    #include "llvm/IR/Attributes.inc"
             ^~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

In file included from external/llvm90/lib/Target/ARM/Disassembler/ARMDisassembler.cpp:9:
In file included from external/llvm90/lib/Target/ARM/Disassembler/../ARMBaseInstrInfo.h:19:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineBasicBlock.h:21:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineInstr.h:25:
In file included from external/llvm90/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineOperand.h:18:
external/llvm90/lib/Transforms/Hello/../../../include/llvm/IR/Intrinsics.h:41:10: fatal error: 'llvm/IR/IntrinsicEnums.inc' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk
index 0867de9..c1f220a 100644 (file)
--- a/lib/Target/ARM/AsmParser/Android.mk
+++ b/lib/Target/ARM/AsmParser/Android.mk
@@ -34,6 +34,8 @@ TBLGEN_TD_DIR90 := $(arm_asm_parser_TBLGEN_TD_DIR90)
 
 include $(LLVM90_HOST_BUILD_MK)
 include $(LLVM90_TBLGEN_RULES_MK)
+include $(LLVM90_GEN_ATTRIBUTES_MK)
+include $(LLVM90_GEN_INTRINSICS_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
@@ -58,5 +60,7 @@ TBLGEN_TD_DIR90 := $(arm_asm_parser_TBLGEN_TD_DIR90)
 
 include $(LLVM90_DEVICE_BUILD_MK)
 include $(LLVM90_TBLGEN_RULES_MK)
+include $(LLVM90_GEN_ATTRIBUTES_MK)
+include $(LLVM90_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif

diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index 3effdd2..2b6a0ed 100644 (file)
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -28,6 +28,8 @@ LOCAL_MODULE:= libLLVM90ARMDisassembler
 
 include $(LLVM90_DEVICE_BUILD_MK)
 include $(LLVM90_TBLGEN_RULES_MK)
+include $(LLVM90_GEN_ATTRIBUTES_MK)
+include $(LLVM90_GEN_INTRINSICS_MK)
 include $(BUILD_STATIC_LIBRARY)
 endif
 
@@ -50,5 +52,7 @@ LOCAL_MODULE_HOST_OS := darwin linux windows
 
 include $(LLVM90_HOST_BUILD_MK)
 include $(LLVM90_TBLGEN_RULES_MK)
+include $(LLVM90_GEN_ATTRIBUTES_MK)
+include $(LLVM90_GEN_INTRINSICS_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)