From 266e0e35071bfa5f32e6a785121ff4c7ab715fff Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 26 Oct 2015 09:41:01 -0400 Subject: [PATCH] P4 to Git Change 1203770 by yaxunl@yaxunl_stg_win50 on 2015/10/26 09:32:39 SWDEV-77174 - Change compiler lib def and sc lib def to be consistent. SC interface depends on some compile options which need to be consistent between compiler library and SC. This change will add the SC interface dependent build options to opencldefs so that they are shared between compiler lib def and sc lib def. Both compilier lib def and sc lib def will include scinterfacedefs, which will generate consistent compile options required by sc interface based on variables defined in opencldefs. Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#45 edit ... //depot/stg/opencl/drivers/opencl/opencldefs#163 edit --- rocclr/compiler/lib/complibdefs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rocclr/compiler/lib/complibdefs b/rocclr/compiler/lib/complibdefs index f1790bd645..f9675618ad 100644 --- a/rocclr/compiler/lib/complibdefs +++ b/rocclr/compiler/lib/complibdefs @@ -2,6 +2,15 @@ OPENCL_DEPTH ?= $(COMPLIB_DEPTH)/../.. include $(OPENCL_DEPTH)/opencldefs +# Set the #defines for sc/Interface like that used to build sc. +# For a non-default configuration (for instance adding GFX9), +# make GFX9_BUILD=1 wNow.dbg +# or change +# ../../opencldefs +# to make sure that the settings for sc and sc's uses match. +include $(OPENCL_DEPTH)/compiler/sc/Interface/scinterfacedefs +GCPPFLAGS += $(SC_LIB_DEFS) + ELFTOOLCHAIN_DIR = $(COMPLIB_DEPTH)/loaders/elf/utils ifdef GONE_TO_BUILD_DIR