From: Andreas Beckmann <anbe@debian.org>
Date: Tue, 22 Mar 2022 13:51:19 +0000 (+0100)
Subject: [PATCH 1007/1017] force kernellib name on HOST_CPU_FORCED, too
X-Git-Tag: archive/raspbian/3.0-6+rpi1~1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=544ef7251f216d77b2dde946164db39fbd8a2fc7;p=pocl.git

[PATCH 1007/1017] force kernellib name on HOST_CPU_FORCED, too


Gbp-Pq: Name 1007-force-kernellib-name-on-HOST_CPU_FORCED-too.patch
---

diff --git a/lib/CL/pocl_llvm_build.cc b/lib/CL/pocl_llvm_build.cc
index 5587e3f..ee1698e 100644
--- a/lib/CL/pocl_llvm_build.cc
+++ b/lib/CL/pocl_llvm_build.cc
@@ -977,6 +977,8 @@ static llvm::Module *getKernelLibrary(cl_device_id device,
     kernellib += '-';
 #ifdef KERNELLIB_HOST_DISTRO_VARIANTS
     kernellib += getX86KernelLibName();
+#elif defined(HOST_CPU_FORCED)
+    kernellib += OCL_KERNEL_TARGET_CPU;
 #else
     kernellib_fallback = kernellib;
     kernellib_fallback += OCL_KERNEL_TARGET_CPU;
@@ -996,7 +998,7 @@ static llvm::Module *getKernelLibrary(cl_device_id device,
     }
   else
     {
-#ifndef KERNELLIB_HOST_DISTRO_VARIANTS
+#if !defined(KERNELLIB_HOST_DISTRO_VARIANTS) && !defined(HOST_CPU_FORCED)
       if (is_host && pocl_exists(kernellib_fallback.c_str()))
         {
           POCL_MSG_WARN("Using fallback %s as the built-in lib.\n",