19 files changed, 22 insertions, 20 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/meson.build b/src/gallium/winsys/amdgpu/drm/meson.build
index ef2705d52ad..d6793eff5d7 100644
--- a/src/gallium/winsys/amdgpu/drm/meson.build
+++ b/src/gallium/winsys/amdgpu/drm/meson.build
@@ -29,8 +29,7 @@ libamdgpuwinsys = static_library(
     inc_amd, inc_gallium, inc_gallium_aux, inc_include, inc_src,
     inc_amd_common, inc_amd_common_llvm,
   ],
-  c_args : [c_vis_args],
-  cpp_args : [cpp_vis_args],
+  gnu_symbol_visibility : 'hidden',
   link_with : libamdgpu_addrlib,
   dependencies : [dep_llvm, dep_libdrm_amdgpu, idep_amdgfxregs_h],
 )
diff --git a/src/gallium/winsys/freedreno/drm/meson.build b/src/gallium/winsys/freedreno/drm/meson.build
index 765ac887d11..c563165d776 100644
--- a/src/gallium/winsys/freedreno/drm/meson.build
+++ b/src/gallium/winsys/freedreno/drm/meson.build
@@ -28,6 +28,6 @@ libfreedrenowinsys = static_library(
     inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
     inc_freedreno,
   ],
-  c_args : [c_vis_args],
+  gnu_symbol_visibility : 'hidden',
   dependencies : [dep_libdrm],
 )
diff --git a/src/gallium/winsys/iris/drm/meson.build b/src/gallium/winsys/iris/drm/meson.build
index 3f8e2a8c63c..3dcdc4a455e 100644
--- a/src/gallium/winsys/iris/drm/meson.build
+++ b/src/gallium/winsys/iris/drm/meson.build
@@ -25,5 +25,5 @@ libiriswinsys = static_library(
     inc_src, inc_include,
     inc_gallium, inc_gallium_aux, inc_gallium_drivers,
   ],
-  c_args : [c_vis_args],
+  gnu_symbol_visibility : 'hidden',
 )
diff --git a/src/gallium/winsys/kmsro/drm/meson.build b/src/gallium/winsys/kmsro/drm/meson.build
index 13ed5a0ea43..cec92b1fa15 100644
--- a/src/gallium/winsys/kmsro/drm/meson.build
+++ b/src/gallium/winsys/kmsro/drm/meson.build
@@ -45,7 +45,8 @@ libkmsrowinsys = static_library(
     inc_src, inc_include,
     inc_gallium, inc_gallium_aux, inc_gallium_winsys,
   ],
-  c_args : [c_vis_args, kmsro_c_args],
+  c_args : [kmsro_c_args],
+  gnu_symbol_visibility : 'hidden',
   dependencies: dep_libdrm,
 )
 
diff --git a/src/gallium/winsys/nouveau/drm/meson.build b/src/gallium/winsys/nouveau/drm/meson.build
index cf661971f8b..a6f1f8a6b4f 100644
--- a/src/gallium/winsys/nouveau/drm/meson.build
+++ b/src/gallium/winsys/nouveau/drm/meson.build
@@ -24,6 +24,6 @@ libnouveauwinsys = static_library(
   include_directories : [
     inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
   ],
-  c_args : [c_vis_args],
+  gnu_symbol_visibility : 'hidden',
   dependencies : [dep_libdrm_nouveau],
 )
diff --git a/src/gallium/winsys/panfrost/drm/meson.build b/src/gallium/winsys/panfrost/drm/meson.build
index d19ce2ddb8b..84aa9ba5602 100644
--- a/src/gallium/winsys/panfrost/drm/meson.build
+++ b/src/gallium/winsys/panfrost/drm/meson.build
@@ -25,5 +25,5 @@ libpanfrostwinsys = static_library(
     inc_src, inc_include,
     inc_gallium, inc_gallium_aux, inc_gallium_drivers,
   ],
-  c_args : [c_vis_args],
+  gnu_symbol_visibility : 'hidden',
 )
diff --git a/src/gallium/winsys/radeon/drm/meson.build b/src/gallium/winsys/radeon/drm/meson.build
index d123df0502b..ae5382a5d99 100644
--- a/src/gallium/winsys/radeon/drm/meson.build
+++ b/src/gallium/winsys/radeon/drm/meson.build
@@ -24,6 +24,6 @@ libradeonwinsys = static_library(
         'radeon_drm_cs.h', 'radeon_drm_public.h', 'radeon_drm_surface.c',
         'radeon_drm_winsys.c', 'radeon_drm_winsys.h'),
   include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
-  c_args : [c_vis_args],
+  gnu_symbol_visibility : 'hidden',
   dependencies : [dep_libdrm_radeon],
 )
diff --git a/src/gallium/winsys/svga/drm/meson.build b/src/gallium/winsys/svga/drm/meson.build
index 55266ce1623..5f3065e10a5 100644
--- a/src/gallium/winsys/svga/drm/meson.build
+++ b/src/gallium/winsys/svga/drm/meson.build
@@ -37,7 +37,8 @@ files_svgadrm = files(
 libsvgadrm = static_library(
   'svgadrm',
   files_svgadrm,
-  c_args : [c_vis_args, c_msvc_compat_args],
+  c_args : [c_msvc_compat_args],
+  gnu_symbol_visibility : 'hidden',
   include_directories : [
     inc_src, inc_include, inc_gallium, inc_gallium_aux,
     include_directories('../../../drivers/svga', '../../../drivers/svga/include'),
diff --git a/src/gallium/winsys/sw/dri/meson.build b/src/gallium/winsys/sw/dri/meson.build
index 0de62226b96..49a0da82726 100644
--- a/src/gallium/winsys/sw/dri/meson.build
+++ b/src/gallium/winsys/sw/dri/meson.build
@@ -22,6 +22,6 @@
 libswdri = static_library(
   'swdri',
   files('dri_sw_winsys.c', 'dri_sw_winsys.h'),
-  c_args : c_vis_args,
+  gnu_symbol_visibility : 'hidden',
   include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
 )
diff --git a/src/gallium/winsys/sw/hgl/meson.build b/src/gallium/winsys/sw/hgl/meson.build
index 10096651c99..ceef11bfebd 100644
--- a/src/gallium/winsys/sw/hgl/meson.build
+++ b/src/gallium/winsys/sw/hgl/meson.build
@@ -21,7 +21,7 @@
 libswhgl = static_library(
   'swhgl',
   files('hgl_sw_winsys.c'),
-  c_args : c_vis_args,
+  gnu_symbol_visibility : 'hidden',
   include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux,
     include_directories('../../../frontends/hgl')
   ],
diff --git a/src/gallium/winsys/sw/kms-dri/meson.build b/src/gallium/winsys/sw/kms-dri/meson.build
index 9c46d6e5484..36cf568977c 100644
--- a/src/gallium/winsys/sw/kms-dri/meson.build
+++ b/src/gallium/winsys/sw/kms-dri/meson.build
@@ -22,7 +22,7 @@
 libswkmsdri = static_library(
   'swkmsdri',
   files('kms_dri_sw_winsys.c', 'kms_dri_sw_winsys.h'),
-  c_args : c_vis_args,
+  gnu_symbol_visibility : 'hidden',
   include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
   dependencies : dep_libdrm,
 )
diff --git a/src/gallium/winsys/sw/null/meson.build b/src/gallium/winsys/sw/null/meson.build
index 08b0ff7e828..32ce1b082d7 100644
--- a/src/gallium/winsys/sw/null/meson.build
+++ b/src/gallium/winsys/sw/null/meson.build
@@ -21,7 +21,7 @@
 libws_null = static_library(
   'ws_null',
   files('null_sw_winsys.c', 'null_sw_winsys.h'),
-  c_args : c_vis_args,
+  gnu_symbol_visibility : 'hidden',
   include_directories : [inc_gallium, inc_src, inc_gallium_aux, inc_include],
   build_by_default : false,
 )
diff --git a/src/gallium/winsys/sw/wrapper/meson.build b/src/gallium/winsys/sw/wrapper/meson.build
index 4672261f216..f02f5ddf6af 100644
--- a/src/gallium/winsys/sw/wrapper/meson.build
+++ b/src/gallium/winsys/sw/wrapper/meson.build
@@ -21,7 +21,7 @@
 libwsw = static_library(
   'wsw',
   files('wrapper_sw_winsys.c', 'wrapper_sw_winsys.h'),
-  c_args : c_vis_args,
+  gnu_symbol_visibility : 'hidden',
   include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
   build_by_default : false,
 )
diff --git a/src/gallium/winsys/sw/xlib/meson.build b/src/gallium/winsys/sw/xlib/meson.build
index d1f5759b052..c1c7eb5b3a5 100644
--- a/src/gallium/winsys/sw/xlib/meson.build
+++ b/src/gallium/winsys/sw/xlib/meson.build
@@ -21,7 +21,7 @@
 libws_xlib = static_library(
   'ws_xlib',
   files('xlib_sw_winsys.c'),
-  c_args : c_vis_args,
+  gnu_symbol_visibility : 'hidden',
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : [dep_x11, dep_xext, dep_xcb],
 )
diff --git a/src/gallium/winsys/v3d/drm/meson.build b/src/gallium/winsys/v3d/drm/meson.build
index e5d7b12d1df..58577709e24 100644
--- a/src/gallium/winsys/v3d/drm/meson.build
+++ b/src/gallium/winsys/v3d/drm/meson.build
@@ -25,5 +25,5 @@ libv3dwinsys = static_library(
     inc_src, inc_include,
     inc_gallium, inc_gallium_aux, inc_gallium_drivers,
   ],
-  c_args : [c_vis_args],
+  gnu_symbol_visibility : 'hidden',
 )
diff --git a/src/gallium/winsys/vc4/drm/meson.build b/src/gallium/winsys/vc4/drm/meson.build
index 55c85734e04..2e4200ef00f 100644
--- a/src/gallium/winsys/vc4/drm/meson.build
+++ b/src/gallium/winsys/vc4/drm/meson.build
@@ -36,5 +36,6 @@ libvc4winsys = static_library(
     inc_src, inc_include,
     inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_gallium_winsys,
   ],
-  c_args : [c_vis_args, vc4_winsys_c_args],
+  c_args : [vc4_winsys_c_args],
+  gnu_symbol_visibility : 'hidden',
 )
diff --git a/src/gallium/winsys/virgl/common/meson.build b/src/gallium/winsys/virgl/common/meson.build
index 18a40f28ec1..0fa9e889c1f 100644
--- a/src/gallium/winsys/virgl/common/meson.build
+++ b/src/gallium/winsys/virgl/common/meson.build
@@ -21,8 +21,8 @@
 libvirglcommon = static_library(
   'virglcommon',
   'virgl_resource_cache.c',
-  c_args : c_vis_args,
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
+  gnu_symbol_visibility : 'hidden',
 )
 
 dep_libvirglcommon = declare_dependency(
diff --git a/src/gallium/winsys/virgl/drm/meson.build b/src/gallium/winsys/virgl/drm/meson.build
index 0bfeafaeae9..cf15b78aff4 100644
--- a/src/gallium/winsys/virgl/drm/meson.build
+++ b/src/gallium/winsys/virgl/drm/meson.build
@@ -21,7 +21,7 @@
 libvirgldrm = static_library(
   'virgldrm',
   'virgl_drm_winsys.c',
-  c_args : c_vis_args,
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
   dependencies : [dep_libdrm, dep_libvirglcommon],
+  gnu_symbol_visibility : 'hidden',
 )
diff --git a/src/gallium/winsys/virgl/vtest/meson.build b/src/gallium/winsys/virgl/vtest/meson.build
index 6363e62c747..f8b38b42d7a 100644
--- a/src/gallium/winsys/virgl/vtest/meson.build
+++ b/src/gallium/winsys/virgl/vtest/meson.build
@@ -21,7 +21,7 @@
 libvirglvtest = static_library(
   'virglvtest',
   ['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'],
-  c_args : c_vis_args,
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
   dependencies : dep_libvirglcommon,
+  gnu_symbol_visibility : 'hidden',
 )