From c156bc696311928af01132d159b9e307436779bb Mon Sep 17 00:00:00 2001 From: Shih-wei Liao Date: Mon, 7 Jun 2010 22:05:52 -0700 Subject: Fix llvm.mk and the other 49 mk files Change-Id: I5aa02363c1083297d163a575f5a35c495f950230 --- lib/Target/ARM/Android.mk | 5 +++++ lib/Target/ARM/AsmParser/Android.mk | 9 +++++++-- lib/Target/ARM/AsmPrinter/Android.mk | 7 ++++++- lib/Target/ARM/Disassembler/Android.mk | 7 ++++++- lib/Target/ARM/TargetInfo/Android.mk | 7 ++++++- 5 files changed, 30 insertions(+), 5 deletions(-) (limited to 'lib/Target/ARM') diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk index e4d2f68..2345b65 100644 --- a/lib/Target/ARM/Android.mk +++ b/lib/Target/ARM/Android.mk @@ -1,3 +1,6 @@ +# Only use this on the device or emulator. +ifneq ($(TARGET_ARCH),arm) + LOCAL_PATH := $(call my-dir) arm_codegen_TBLGEN_TABLES := \ @@ -68,3 +71,5 @@ include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(LLVM_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 6303fd0..e28fa40 100644 --- a/lib/Target/ARM/AsmParser/Android.mk +++ b/lib/Target/ARM/AsmParser/Android.mk @@ -1,3 +1,6 @@ +# Only use this on the device or emulator. +ifneq ($(TARGET_ARCH),arm) + LOCAL_PATH := $(call my-dir) # For the device only @@ -9,14 +12,14 @@ TBLGEN_TABLES := \ ARMGenInstrNames.inc \ ARMGenRegisterNames.inc \ ARMGenRegisterInfo.h.inc - + TBLGEN_TD_DIR := $(LOCAL_PATH)/.. LOCAL_SRC_FILES := \ ARMAsmLexer.cpp \ ARMAsmParser.cpp - + LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/.. @@ -25,3 +28,5 @@ LOCAL_MODULE:= libLLVMARMAsmParser include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(BUILD_STATIC_LIBRARY) + +endif diff --git a/lib/Target/ARM/AsmPrinter/Android.mk b/lib/Target/ARM/AsmPrinter/Android.mk index 727ab1d..40eddf5 100644 --- a/lib/Target/ARM/AsmPrinter/Android.mk +++ b/lib/Target/ARM/AsmPrinter/Android.mk @@ -1,3 +1,6 @@ +# Only use this on the device or emulator. +ifneq ($(TARGET_ARCH),arm) + LOCAL_PATH := $(call my-dir) arm_asm_printer_TBLGEN_TABLES := \ @@ -10,7 +13,7 @@ arm_asm_printer_SRC_FILES := \ ARMAsmPrinter.cpp \ ARMInstPrinter.cpp \ ARMMCInstLower.cpp - + # For the host # ===================================================== include $(CLEAR_VARS) @@ -50,3 +53,5 @@ LOCAL_MODULE:= libLLVMARMAsmPrinter include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_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 6aead82..4a243e0 100644 --- a/lib/Target/ARM/Disassembler/Android.mk +++ b/lib/Target/ARM/Disassembler/Android.mk @@ -1,3 +1,6 @@ +# Only use this on the device or emulator. +ifneq ($(TARGET_ARCH),arm) + LOCAL_PATH := $(call my-dir) # For the device only @@ -18,7 +21,7 @@ TBLGEN_TD_DIR := $(LOCAL_PATH)/.. LOCAL_SRC_FILES := \ ARMDisassembler.cpp \ ARMDisassemblerCore.cpp - + LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/.. @@ -27,3 +30,5 @@ LOCAL_MODULE:= libLLVMARMDisassembler include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(BUILD_STATIC_LIBRARY) + +endif diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk index 9297d36..f594a9d 100644 --- a/lib/Target/ARM/TargetInfo/Android.mk +++ b/lib/Target/ARM/TargetInfo/Android.mk @@ -1,3 +1,6 @@ +# Only use this on the device or emulator. +ifneq ($(TARGET_ARCH),arm) + LOCAL_PATH := $(call my-dir) arm_target_info_TBLGEN_TABLES := \ @@ -6,7 +9,7 @@ arm_target_info_TBLGEN_TABLES := \ arm_target_info_SRC_FILES := \ ARMTargetInfo.cpp - + # For the host # ===================================================== include $(CLEAR_VARS) @@ -46,3 +49,5 @@ LOCAL_MODULE:= libLLVMARMInfo include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_TBLGEN_RULES_MK) include $(BUILD_STATIC_LIBRARY) + +endif -- cgit v1.1