[pocl] 02/04: redo cmake-no-{get_cpu_name => llvm-sys-getHostCPUName}.patch

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository pocl.

commit 97e95b6ca319558669c783dc86f31a33577a0c45
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri Dec 8 17:25:55 2017 +0100

    redo cmake-no-{get_cpu_name => llvm-sys-getHostCPUName}.patch
---
 debian/changelog                                   |  3 +++
 ...atch => cmake-no-llvm-sys-getHostCPUName.patch} | 31 +++++++++-------------
 debian/patches/series                              |  2 +-
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18d8e94..e5e5909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 pocl (0.13-14) UNRELEASED; urgency=medium
 
   * Bump Standards-Version to 4.1.2, no changes needed.
+  * cmake-no-get_cpu_name.patch: Rename/redo as
+    cmake-no-llvm-sys-getHostCPUName.patch to not use
+    llvm::sys::getHostCPUName().
 
  -- Andreas Beckmann <anbe at debian.org>  Fri, 08 Dec 2017 16:56:29 +0100
 
diff --git a/debian/patches/cmake-no-get_cpu_name.patch b/debian/patches/cmake-no-llvm-sys-getHostCPUName.patch
similarity index 64%
rename from debian/patches/cmake-no-get_cpu_name.patch
rename to debian/patches/cmake-no-llvm-sys-getHostCPUName.patch
index 886b94f..e9c4948 100644
--- a/debian/patches/cmake-no-get_cpu_name.patch
+++ b/debian/patches/cmake-no-llvm-sys-getHostCPUName.patch
@@ -1,5 +1,6 @@
 Author: Andreas Beckmann <anbe at debian.org>
-Description: disable get_cpu_name() under CMake
+Description: do not use llvm::sys::getHostCPUName() under CMake
+ this wasn't used with the autotools build system and it
  makes some tests fail (on amd64, ivybridge cpu):
  81% tests passed, 20 tests failed out of 108
  The following tests FAILED:
@@ -24,21 +25,15 @@ Description: disable get_cpu_name() under CMake
 	 29 - kernel/test_shuffle_ulong (Failed)
 	 30 - kernel/test_shuffle_double (Failed)
 
---- a/lib/CL/devices/basic/basic.c
-+++ b/lib/CL/devices/basic/basic.c
-@@ -332,11 +332,11 @@ pocl_basic_init_device_infos(struct _cl_
-   dev->extensions = HOST_DEVICE_EXTENSIONS;
- 
-   dev->llvm_target_triplet = OCL_KERNEL_TARGET;
--#ifdef POCL_BUILT_WITH_CMAKE
--  dev->llvm_cpu = get_cpu_name();
--#else
-+//#ifdef POCL_BUILT_WITH_CMAKE
-+//  dev->llvm_cpu = get_cpu_name();
-+//#else
-   dev->llvm_cpu = OCL_KERNEL_TARGET_CPU;
--#endif
-+//#endif
-   dev->has_64bit_long = 1;
-   dev->autolocals_to_args = 1;
+--- a/lib/CL/pocl_llvm_api.cc
++++ b/lib/CL/pocl_llvm_api.cc
+@@ -852,6 +852,9 @@ int pocl_llvm_get_kernel_metadata(cl_pro
  }
+ 
+ char* get_cpu_name() {
++  // HACK!
++  return strdup(OCL_KERNEL_TARGET_CPU);
++
+   StringRef r = llvm::sys::getHostCPUName();
+   assert(r.size() > 0);
+   char* cpu_name = (char*) malloc (r.size()+1);
diff --git a/debian/patches/series b/debian/patches/series
index 5f2e515..49d9a24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,5 +10,5 @@ consistent-newlines-in-POCL_ABORT.patch
 do-not-export-clang-symbols.patch
 libstdc++-7-dev.patch
 cmake-no-fno-rtti.patch
-cmake-no-get_cpu_name.patch
+cmake-no-llvm-sys-getHostCPUName.patch
 cmake-forcibly-link-regtests-with-pthread.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git