From bcf50975bcec9cf4cfcfa29f433518fd06dc60da Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 27 Aug 2015 08:45:08 -0400 Subject: [PATCH] P4 to Git Change 1185140 by nhaustov@nhaustov_hsa on 2015/08/27 08:33:00 ECR #333753 - Introduce and use COMPLIB_DEPTH. This just makes possible to override COMPLIB_DEPTH for legacy compiler library. No actual changes what is built yet. Testing: pre-checkin Reviewed by: Matt, Evgeniy Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/Makefile#37 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/Makefile#14 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/Makefile#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/build/Makefile#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/build/Makefile.apiv08#16 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/Makefile#16 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/Makefile#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/build/Makefile#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/build/Makefile.common#34 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/cpu/Makefile#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/cpu/build/Makefile#6 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/cpu/build/Makefile.cpu#12 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/Makefile#49 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/build/Makefile#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/build/Makefile.gpu#34 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/Makefile#6 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/build/Makefile#8 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/build/Makefile.scwrapper#30 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/build/Makefile#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/build/Makefile.complib#93 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#44 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/complibrules#6 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/Makefile#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/build/Makefile#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/build/Makefile.include#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/Makefile#10 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/Makefile#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/Makefile#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/build/Makefile#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/build/Makefile.amuabi#9 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/build/Makefile#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/build/Makefile.bif#22 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/Makefile#6 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/build/Makefile#7 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/build/Makefile.loader#13 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/Makefile#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/Makefile#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/build/Makefile#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/build/Makefile.libelf#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/plugins/Makefile#9 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/plugins/helloWorld/Makefile#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/plugins/helloWorld/build/Makefile#7 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/plugins/helloWorld/build/Makefile.helloWorld#6 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/spirv/Makefile#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/spirv/build/Makefile#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/spirv/build/Makefile.spirv#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/Makefile#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/build/Makefile#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/build/Makefile.utils#17 edit ... //depot/stg/opencl/drivers/opencl/compiler/tools/aoc2/Makefile#8 edit ... //depot/stg/opencl/drivers/opencl/compiler/tools/aoc2/build/Makefile#3 edit ... //depot/stg/opencl/drivers/opencl/compiler/tools/aoc2/build/Makefile.aoc2#30 edit ... //depot/stg/opencl/drivers/opencl/openclrules#89 edit [ROCm/clr commit: 4a2cfbda565f8522549162e3fc7fa94ff4d507d2] --- projects/clr/rocclr/compiler/lib/complibdefs | 5 ++++- projects/clr/rocclr/compiler/lib/complibrules | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/compiler/lib/complibdefs b/projects/clr/rocclr/compiler/lib/complibdefs index 7fb916a83d..f1790bd645 100644 --- a/projects/clr/rocclr/compiler/lib/complibdefs +++ b/projects/clr/rocclr/compiler/lib/complibdefs @@ -1,5 +1,8 @@ +OPENCL_DEPTH ?= $(COMPLIB_DEPTH)/../.. + include $(OPENCL_DEPTH)/opencldefs -COMPLIB_DEPTH = $(OPENCL_DEPTH)/compiler/lib + +ELFTOOLCHAIN_DIR = $(COMPLIB_DEPTH)/loaders/elf/utils ifdef GONE_TO_BUILD_DIR ifeq ($(BUILD_HSA_TARGET),yes) diff --git a/projects/clr/rocclr/compiler/lib/complibrules b/projects/clr/rocclr/compiler/lib/complibrules index 5c438132ad..495a6ed1e0 100644 --- a/projects/clr/rocclr/compiler/lib/complibrules +++ b/projects/clr/rocclr/compiler/lib/complibrules @@ -1,4 +1,4 @@ -COMPLIB_DEPTH = $(OPENCL_DEPTH)/compiler/lib +COMPLIB_DEPTH ?= $(OPENCL_DEPTH)/compiler/lib ifdef GONE_TO_BUILD_DIR ifdef ATI_OS_LINUX *$(OBJ_EXT): $(COMPLIB_DEPTH)/complibdefs $(COMPLIB_DEPTH)/complibrules