[Likwid-commit] [likwid] 01/04: fix i386 build

[Christoph Martin]

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

chrism pushed a commit to branch master
in repository likwid.

commit fb0b209a9431d94e3d5e3b5b88c87a4bba60b360
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Thu Jan 12 10:19:21 2017 +0100

    fix i386 build
---
 debian/changelog                    |  6 ++++++
 debian/patches/20-regTypeMask.patch | 18 ++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index afbc860..16469b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+likwid (4.2.0-2) unstable; urgency=medium
+
+  * fix i386 build
+
+ -- Christoph Martin <martin at uni-mainz.de>  Thu, 12 Jan 2017 10:16:43 +0100
+
 likwid (4.2.0-1) unstable; urgency=medium
 
   [ Christoph Martin ]
diff --git a/debian/patches/20-regTypeMask.patch b/debian/patches/20-regTypeMask.patch
new file mode 100644
index 0000000..c15be02
--- /dev/null
+++ b/debian/patches/20-regTypeMask.patch
@@ -0,0 +1,18 @@
+--- a/src/perfmon.c
++++ b/src/perfmon.c
+@@ -1570,15 +1570,10 @@ perfmon_addEventSet(const char* eventCSt
+         return -ENOMEM;
+     }
+     eventSet->numberOfEvents = 0;
+-#ifdef __x86_64
+-//    eventSet->regTypeMask = ((__uint128_t)0x0ULL<<64)|0x0ULL;
+     eventSet->regTypeMask1 = 0x0ULL;
+     eventSet->regTypeMask2 = 0x0ULL;
+     eventSet->regTypeMask3 = 0x0ULL;
+     eventSet->regTypeMask4 = 0x0ULL;
+-#else
+-    eventSet->regTypeMask = 0x0ULL;
+-#endif
+ 
+     int forceOverwrite = 0;
+     int valid_events = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 234dc38..21765d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 #08-no-stream.patch
 10-debianize.patch
 #15-32bit-regtypemask.patch
+20-regTypeMask.patch

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