[oclgrind] 03/04: Added patch to fix shift width warning for i386.

James Price jprice-guest at moszumanska.debian.org
Thu Oct 22 10:18:52 UTC 2015


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

jprice-guest pushed a commit to branch master
in repository oclgrind.

commit 1d653b301af49cfab4a8a307b04a7cc8d598c290
Author: James Price <j.price at bristol.ac.uk>
Date:   Mon Sep 14 13:26:28 2015 +0100

    Added patch to fix shift width warning for i386.
---
 debian/patches/i386-shift-width.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/i386-shift-width.patch b/debian/patches/i386-shift-width.patch
new file mode 100644
index 0000000..7dc83b2
--- /dev/null
+++ b/debian/patches/i386-shift-width.patch
@@ -0,0 +1,24 @@
+Description: Fixed shift width warning for i386 builds.
+Author: James Price <j.price at bristol.ac.uk>
+Origin: upstream commit:f633dbc
+Last-Update: 2015-09-14
+--- a/src/core/WorkItemBuiltins.cpp
++++ b/src/core/WorkItemBuiltins.cpp
+@@ -1888,7 +1888,7 @@
+           {
+             uint64_t a = UARGV(0, i);
+             uint64_t b = UARGV(1, i);
+-            uint64_t c = (a > UINT64_MAX-b) ? (1L<<63) : 0;
++            uint64_t c = (a > UINT64_MAX-b) ? (((uint64_t)1)<<63) : 0;
+             result.setUInt(((a + b) >> 1) | c, i);
+             break;
+           }
+@@ -2128,7 +2128,7 @@
+           {
+             uint64_t a = UARGV(0, i);
+             uint64_t b = UARGV(1, i);
+-            uint64_t c = (a > UINT64_MAX-(b+1)) ? (1L<<63) : 0;
++            uint64_t c = (a > UINT64_MAX-(b+1)) ? (((uint64_t)1)<<63) : 0;
+             result.setUInt(((a + b + 1) >> 1) | c, i);
+             break;
+           }
diff --git a/debian/patches/series b/debian/patches/series
index 3af20fd..cb5c4fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ library-versions.patch
 pch-location.patch
 clang-library-order.patch
 cmake-preserve-flags.patch
+i386-shift-width.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/oclgrind.git



More information about the Pkg-opencl-commits mailing list