[pocl] 11/18: refresh/remove patches
Andreas Beckmann
anbe at moszumanska.debian.org
Thu Dec 14 01:54:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to annotated tag debian/0.14-1
in repository pocl.
commit 2093acd8a87f8e63761af7576e254bfbb02b3290
Author: Andreas Beckmann <anbe at debian.org>
Date: Mon Nov 27 00:11:47 2017 +0100
refresh/remove patches
---
debian/changelog | 1 +
debian/patches/cmake-no-fno-rtti.patch | 28 +++++++++++-----------
.../patches/cmake-no-llvm-sys-getHostCPUName.patch | 10 ++++----
debian/patches/fix-tests-i386.patch | 14 -----------
debian/patches/os-compat.patch | 16 +++++--------
debian/patches/series | 1 -
.../set-POCL_DEVICE_ADDRESS_BITS-before-use.patch | 20 ++++++++--------
7 files changed, 36 insertions(+), 54 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3d2c4f5..52afed4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pocl (0.14-1) UNRELEASED; urgency=medium
* New upstream release.
* The autotools based build system is gone.
+ * Refresh/remove patches.
-- Andreas Beckmann <anbe at debian.org> Sun, 26 Nov 2017 22:29:33 +0100
diff --git a/debian/patches/cmake-no-fno-rtti.patch b/debian/patches/cmake-no-fno-rtti.patch
index e9667ad..91b4255 100644
--- a/debian/patches/cmake-no-fno-rtti.patch
+++ b/debian/patches/cmake-no-fno-rtti.patch
@@ -3,18 +3,18 @@ Description: do not set -fno-rtti under CMake
to make the build better mimic the autotools build and to
not generate symbol differences
---- a/cmake/LLVM.cmake
-+++ b/cmake/LLVM.cmake
-@@ -176,9 +176,9 @@ string(REPLACE " -pedantic" "" LLVM_CXXF
- # - '-fno-rtti' is a work-around for llvm bug 14200
- # Which according to bug report has been fixed in llvm 3.7
- # sadly, that bugreport is mistaken, it's not fixed in 3.7
--if (NOT MSVC)
-- set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fno-rtti")
--endif()
-+#if (NOT MSVC)
-+# set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fno-rtti")
-+#endif()
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -810,9 +810,9 @@ else()
+ # - '-fno-rtti' is a work-around for llvm bug 14200
+ # Which according to bug report has been fixed in llvm 3.7
+ # sadly, that bugreport is mistaken, it's not fixed in 3.7
+- if (NOT MSVC)
+- set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fno-rtti")
+- endif()
++ #if (NOT MSVC)
++ # set(LLVM_CXXFLAGS "${LLVM_CXXFLAGS} -fno-rtti")
++ #endif()
-
- # Llvm-config may be installed or it might be used from build directory, in which case
+ set(ENABLE_TCEMC 0)
+ endif()
diff --git a/debian/patches/cmake-no-llvm-sys-getHostCPUName.patch b/debian/patches/cmake-no-llvm-sys-getHostCPUName.patch
index e9c4948..abdd9a8 100644
--- a/debian/patches/cmake-no-llvm-sys-getHostCPUName.patch
+++ b/debian/patches/cmake-no-llvm-sys-getHostCPUName.patch
@@ -2,7 +2,7 @@ Author: Andreas Beckmann <anbe at debian.org>
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
+ 82% tests passed, 20 tests failed out of 111
The following tests FAILED:
2 - kernel/test_as_type (Failed)
3 - kernel/test_convert_type_1 (Failed)
@@ -27,13 +27,13 @@ Description: do not use llvm::sys::getHostCPUName() under CMake
--- 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
+@@ -1114,6 +1114,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);
+ #ifdef __mips__
+ // The MIPS backend isn't able to automatically detect the host yet and the
+ // value returned by llvm::sys::getHostCPUName() isn't usable in the
diff --git a/debian/patches/fix-tests-i386.patch b/debian/patches/fix-tests-i386.patch
deleted file mode 100644
index ebe45c8..0000000
--- a/debian/patches/fix-tests-i386.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Andreas Beckmann <anbe at debian.org>
-Description: also skip test on i586 CPU
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,7 +42,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "a
- set(ARMV7 1)
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv6")
- set(ARMV6 1)
--elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(i386|AMD64|x86_64)")
-+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(i.86|AMD64|x86_64)")
- if(POCL_DEVICE_ADDRESS_BITS MATCHES "32")
- set(I386 1)
- else()
diff --git a/debian/patches/os-compat.patch b/debian/patches/os-compat.patch
index 0cf3380..b72b25d 100644
--- a/debian/patches/os-compat.patch
+++ b/debian/patches/os-compat.patch
@@ -1,4 +1,4 @@
-Description: Fix includes for FreeBSD and GNU/Hurd
+Description: Fix detection for FreeBSD and GNU/Hurd
--- a/tools/patches/khronos_cl.hpp.patch
+++ b/tools/patches/khronos_cl.hpp.patch
@@ -13,16 +13,12 @@ Description: Fix includes for FreeBSD and GNU/Hurd
-#include <emmintrin.h>
--- a/lib/CL/pocl_timing.c
+++ b/lib/CL/pocl_timing.c
-@@ -67,10 +67,10 @@ uint64_t pocl_gettimemono_ns() {
- struct timespec timespec;
- # ifdef __linux__
- clock_gettime(CLOCK_MONOTONIC_RAW, ×pec);
+@@ -72,7 +72,7 @@ uint64_t pocl_gettimemono_ns() {
+ # warning Using clock_gettime with CLOCK_MONOTONIC for monotonic clocks
+ clock_gettime(CLOCK_MONOTONIC, ×pec);
+ # endif
-# elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+# elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
clock_gettime(CLOCK_UPTIME_FAST, ×pec);
# else
--# warn Using clock_gettime with CLOCK_REALTIME for monotonic clocks
-+# warning Using clock_gettime with CLOCK_REALTIME for monotonic clocks
- clock_gettime(CLOCK_REALTIME, ×pec);
- # endif
- return ((timespec.tv_sec * 1000000000UL) + timespec.tv_nsec);
+ # warning Using clock_gettime with CLOCK_REALTIME for monotonic clocks
diff --git a/debian/patches/series b/debian/patches/series
index 3807bd6..f3a529b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
os-compat.patch
typos.patch
-fix-tests-i386.patch
glibc-2.23.patch
set-POCL_DEVICE_ADDRESS_BITS-before-use.patch
consistent-newlines-in-POCL_ABORT.patch
diff --git a/debian/patches/set-POCL_DEVICE_ADDRESS_BITS-before-use.patch b/debian/patches/set-POCL_DEVICE_ADDRESS_BITS-before-use.patch
index 658988c..e5028f2 100644
--- a/debian/patches/set-POCL_DEVICE_ADDRESS_BITS-before-use.patch
+++ b/debian/patches/set-POCL_DEVICE_ADDRESS_BITS-before-use.patch
@@ -4,9 +4,9 @@ Description: set POCL_DEVICE_ADDRESS_BITS before using it
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -32,6 +32,18 @@ set(VERSION_SUFFIX "")
- set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_SUFFIX})
- set(POCL_VERSION ${VERSION_STRING})
+@@ -37,6 +37,18 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+ enable_testing()
+##########################################################
+
@@ -22,11 +22,13 @@ Description: set POCL_DEVICE_ADDRESS_BITS before using it
+
##################################################################################
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
-@@ -836,19 +848,6 @@ endif()
+ option(OCS_AVAILABLE "Online compiler support available to build pocl with. Default is available." ON)
+@@ -861,19 +873,6 @@ else()
+ endif()
- ##########################################################
+-##########################################################
+-
-# POCL_DEVICE_ADDRESS_BITS
-# TODO rename to HOST address bits
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -38,8 +40,6 @@ Description: set POCL_DEVICE_ADDRESS_BITS before using it
-endif()
-
-
--##########################################################
--
+ ##########################################################
+
- # cmake docs:
- # SOVERSION: What version number is this target.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git
More information about the Pkg-opencl-commits
mailing list