diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-11-01 20:51:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-01 20:51:11 +0000 |
| commit | f08deabf0e1fc07d90a797960a89d8a535e9e265 (patch) | |
| tree | ee72bac8a43150e9eff5591d7a1ebc8cc5b77190 | |
| parent | 87d08390069c9e6461a64a571d6a288e8caa4af5 (diff) | |
| parent | 7ebb1e3516ebd630aa3fe94f9b4cca2c2dbb09ae (diff) | |
| download | llvm-f08deabf0e1fc07d90a797960a89d8a535e9e265.tar.gz | |
Merge "Disable tblgen in Make"
| -rw-r--r-- | clear_tblgen_vars.mk | 3 | ||||
| -rw-r--r-- | llvm-device-build.mk | 15 | ||||
| -rw-r--r-- | llvm-gen-attributes.mk | 17 | ||||
| -rw-r--r-- | llvm-gen-intrinsics.mk | 18 | ||||
| -rw-r--r-- | llvm-host-build.mk | 16 |
5 files changed, 3 insertions, 66 deletions
diff --git a/clear_tblgen_vars.mk b/clear_tblgen_vars.mk index 6c9623e42702..8e0422a24402 100644 --- a/clear_tblgen_vars.mk +++ b/clear_tblgen_vars.mk @@ -1,2 +1 @@ -TBLGEN_TABLES := -TBLGEN_TD_DIR := +$(error Use llvm-defaults with an Android.bp module. make is not supported) diff --git a/llvm-device-build.mk b/llvm-device-build.mk index 2889925ec974..f14f4941cec4 100644 --- a/llvm-device-build.mk +++ b/llvm-device-build.mk @@ -48,18 +48,3 @@ LOCAL_C_INCLUDES := \ $(LLVM_ROOT_PATH)/include \ $(LLVM_ROOT_PATH)/device/include \ $(LOCAL_C_INCLUDES) - -########################################################### -## Commands for running tblgen to compile a td file -########################################################### -define transform-device-td-to-out -@mkdir -p $(dir $@) -@echo "Device TableGen (gen-$(1)): $(TBLGEN_LOCAL_MODULE) <= $<" -$(hide) $(LLVM_TBLGEN) \ - -I $(dir $<) \ - -I $(LLVM_ROOT_PATH)/include \ - -I $(LLVM_ROOT_PATH)/device/include \ - -I $(LLVM_ROOT_PATH)/lib/Target \ - -gen-$(strip $(1)) \ - -d $@.d -o $@ $< -endef diff --git a/llvm-gen-attributes.mk b/llvm-gen-attributes.mk index 5c187fdf3828..8e0422a24402 100644 --- a/llvm-gen-attributes.mk +++ b/llvm-gen-attributes.mk @@ -1,16 +1 @@ -ATTRIBUTETD := $(LLVM_ROOT_PATH)/include/llvm/IR/Attributes.td - -ifeq ($(LOCAL_MODULE_CLASS),) - LOCAL_MODULE_CLASS := STATIC_LIBRARIES -endif - -GENFILE := $(addprefix $(call local-generated-sources-dir)/llvm/IR/,Attributes.inc) -LOCAL_GENERATED_SOURCES += $(GENFILE) -$(GENFILE): TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE) -$(GENFILE): $(ATTRIBUTETD) | $(LLVM_TBLGEN) -ifeq ($(LOCAL_IS_HOST_MODULE),true) - $(call transform-host-td-to-out,attrs) -else - $(call transform-device-td-to-out,attrs) -endif -$(call include-depfile, $(GENFILE).d, $(GENFILE)) +$(error Use llvm-defaults with an Android.bp module. make is not supported) diff --git a/llvm-gen-intrinsics.mk b/llvm-gen-intrinsics.mk index 2cfdce4a3b95..8e0422a24402 100644 --- a/llvm-gen-intrinsics.mk +++ b/llvm-gen-intrinsics.mk @@ -1,17 +1 @@ -# We treat Intrinsics.td as a very special target just like what lib/VMCore/Makefile does -INTRINSICTD := $(LLVM_ROOT_PATH)/include/llvm/IR/Intrinsics.td - -ifeq ($(LOCAL_MODULE_CLASS),) - LOCAL_MODULE_CLASS := STATIC_LIBRARIES -endif - -GENFILE := $(addprefix $(call local-generated-sources-dir)/llvm/IR/,Intrinsics.gen) -LOCAL_GENERATED_SOURCES += $(GENFILE) -$(GENFILE): TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE) -$(GENFILE): $(INTRINSICTD) | $(LLVM_TBLGEN) -ifeq ($(LOCAL_IS_HOST_MODULE),true) - $(call transform-host-td-to-out,intrinsic) -else - $(call transform-device-td-to-out,intrinsic) -endif -$(call include-depfile, $(GENFILE).d, $(GENFILE)) +$(error Use llvm-defaults with an Android.bp module. make is not supported) diff --git a/llvm-host-build.mk b/llvm-host-build.mk index 6ec7d2431cdc..89074a8d7760 100644 --- a/llvm-host-build.mk +++ b/llvm-host-build.mk @@ -67,19 +67,3 @@ ifeq (libLLVM, $(filter libLLVM,$(LOCAL_SHARED_LIBRARIES)$(LOCAL_SHARED_LIBRARIE # Skip building a 32-bit shared object if they are using libLLVM. LOCAL_MULTILIB := first endif - -########################################################### -## Commands for running tblgen to compile a td file -########################################################### -define transform-host-td-to-out -@mkdir -p $(dir $@) -@echo "Host TableGen: $(TBLGEN_LOCAL_MODULE) (gen-$(1)) <= $<" -$(hide) $(LLVM_TBLGEN) \ - -I $(dir $<) \ - -I $(LLVM_ROOT_PATH)/include \ - -I $(LLVM_ROOT_PATH)/host/include \ - -I $(LLVM_ROOT_PATH)/lib/Target \ - $(if $(strip $(CLANG_ROOT_PATH)),-I $(CLANG_ROOT_PATH)/include,) \ - -gen-$(strip $(1)) \ - -d $@.d -o $@ $< -endef |