From 4fc5f10159d4cc97127e237ebb30fd4709ba7cd1 Mon Sep 17 00:00:00 2001 From: Jason Tang Date: Mon, 9 Nov 2020 11:19:20 -0500 Subject: [PATCH] SWDEV-256292 - Fix build failure when using lightning to build clang complains there are multiple definitions of ret_val Change-Id: I949af23e0658b28b339b378c9c0e4681d83d5f5a [ROCm/clr commit: ee2e91912b3c9fd7e70420eb4b1ac38731413a59] --- .../clr/opencl/khronos/icd/test/loader_test/test_cl_runtime.c | 2 +- projects/clr/opencl/khronos/icd/test/loader_test/test_clgl.c | 2 +- .../opencl/khronos/icd/test/loader_test/test_image_objects.c | 2 +- projects/clr/opencl/khronos/icd/test/loader_test/test_kernel.c | 2 +- .../clr/opencl/khronos/icd/test/loader_test/test_platforms.c | 2 +- .../opencl/khronos/icd/test/loader_test/test_program_objects.c | 2 +- .../opencl/khronos/icd/test/loader_test/test_sampler_objects.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/clr/opencl/khronos/icd/test/loader_test/test_cl_runtime.c b/projects/clr/opencl/khronos/icd/test/loader_test/test_cl_runtime.c index 6b082124f3..c6b3522303 100644 --- a/projects/clr/opencl/khronos/icd/test/loader_test/test_cl_runtime.c +++ b/projects/clr/opencl/khronos/icd/test/loader_test/test_cl_runtime.c @@ -4,7 +4,7 @@ extern cl_command_queue command_queue; -cl_int ret_val; +static cl_int ret_val; const struct clRetainCommandQueue_st clRetainCommandQueueData[NUM_ITEMS_clRetainCommandQueue] = { {NULL} diff --git a/projects/clr/opencl/khronos/icd/test/loader_test/test_clgl.c b/projects/clr/opencl/khronos/icd/test/loader_test/test_clgl.c index 4e3cee4086..5073e95ccd 100644 --- a/projects/clr/opencl/khronos/icd/test/loader_test/test_clgl.c +++ b/projects/clr/opencl/khronos/icd/test/loader_test/test_clgl.c @@ -12,7 +12,7 @@ extern cl_mem buffer; extern cl_command_queue command_queue; extern cl_event event; extern cl_context_properties context_properties[3]; -cl_int ret_val; +static cl_int ret_val; cl_mem ret_mem; struct clCreateFromGLBuffer_st clCreateFromGLBufferData[NUM_ITEMS_clCreateFromGLBuffer] = { diff --git a/projects/clr/opencl/khronos/icd/test/loader_test/test_image_objects.c b/projects/clr/opencl/khronos/icd/test/loader_test/test_image_objects.c index f399451310..fda0ff6f9b 100644 --- a/projects/clr/opencl/khronos/icd/test/loader_test/test_image_objects.c +++ b/projects/clr/opencl/khronos/icd/test/loader_test/test_image_objects.c @@ -10,7 +10,7 @@ extern cl_command_queue command_queue; extern cl_event event; extern cl_mem buffer; -int ret_val; +static int ret_val; const struct clGetSupportedImageFormats_st clGetSupportedImageFormatsData[NUM_ITEMS_clGetSupportedImageFormats] = { diff --git a/projects/clr/opencl/khronos/icd/test/loader_test/test_kernel.c b/projects/clr/opencl/khronos/icd/test/loader_test/test_kernel.c index a53e9805ab..be116edb31 100644 --- a/projects/clr/opencl/khronos/icd/test/loader_test/test_kernel.c +++ b/projects/clr/opencl/khronos/icd/test/loader_test/test_kernel.c @@ -15,7 +15,7 @@ extern cl_event event; extern cl_context context; extern cl_command_queue command_queue; extern cl_device_id devices; -int ret_val; +static int ret_val; extern void CL_CALLBACK setevent_callback(cl_event _a, cl_int _b, void* _c); extern void CL_CALLBACK setprintf_callback(cl_context _a, cl_uint _b, char* _c, void* _d ); diff --git a/projects/clr/opencl/khronos/icd/test/loader_test/test_platforms.c b/projects/clr/opencl/khronos/icd/test/loader_test/test_platforms.c index d22a3d0eb9..afa7c424bc 100644 --- a/projects/clr/opencl/khronos/icd/test/loader_test/test_platforms.c +++ b/projects/clr/opencl/khronos/icd/test/loader_test/test_platforms.c @@ -8,7 +8,7 @@ extern cl_platform_id platform; extern cl_device_id devices; -int ret_val; +static int ret_val; struct clRetainContext_st clRetainContextData[NUM_ITEMS_clRetainContext] = { diff --git a/projects/clr/opencl/khronos/icd/test/loader_test/test_program_objects.c b/projects/clr/opencl/khronos/icd/test/loader_test/test_program_objects.c index 30c99a1532..c1e7f8c72c 100644 --- a/projects/clr/opencl/khronos/icd/test/loader_test/test_program_objects.c +++ b/projects/clr/opencl/khronos/icd/test/loader_test/test_program_objects.c @@ -7,7 +7,7 @@ extern cl_program program; extern cl_platform_id platform; extern cl_device_id devices; -int ret_val; +static int ret_val; extern void CL_CALLBACK program_callback(cl_program _a, void* _b); diff --git a/projects/clr/opencl/khronos/icd/test/loader_test/test_sampler_objects.c b/projects/clr/opencl/khronos/icd/test/loader_test/test_sampler_objects.c index 1f2835f276..81db173734 100644 --- a/projects/clr/opencl/khronos/icd/test/loader_test/test_sampler_objects.c +++ b/projects/clr/opencl/khronos/icd/test/loader_test/test_sampler_objects.c @@ -3,7 +3,7 @@ #include extern cl_sampler sampler; -int ret_val; +static int ret_val; const struct clRetainSampler_st clRetainSamplerData[NUM_ITEMS_clRetainSampler]= {