[oclgrind] 01/01: Fix AltiVec issues with -std=gnu++11 instead

[James Price]

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

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

commit f264cbd73e87ac7853c3e2e33c4209426c44a84a
Author: James Price <j.price at bristol.ac.uk>
Date:   Wed Dec 9 19:55:22 2015 +0000

    Fix AltiVec issues with -std=gnu++11 instead
---
 debian/changelog                 |  4 ++--
 debian/patches/altivec-fix.patch | 52 +++++++++-------------------------------
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bdbd099..14fa035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 oclgrind (15.5-3) unstable; urgency=low
 
   * Use opencl-headers instead of local copy of CL/*.h
-  * Undef conflicting altivec macros (Closes: #806965)
+  * Use -std=gnu++11 to fix AltiVec issues (Closes: #806965)
 
- -- James Price <j.price at bristol.ac.uk>  Tue, 08 Dec 2015 19:41:52 +0000
+ -- James Price <j.price at bristol.ac.uk>  Wed, 09 Dec 2015 19:51:36 +0000
 
 oclgrind (15.5-2) unstable; urgency=low
 
diff --git a/debian/patches/altivec-fix.patch b/debian/patches/altivec-fix.patch
index 80bcb73..c0a10b8 100644
--- a/debian/patches/altivec-fix.patch
+++ b/debian/patches/altivec-fix.patch
@@ -1,44 +1,14 @@
 Author: James Price <j.price at bristol.ac.uk>
-Description: Undef problematic macros defined by altivec.h
-Last-Update: 2015-12-08
---- a/src/core/WorkItemBuiltins.cpp
-+++ b/src/core/WorkItemBuiltins.cpp
-@@ -18,7 +18,6 @@
- #include "llvm/IR/DebugInfoMetadata.h"
- #endif
+Description: Use -std=gnu++11 instead of -std=c++11 to fix altivec issues
+Last-Update: 2015-12-09
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@
  
--#include <CL/cl.h>
- #include "Context.h"
- #include "half.h"
- #include "KernelInvocation.h"
---- a/src/core/common.h
-+++ b/src/core/common.h
-@@ -10,7 +10,14 @@
- #define __common_h_
+ # Enable C++11 for Clang/GCC
+ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+ endif()
  
- #include "config.h"
-+
- #include <CL/cl.h>
-+
-+// Make sure altivec macros are not defined
-+#undef vector
-+#undef pixel
-+#undef bool
-+
- #include <cassert>
- #include <cstdio>
- #include <cstdlib>
---- a/src/runtime/icd.h
-+++ b/src/runtime/icd.h
-@@ -132,6 +132,11 @@
- #include <CL/cl_dx9_media_sharing.h>
- #endif
- 
-+// Make sure altivec macros are not defined
-+#undef vector
-+#undef pixel
-+#undef bool
-+
- namespace oclgrind
- {
-   class Context;
+ # Disable min/max macros on Windows

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