From 3aef70314b053a1df4f85ca4a6f3890d06ebbdd6 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Tue, 8 Jan 2013 23:43:13 -0800 Subject: Update LLVM for merge to r171905. Android.mk lib/Analysis/Android.mk lib/CodeGen/Android.mk lib/CodeGen/MachineScheduler.cpp - specify std::pop_heap() lib/IR/Android.mk - new from lib/VMCore lib/MC/Android.mk lib/MC/MCAssembler.cpp - put back pointer param (from reference). lib/Support/DeltaAlgorithm.cpp - iterator -> const_iterator ! lib/TableGen/Android.mk lib/Target/ARM/ARMJITInfo.cpp - Removed unused legacy JIT changes lib/Target/ARM/Android.mk lib/Target/ARM/AsmParser/Android.mk lib/Target/ARM/Disassembler/Android.mk lib/Target/ARM/MCTargetDesc/Android.mk lib/Target/Android.mk lib/Target/Mips/Android.mk lib/Target/Mips/Disassembler/Android.mk lib/Target/Mips/MCTargetDesc/Android.mk lib/Target/X86/Android.mk lib/Target/X86/AsmParser/Android.mk lib/Target/X86/Disassembler/Android.mk lib/Transforms/IPO/Android.mk lib/Transforms/Instrumentation/Android.mk lib/Transforms/Scalar/Android.mk lib/Transforms/Utils/Android.mk lib/Transforms/Vectorize/Android.mk lib/VMCore/Android.mk - moved to lib/IR llvm-gen-intrinsics.mk - new Intrinsics.td location utils/TableGen/Android.mk Change-Id: Ifebdb1716c372fd917a844c44be9d10df66434b0 --- llvm-gen-intrinsics.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'llvm-gen-intrinsics.mk') diff --git a/llvm-gen-intrinsics.mk b/llvm-gen-intrinsics.mk index 2c96655..3a97717 100644 --- a/llvm-gen-intrinsics.mk +++ b/llvm-gen-intrinsics.mk @@ -1,5 +1,5 @@ # We treat Intrinsics.td as a very special target just like what lib/VMCore/Makefile does -INTRINSICTD := $(LLVM_ROOT_PATH)/include/llvm/Intrinsics.td +INTRINSICTD := $(LLVM_ROOT_PATH)/include/llvm/IR/Intrinsics.td INTRINSICTDS := $(wildcard $(dir $(INTRINSICTD))/Intrinsics*.td) LOCAL_SRC_FILES := $(INTRINSICTD) $(LOCAL_SRC_FILES) @@ -8,7 +8,7 @@ ifeq ($(LOCAL_MODULE_CLASS),) LOCAL_MODULE_CLASS := STATIC_LIBRARIES endif -GENFILE := $(addprefix $(call local-intermediates-dir)/llvm/,Intrinsics.gen) +GENFILE := $(addprefix $(call local-intermediates-dir)/llvm/IR/,Intrinsics.gen) LOCAL_GENERATED_SOURCES += $(GENFILE) $(GENFILE): TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE) $(GENFILE): $(INTRINSICTD) $(INTRINSICTDS) $(TBLGEN) -- cgit v1.1