From af8b851ec8f1c516a09c3ca65127d23074db4f56 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sun, 10 Jun 2018 22:38:51 +0200 Subject: [PATCH] android: Target/Mips: fix Intrinsics dependencies Needed to avoid following building errors: In file included from external/llvm/lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp:16: In file included from external/llvm/lib/Target/Mips/InstPrinter/../MipsInstrInfo.h:23: In file included from external/llvm/lib/Target/Mips/InstPrinter/../MipsRegisterInfo.h:18: In file included from external/llvm/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineBasicBlock.h:22: In file included from external/llvm/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineInstr.h:24: In file included from external/llvm/lib/Transforms/Hello/../../../include/llvm/CodeGen/MachineOperand.h:18: external/llvm/lib/Transforms/Hello/../../../include/llvm/IR/Intrinsics.h:42:10: fatal error: 'llvm/IR/Intrinsics.inc' file not found #include "llvm/IR/Intrinsics.inc" ^~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. In file included from external/llvm/lib/Target/Mips/TargetInfo/MipsTargetInfo.cpp:11: In file included from external/llvm/lib/Transforms/Hello/../../../include/llvm/IR/Module.h:26: In file included from external/llvm/lib/Transforms/Hello/../../../include/llvm/IR/Function.h:33: external/llvm/lib/Transforms/Hello/../../../include/llvm/IR/Intrinsics.h:42:10: fatal error: 'llvm/IR/Intrinsics.gen' file not found ^~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. --- lib/Target/Mips/InstPrinter/Android.mk | 2 ++ lib/Target/Mips/TargetInfo/Android.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/Target/Mips/InstPrinter/Android.mk b/lib/Target/Mips/InstPrinter/Android.mk index 53c9c798e40..5d37e5035db 100644 --- a/lib/Target/Mips/InstPrinter/Android.mk +++ b/lib/Target/Mips/InstPrinter/Android.mk @@ -26,6 +26,7 @@ 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 $(BUILD_HOST_STATIC_LIBRARY) # For the device only @@ -45,5 +46,6 @@ 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 $(BUILD_STATIC_LIBRARY) endif diff --git a/lib/Target/Mips/TargetInfo/Android.mk b/lib/Target/Mips/TargetInfo/Android.mk index da22c4f84b9..5626ec9a82f 100644 --- a/lib/Target/Mips/TargetInfo/Android.mk +++ b/lib/Target/Mips/TargetInfo/Android.mk @@ -25,6 +25,7 @@ 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 $(BUILD_HOST_STATIC_LIBRARY) # For the device @@ -44,5 +45,6 @@ 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 $(BUILD_STATIC_LIBRARY) endif -- 2.11.0