Mesa (staging/20.1): meson: Revert commit overriding C++ standard with gnu++11 on ppc64el

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 2a62a43b0e1a089cc2cc59292cb39660054e1393
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a62a43b0e1a089cc2cc59292cb39660054e1393

Author: Frédéric Bonnard <frediz at debian.org>
Date:   Thu May  7 16:30:52 2020 +0200

meson: Revert commit overriding C++ standard with gnu++11 on ppc64el

Since a few versions, mesa now needs c++14 and compiling with gnu++11
on ppc64el fails.
Let's use the default standard and fix the collision of types between
c++ and altivec in a another patch.

Cc: mesa-stable
Signed-off-by: Frédéric Bonnard <frediz at debian.org>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4948>
(cherry picked from commit 5a27efdf0e36be8e36390c6a27eef91cbef21e71)

---

 .pick_status.json                             | 2 +-
 meson.build                                   | 9 ---------
 src/gallium/state_trackers/clover/meson.build | 4 ----
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4847217f1ce..e98e2d89c65 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -22,7 +22,7 @@
         "description": "meson: Revert commit overriding C++ standard with gnu++11 on ppc64el",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/meson.build b/meson.build
index b57901303ad..97de83796f3 100644
--- a/meson.build
+++ b/meson.build
@@ -705,7 +705,6 @@ if get_option('power8') != 'false'
 endif
 
 _opencl = get_option('gallium-opencl')
-clover_cpp_std = []
 if _opencl != 'disabled'
   if not with_gallium
     error('OpenCL Clover implementation requires at least one gallium driver.')
@@ -724,14 +723,6 @@ if _opencl != 'disabled'
     dep_spirv_tools = null_dep
     dep_llvmspirvlib = null_dep
   endif
-
-  if host_machine.cpu_family().startswith('ppc') and cpp.compiles('''
-      #if !defined(__VEC__) || !defined(__ALTIVEC__)
-      #error "AltiVec not enabled"
-      #endif''',
-      name : 'Altivec')
-    clover_cpp_std += ['cpp_std=gnu++11']
-  endif
 else
   dep_clc = null_dep
   dep_spirv_tools = null_dep
diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build
index 7606a6beaf6..681e0cb8062 100644
--- a/src/gallium/state_trackers/clover/meson.build
+++ b/src/gallium/state_trackers/clover/meson.build
@@ -72,7 +72,6 @@ libclllvm = static_library(
     )),
   ],
   dependencies : [dep_llvm, dep_elf, dep_llvmspirvlib],
-  override_options : clover_cpp_std,
 )
 
 libclspirv = static_library(
@@ -81,7 +80,6 @@ libclspirv = static_library(
   include_directories : clover_incs,
   cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args, cpp_vis_args],
   dependencies : [dep_spirv_tools],
-  override_options : clover_cpp_std,
 )
 
 libclnir = static_library(
@@ -90,7 +88,6 @@ libclnir = static_library(
   include_directories : [clover_incs, inc_mesa],
   dependencies : idep_nir,
   cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args, cpp_vis_args],
-  override_options : clover_cpp_std,
 )
 
 clover_files = files(
@@ -160,5 +157,4 @@ libclover = static_library(
     cpp_vis_args
   ],
   link_with : [libclllvm, libclspirv, libclnir],
-  override_options : clover_cpp_std,
 )