fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 04:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
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@debian.org>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4948>
This commit is contained in:
Frédéric Bonnard 2020-05-07 16:30:52 +02:00 • committed by Marge Bot
parent cd7acd09b9
commit 5a27efdf0e
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
meson.build
View file

@ -777,7 +777,6 @@ if _power8 != 'disabled'
endif endif
_opencl = get_option('gallium-opencl') _opencl = get_option('gallium-opencl')
clover_cpp_std = []
if _opencl != 'disabled' if _opencl != 'disabled'
if not with_gallium if not with_gallium
error('OpenCL Clover implementation requires at least one gallium driver.') error('OpenCL Clover implementation requires at least one gallium driver.')
@ -796,14 +795,6 @@ if _opencl != 'disabled'
dep_spirv_tools = null_dep dep_spirv_tools = null_dep
dep_llvmspirvlib = null_dep dep_llvmspirvlib = null_dep
endif 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 else
dep_clc = null_dep dep_clc = null_dep
dep_spirv_tools = null_dep dep_spirv_tools = null_dep

4
src/gallium/frontends/clover/meson.build
View file

@ -72,7 +72,6 @@ libclllvm = static_library(
], ],
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
dependencies : [dep_llvm, dep_elf, dep_llvmspirvlib], dependencies : [dep_llvm, dep_elf, dep_llvmspirvlib],
override_options : clover_cpp_std,
) )
libclspirv = static_library( libclspirv = static_library(
@ -82,7 +81,6 @@ libclspirv = static_library(
cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args], cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args],
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
dependencies : [dep_spirv_tools], dependencies : [dep_spirv_tools],
override_options : clover_cpp_std,
) )
libclnir = static_library( libclnir = static_library(
@ -92,7 +90,6 @@ libclnir = static_library(
dependencies : idep_nir, dependencies : idep_nir,
cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args], cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args],
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
override_options : clover_cpp_std,
) )
clover_files = files( clover_files = files(
@ -162,5 +159,4 @@ libclover = static_library(
], ],
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
link_with : [libclllvm, libclspirv, libclnir], link_with : [libclllvm, libclspirv, libclnir],
override_options : clover_cpp_std,
) )