[beignet] 01/02: Fix build with GCC 6. (Closes: #831196)

[Rebecca Palmer]

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

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit 5d7e6226cb7ee00eb9f2c9930bb01cabeba897de
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Fri Jul 15 07:24:39 2016 +0100

    Fix build with GCC 6. (Closes: #831196)
---
 debian/changelog                  |  6 +++++
 debian/patches/gcc6-support.patch | 47 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9eada08..5d9b588 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beignet (1.1.2-4) UNRELEASED; urgency=medium
+
+  * Fix build with GCC 6. (Closes: #831196)
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Thu, 14 Jul 2016 23:18:30 +0100
+
 beignet (1.1.2-3) unstable; urgency=medium
 
   * Make profiling work on multiarch systems.
diff --git a/debian/patches/gcc6-support.patch b/debian/patches/gcc6-support.patch
new file mode 100644
index 0000000..a502663
--- /dev/null
+++ b/debian/patches/gcc6-support.patch
@@ -0,0 +1,47 @@
+Description: Add support for gcc 6
+
+Origin: upstream commit 356c856479207e2514d44d28456a70766691fccc
+Author: Pan Xiuli <xiuli.pan at intel.com>
+Bug-Debian: https://bugs.debian.org/831196
+
+diff --git a/backend/src/ir/immediate.hpp b/backend/src/ir/immediate.hpp
+index 3141643..6bc60d5 100644
+--- a/backend/src/ir/immediate.hpp
++++ b/backend/src/ir/immediate.hpp
+@@ -343,7 +343,7 @@ namespace ir {
+       float *f32;
+       double *f64;
+       half *f16;
+-      const Immediate *immVec[];
++      const Immediate **immVec;
+       void *p;
+     } data;     //!< Value to store
+     Immediate operator+ (const Immediate &) const;
+diff --git a/utests/builtin_exp.cpp b/utests/builtin_exp.cpp
+index 406d223..1eaa187 100644
+--- a/utests/builtin_exp.cpp
++++ b/utests/builtin_exp.cpp
+@@ -5,7 +5,7 @@
+ #define udebug 1
+ 
+ #define FLT_MAX 0x1.fffffep127f
+-#define FLT_MIN 0x1.0p-126f
++#define FLT_MIN ldexp(1.0,-126)
+ #define FLT_ULP  (1.0e-6f)
+ 
+ #define printf_c(...) \
+diff --git a/utests/utest_generator.py b/utests/utest_generator.py
+index 84029da..38d9ea0 100644
+--- a/utests/utest_generator.py
++++ b/utests/utest_generator.py
+@@ -4,8 +4,8 @@ import os,sys,re
+ 
+ FLT_MAX_POSI='0x1.fffffep127f'
+ FLT_MIN_NEGA='-0x1.fffffep127f'
+-FLT_MIN_POSI='0x1.0p-126f'
+-FLT_MAX_NEGA='-0x1.0p-126f'
++FLT_MIN_POSI='ldexp(1.0, -126)'
++FLT_MAX_NEGA='ldexp(-1.0, -126)'
+ 
+ paraTypeList={'float':'%e','int':'%d','double':'%lf','uint':'%d','string':'%s'}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e53670b..06554cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ llvm38-support.patch
 find-python35.patch
 profiling-32on64.patch
 noassert-missing-function.patch
+gcc6-support.patch

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