From 9a7aa3326d087c79879e435179e359dd76aa5e0a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 16 Apr 2019 16:11:39 +0200 Subject: The -fvisibility-ms-compat hack is no longer needed for UBSan on Linux... ...with latest Clang trunk towards Clang 9. All the no-longer necessary hacks are made conditional on new NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY, which is still set for UBSan builds with older Clang on Linux (but which should eventually be purged). Various classes needed additional SAL_DLLPUBLIC_RTTI annotations, as building with UBSan instrumentation can generate references to RTTI symbols from additional places like outside a dynamic library that used to hide those symbols by default (but used to not hide them for old UBSan builds thanks to the -fvisibility-ms-compat hack). The odr-violation suppressions in solenv/sanitizers/asan-suppressions (which is not referenced from anywhere in the code base, but meant to be included in an ASan/UBSan build's ASAN_OPTIONS env var) are also no longer needed when NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY is false. Change-Id: I24ec3e388b0cbab50dbe2bf008d9569bff7bf25a Reviewed-on: https://gerrit.libreoffice.org/70829 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- external/libwps/UnpackedTarball_libwps.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'external/libwps') diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index d712f25406bd..b148db2f93d2 100644 --- a/external/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -27,12 +27,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps,\ endif endif -ifeq ($(COM_IS_CLANG),TRUE) -ifneq ($(filter -fsanitize=%,$(CC)),) +ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,libwps, \ external/libwps/ubsan-visibility.patch.0 \ )) endif -endif # vim: set noet sw=4 ts=4: -- cgit