meson: use gnu_symbol_visibility argument

This uses a meson builtin to handle -fvisibility=hidden. This is nice
because we don't need to track which languages are used, if C++ is
suddenly added meson just does the right thing.

Acked-by: Matt Turner <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4740>

1 files changed, 11 insertions, 2 deletions

diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build
index e68d962ed84..f8c4ba93f55 100644
--- a/src/gallium/drivers/swr/meson.build
+++ b/src/gallium/drivers/swr/meson.build
@@ -187,7 +187,7 @@ swr_incs = include_directories(
   'rasterizer/archrast', 'rasterizer',
 )
 
-swr_cpp_args = [cpp_vis_args]
+swr_cpp_args = []
 if cpp.has_argument('-fno-strict-aliasing')
   swr_cpp_args += '-fno-strict-aliasing'
 endif
@@ -232,6 +232,7 @@ if with_swr_arches.contains('skx')
         cpp_msvc_compat_args, swr_cpp_args, swr_skx_args,
         '-DKNOB_ARCH=KNOB_ARCH_AVX512',
       ],
+      gnu_symbol_visibility : 'hidden',
       link_args : [ld_args_gc_sections],
       include_directories : [swr_incs],
       dependencies : [dep_thread, dep_llvm],
@@ -247,6 +248,7 @@ if with_swr_arches.contains('skx')
         cpp_msvc_compat_args, swr_cpp_args, swr_skx_args,
         '-DKNOB_ARCH=KNOB_ARCH_AVX512',
       ],
+      gnu_symbol_visibility : 'hidden',
       link_args : [ld_args_gc_sections],
       include_directories : [swr_incs],
       dependencies : [dep_thread, dep_llvm],
@@ -271,6 +273,7 @@ if with_swr_arches.contains('knl')
         cpp_msvc_compat_args, swr_cpp_args, swr_knl_args,
         '-DKNOB_ARCH=KNOB_ARCH_AVX512', '-DSIMD_ARCH_KNIGHTS',
       ],
+      gnu_symbol_visibility : 'hidden',
       link_args : [ld_args_gc_sections],
       include_directories : [swr_incs],
       dependencies : [dep_thread, dep_llvm],
@@ -286,6 +289,7 @@ if with_swr_arches.contains('knl')
         cpp_msvc_compat_args, swr_cpp_args, swr_knl_args,
         '-DKNOB_ARCH=KNOB_ARCH_AVX512', '-DSIMD_ARCH_KNIGHTS',
       ],
+      gnu_symbol_visibility : 'hidden',
       link_args : [ld_args_gc_sections],
       include_directories : [swr_incs],
       dependencies : [dep_thread, dep_llvm],
@@ -315,6 +319,7 @@ if with_swr_arches.contains('avx2')
         cpp_msvc_compat_args, swr_cpp_args, swr_avx2_args,
         '-DKNOB_ARCH=KNOB_ARCH_AVX2',
       ],
+      gnu_symbol_visibility : 'hidden',
       link_args : [ld_args_gc_sections],
       include_directories : [swr_incs],
       dependencies : [dep_thread, dep_llvm],
@@ -330,6 +335,7 @@ if with_swr_arches.contains('avx2')
         cpp_msvc_compat_args, swr_cpp_args, swr_avx2_args,
         '-DKNOB_ARCH=KNOB_ARCH_AVX2',
       ],
+      gnu_symbol_visibility : 'hidden',
       link_args : [ld_args_gc_sections],
       include_directories : [swr_incs],
       dependencies : [dep_thread, dep_llvm],
@@ -347,6 +353,7 @@ if with_swr_arches.contains('avx')
         cpp_msvc_compat_args, swr_cpp_args, swr_avx_args,
         '-DKNOB_ARCH=KNOB_ARCH_AVX',
       ],
+      gnu_symbol_visibility : 'hidden',
       link_args : [ld_args_gc_sections],
       include_directories : [swr_incs],
       dependencies : [dep_thread, dep_llvm],
@@ -362,6 +369,7 @@ if with_swr_arches.contains('avx')
         cpp_msvc_compat_args, swr_cpp_args, swr_avx_args,
         '-DKNOB_ARCH=KNOB_ARCH_AVX',
       ],
+      gnu_symbol_visibility : 'hidden',
       link_args : [ld_args_gc_sections],
       include_directories : [swr_incs],
       dependencies : [dep_thread, dep_llvm],
@@ -380,9 +388,10 @@ libmesaswr = static_library(
   [files_swr_mesa, files_swr_common, gen_knobs_h, gen_knobs_cpp,
    gen_builder_hpp, gen_builder_meta_hpp, gen_builder_intrin_hpp],
   cpp_args : [
-    cpp_msvc_compat_args, cpp_vis_args, swr_cpp_args, swr_avx_args,
+    cpp_msvc_compat_args, swr_cpp_args, swr_avx_args,
     swr_defines,
   ],
+  gnu_symbol_visibility : 'hidden',
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, swr_incs],
   dependencies : dep_llvm,
 )