Index: test/cfi/lit.cfg
===================================================================
--- test/cfi/lit.cfg
+++ test/cfi/lit.cfg
@@ -10,7 +10,7 @@
 config.substitutions.append((r"%clang ", ' '.join([config.clang]) + ' '))
 config.substitutions.append((r"%clangxx ", clangxx + ' '))
 if config.lto_supported:
-  clang_cfi = ' '.join(config.lto_launch + [config.clang] + config.lto_flags + ['-flto -fsanitize=cfi '])
+  clang_cfi = ' '.join(config.lto_launch + [config.clang] + config.lto_flags + ['-flto -fsanitize=cfi -fvisibility=hidden '])
   clangxx_cfi = clang_cfi + ' '.join(config.cxx_mode_flags) + ' '
   diag_flags = '-fno-sanitize-trap=cfi -fsanitize-recover=cfi '
   clang_cfi_diag = clang_cfi + diag_flags
@@ -19,8 +19,8 @@
   config.substitutions.append((r"%clangxx_cfi ", clangxx_cfi))
   config.substitutions.append((r"%clang_cfi_diag ", clang_cfi_diag))
   config.substitutions.append((r"%clangxx_cfi_diag ", clangxx_cfi_diag))
-  config.substitutions.append((r"%clangxx_cfi_dso ", clangxx_cfi + '-fsanitize-cfi-cross-dso '))
-  config.substitutions.append((r"%clangxx_cfi_dso_diag ", clangxx_cfi_diag + '-fsanitize-cfi-cross-dso '))
+  config.substitutions.append((r"%clangxx_cfi_dso ", clangxx_cfi + '-fsanitize-cfi-cross-dso -fvisibility=default '))
+  config.substitutions.append((r"%clangxx_cfi_dso_diag ", clangxx_cfi_diag + '-fsanitize-cfi-cross-dso -fvisibility=default '))
 else:
   config.unsupported = True