From 521545cbaefca4f746c78fd5ac2f1dc1679e34b5 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Mon, 7 Mar 2016 11:33:56 -0500
Subject: [PATCH] P4 to Git Change 1244419 by asalmanp@asalmanp-opencl-stg on
 2016/03/07 11:25:05

	SWDEV-79278 - [OpenCL][Vega10 Bring up] renaming Greenland device name to Vega10 (this is the official device name)

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/9924/

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings.h#8 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil.h#8 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_amdil64.h#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail.h#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail64.h#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#139 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#40 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil.h#35 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil64.h#31 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#30 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#25 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#60 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#134 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLDeviceQueries.cpp#34 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLPerfCounters.cpp#25 edit
---
 rocclr/compiler/lib/backends/common/linker.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rocclr/compiler/lib/backends/common/linker.cpp b/rocclr/compiler/lib/backends/common/linker.cpp
index 9b78f7b980..307f6a5e4b 100644
--- a/rocclr/compiler/lib/backends/common/linker.cpp
+++ b/rocclr/compiler/lib/backends/common/linker.cpp
@@ -290,7 +290,8 @@ void amdcl::OCLLinker::createASICIDFunctions(llvm::Module* module)
                      || chip == "Cayman"
                      || chip == "Tahiti"
                      || chip == "Hawaii"
-                     || chip == "Carrizo",
+                     || chip == "Carrizo"
+                     || chip == "",
                      module);
   createConstIntFunc("__amdil_have_bitalign", !!(features & F_EG_BASE), module);
   createConstIntFunc("__amdil_is_cypress", chip == "Cypress", module);
@@ -747,7 +748,8 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<llvm::Module*> &libs)
                 || chip == "Cayman"
                 || chip == "Tahiti"
                 || chip == "Hawaii"
-                || chip == "Carrizo");
+                || chip == "Carrizo"
+                || chip == "");
   LLVMBinary()->getContext().setAMDLLVMContextHook(&hookup_);
 
   std::string clp_errmsg;