P4 to Git Change 1465195 by lmoriche@lmoriche_opencl_dev2 on 2017/09/29 17:50:34

SWDEV-86035 - Fix OCL/PAL build on Linux
	- Split BUILD_*_DEVICE and BULD_LLVM_*_TARGET.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#54 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/Makefile#25 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/llvmdefs#45 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/llvmlibs#49 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Target/Makefile#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/llvmdefs#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/llvmlibs#3 edit
... //depot/stg/opencl/drivers/opencl/make/llvm.git/lib/Target/Makefile#3 edit
... //depot/stg/opencl/drivers/opencl/make/llvm.git/llvmdefs#9 edit
... //depot/stg/opencl/drivers/opencl/make/llvm.git/llvmlibs#20 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#211 edit


[ROCm/clr commit: 4adb1d45a9]
This commit is contained in:
foreman
2017-09-29 17:56:24 -04:00
orang tua 04941ee6e5
melakukan 2eda2ef39b
@@ -15,32 +15,26 @@ ELFTOOLCHAIN_DIR = $(COMPLIB_DEPTH)/loaders/elf/utils
ifdef GONE_TO_BUILD_DIR
ifeq ($(BUILD_HSA_TARGET),yes)
override BUILD_CPU_DEVICE = no
override BUILD_GPU_DEVICE = no
override BUILD_LLVM_ARM_TARGET = no
override BUILD_LLVM_X86_TARGET = no
override BUILD_LLVM_AMDIL_TARGET = no
endif
ifneq ($(BUILD_LEGACY_COMPLIB),yes)
override BUILD_GPU_DEVICE = no
override BUILD_LLVM_AMDIL_TARGET = no
endif
endif
ifneq ($(BUILD_HSA_DEVICE),no)
ifeq ($(BUILD_LLVM_HSAIL_TARGET),yes)
GCPPFLAGS += $(DEFSWITCH) WITH_TARGET_HSAIL
ifneq ($(BUILD_GPU_DEVICE),no)
GCPPFLAGS += $(DEFSWITCH) DYNAMIC_HSAIL
endif
endif
ifneq ($(BUILD_CPU_DEVICE),no)
ifdef ATI_ARCH_ARM
ifeq ($(BUILD_LLVM_ARM_TARGET),yes)
GCPPFLAGS += $(DEFSWITCH) WITH_TARGET_ARM
endif
ifdef ATI_ARCH_X86
ifneq ($(BUILD_CPU_DEVICE),no)
ifeq ($(BUILD_LLVM_X86_TARGET),yes)
GCPPFLAGS += $(DEFSWITCH) WITH_TARGET_X86
endif
endif
endif
GCPPFLAGS += $(ASIC_REG_INCS)
GCPPFLAGS += $(INCSWITCH) "$(COMPLIB_DEPTH)"