2 files changed, 12 insertions, 8 deletions
diff --git a/src/core/CL/CLHelpers.cpp b/src/core/CL/CLHelpers.cpp
index eb1b06e7a8..378e910f21 100644
--- a/src/core/CL/CLHelpers.cpp
+++ b/src/core/CL/CLHelpers.cpp
@@ -93,12 +93,6 @@ arm_compute::GPUTarget get_midgard_target(const std::string &version)
     }
 }
 
-bool extension_support(const cl::Device &device, const char *extension_name)
-{
-    std::string extensions = device.getInfo<CL_DEVICE_EXTENSIONS>();
-    auto        pos        = extensions.find(extension_name);
-    return (pos != std::string::npos);
-}
 } // namespace
 
 namespace arm_compute
@@ -253,12 +247,12 @@ GPUTarget get_arch_from_target(GPUTarget target)
 
 bool non_uniform_workgroup_support(const cl::Device &device)
 {
-    return extension_support(device, "cl_arm_non_uniform_work_group_size");
+    return device_supports_extension(device, "cl_arm_non_uniform_work_group_size");
 }
 
 bool fp16_support(const cl::Device &device)
 {
-    return extension_support(device, "cl_khr_fp16");
+    return device_supports_extension(device, "cl_khr_fp16");
 }
 
 CLVersion get_cl_version(const cl::Device &device)
@@ -284,4 +278,12 @@ CLVersion get_cl_version(const cl::Device &device)
     return CLVersion::UNKNOWN;
 }
 
+
+bool device_supports_extension(const cl::Device &device, const char *extension_name)
+{
+    std::string extensions = device.getInfo<CL_DEVICE_EXTENSIONS>();
+    auto        pos        = extensions.find(extension_name);
+    return (pos != std::string::npos);
+}
+
 } // namespace arm_compute
diff --git a/src/core/CL/cl_kernels/helpers.h b/src/core/CL/cl_kernels/helpers.h
index 02c6c4cc41..615c5188a1 100644
--- a/src/core/CL/cl_kernels/helpers.h
+++ b/src/core/CL/cl_kernels/helpers.h
@@ -29,7 +29,9 @@
 #endif // defined(ARM_COMPUTE_OPENCL_FP16_ENABLED)
 
 #if defined(ARM_COMPUTE_DEBUG_ENABLED)
+#if defined(cl_arm_printf)
 #pragma OPENCL EXTENSION cl_arm_printf : enable
+#endif // defined(cl_arm_printf)
 #endif // defined(ARM_COMPUTE_DEBUG_ENABLED)
 
 #define EXPAND(x) x