[compiler-rt] r267902 - Update visibility flags for CFI tests.

[Peter Collingbourne via llvm-commits]

Author: pcc
Date: Thu Apr 28 12:09:09 2016
New Revision: 267902

URL: http://llvm.org/viewvc/llvm-project?rev=267902&view=rev
Log:
Update visibility flags for CFI tests.

Differential Revision: http://reviews.llvm.org/D18813

Modified:
    compiler-rt/trunk/test/cfi/lit.cfg

Modified: compiler-rt/trunk/test/cfi/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/lit.cfg?rev=267902&r1=267901&r2=267902&view=diff
==============================================================================
--- compiler-rt/trunk/test/cfi/lit.cfg (original)
+++ compiler-rt/trunk/test/cfi/lit.cfg Thu Apr 28 12:09:09 2016
@@ -11,16 +11,16 @@ config.substitutions.append((r"%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 '])
-  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
-  clangxx_cfi_diag = clangxx_cfi + diag_flags
-  config.substitutions.append((r"%clang_cfi ", clang_cfi))
-  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 '))
+  cxx = ' '.join(config.cxx_mode_flags) + ' '
+  diag = '-fno-sanitize-trap=cfi -fsanitize-recover=cfi '
+  non_dso = '-fvisibility=hidden '
+  dso = '-fsanitize-cfi-cross-dso -fvisibility=default '
+  config.substitutions.append((r"%clang_cfi ", clang_cfi + non_dso))
+  config.substitutions.append((r"%clangxx_cfi ", clang_cfi + cxx + non_dso))
+  config.substitutions.append((r"%clang_cfi_diag ", clang_cfi + non_dso + diag))
+  config.substitutions.append((r"%clangxx_cfi_diag ", clang_cfi + cxx + non_dso + diag))
+  config.substitutions.append((r"%clangxx_cfi_dso ", clang_cfi + cxx + dso))
+  config.substitutions.append((r"%clangxx_cfi_dso_diag ", clang_cfi + cxx + dso + diag))
 else:
   config.unsupported = True