[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/libabw external/libcdr external/libebook external/libepubgen external/libetonyek external/libfreehand external/libmspub external/libmwaw external/libodfgen external/libpagemaker external/libqxp external/librevenge external/libstaroffice external/libvisio external/libwps external/libzmf solenv/gbuild solenv/sanitizers

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 20 11:32:56 UTC 2019


 config_host.mk.in                                       |    1 
 configure.ac                                            |   48 ----------------
 external/libabw/UnpackedTarball_libabw.mk               |    8 --
 external/libabw/ubsan-visibility.patch                  |   11 ---
 external/libcdr/UnpackedTarball_libcdr.mk               |    6 --
 external/libcdr/ubsan-visibility.patch                  |   11 ---
 external/libebook/UnpackedTarball_libebook.mk           |    8 --
 external/libebook/ubsan-visibility.patch                |   11 ---
 external/libepubgen/UnpackedTarball_libepubgen.mk       |    4 -
 external/libepubgen/ubsan-visibility.patch              |   11 ---
 external/libetonyek/UnpackedTarball_libetonyek.mk       |    6 --
 external/libetonyek/ubsan-visibility.patch              |   11 ---
 external/libfreehand/UnpackedTarball_libfreehand.mk     |    8 --
 external/libfreehand/ubsan-visibility.patch             |   11 ---
 external/libmspub/UnpackedTarball_libmspub.mk           |    6 --
 external/libmspub/ubsan-visibility.patch                |   11 ---
 external/libmwaw/UnpackedTarball_libmwaw.mk             |    6 --
 external/libmwaw/ubsan-visibility.patch                 |   11 ---
 external/libodfgen/UnpackedTarball_libodfgen.mk         |    6 --
 external/libodfgen/ubsan-visibility.patch               |   11 ---
 external/libpagemaker/UnpackedTarball_libpagemaker.mk   |    8 --
 external/libpagemaker/ubsan-visibility.patch            |   11 ---
 external/libqxp/UnpackedTarball_libqxp.mk               |    8 --
 external/libqxp/ubsan-visibility.patch                  |   11 ---
 external/librevenge/UnpackedTarball_librevenge.mk       |    6 --
 external/librevenge/ubsan-visibility.patch              |   11 ---
 external/libstaroffice/UnpackedTarball_libstaroffice.mk |    6 --
 external/libstaroffice/ubsan-visibility.patch           |   11 ---
 external/libvisio/UnpackedTarball_libvisio.mk           |    6 --
 external/libvisio/ubsan-visibility.patch                |   11 ---
 external/libwps/UnpackedTarball_libwps.mk               |    6 --
 external/libwps/ubsan-visibility.patch.0                |   11 ---
 external/libzmf/UnpackedTarball_libzmf.mk               |    8 --
 external/libzmf/ubsan-visibility.patch                  |   11 ---
 solenv/gbuild/platform/com_GCC_defs.mk                  |    4 -
 solenv/gbuild/platform/unxgcc.mk                        |    3 -
 solenv/sanitizers/asan-suppressions                     |   31 ----------
 37 files changed, 369 deletions(-)

New commits:
commit 28e028680b3c0551db3a9b71c8fe6b66aac2433b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri May 17 17:40:06 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Sep 20 13:31:50 2019 +0200

    Remove legacy NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY support
    
    ...for ASan/UBSan builds using Clang older than current trunk twoards Clang 9,
    as announced at
    <https://lists.freedesktop.org/archives/libreoffice/2019-May/082654.html> "Re:
    [Libreoffice-commits] core.git: The -fvisibility-ms-compat hack is no longer
    needed for UBSan on Linux...".  (And drop the no longer needed
    solenv/sanitizers/asan-suppressions, which people might still reference from
    their ASAN_OPTIONS.)
    
    Change-Id: Iedc0c5955366d2cbe7dc847990e2b1576750e85b
    Reviewed-on: https://gerrit.libreoffice.org/72493
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index 5476dffa6191..122c9de745dd 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -408,7 +408,6 @@ export MWAW_LIBS=$(gb_SPACE)@MWAW_LIBS@
 export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@
 export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@
 export NASM=@NASM@
-export NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY=@NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY@
 export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@
 export NEON_LIBS=$(gb_SPACE)@NEON_LIBS@
 export NEON_VERSION=@NEON_VERSION@
diff --git a/configure.ac b/configure.ac
index e6081bb94e8b..f27b041ee0c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3914,30 +3914,6 @@ else
 fi
 AC_SUBST(ENABLE_DEBUG)
 
-AC_MSG_CHECKING([whether special RTTI visibility flags are needed for Clang Linux UBSan])
-NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY=
-dnl Clang 9 is known fixed since
-dnl <https://github.com/llvm/llvm-project/commit/5745eccef54ddd3caca278d1d292a88b2281528b> "Adapt
-dnl -fsanitize=function to SANITIZER_NON_UNIQUE_TYPEINFO":
-if test "$COM_IS_CLANG" = TRUE -a "$_os" = Linux; then
-    if test "$CLANGVER" -lt 90000; then
-        for i in $CC; do
-            case $i in
-            -fsanitize=*)
-                NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY=TRUE
-                break
-                ;;
-            esac
-        done
-    fi
-fi
-if test "$NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY" = TRUE; then
-    AC_MSG_RESULT([yes])
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST([NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY])
-
 dnl ===================================================================
 dnl Select the linker to use (gold/lld/ld.bfd).
 dnl This is done only after compiler checks (need to know if Clang is
@@ -3962,30 +3938,6 @@ printf ("hello world\n");
     if test -n "$USE_LD"; then
         AC_MSG_RESULT( yes )
         use_ld_ok=yes
-        dnl For obscure reasons, unxgcc.mk uses the --dynamic-list-cpp-typeinfo linker option
-        dnl if NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY, and lld doesn't support this option.
-        if test -n "$NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY"; then
-            AC_MSG_CHECKING([for --dynamic-list-cpp-typeinfo linker support (-fuse-ld=$use_ld)])
-            use_ld_ldflags_save_2="$LDFLAGS"
-            LDFLAGS="$LDFLAGS -Wl,--dynamic-list-cpp-typeinfo"
-            use_ld_has_cpp_typeinfo=
-            AC_LINK_IFELSE([AC_LANG_PROGRAM([
-#include <stdio.h>
-                ],[
-printf ("hello world\n");
-                ])], use_ld_has_cpp_typeinfo=yes, [])
-            LDFLAGS="$use_ld_ldflags_save_2"
-            if test -n "$use_ld_has_cpp_typeinfo"; then
-                AC_MSG_RESULT( yes )
-            else
-                if test -n "$use_ld_fail_if_error"; then
-                    AC_MSG_ERROR( no )
-                else
-                    AC_MSG_RESULT( no )
-                fi
-                use_ld_ok=
-            fi
-        fi
     else
         if test -n "$use_ld_fail_if_error"; then
             AC_MSG_ERROR( no )
diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk
index bb7e1fb4ae8c..6860e0905046 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,14 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
-
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
-    external/libabw/ubsan-visibility.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/ubsan-visibility.patch b/external/libabw/ubsan-visibility.patch
deleted file mode 100644
index 2285ef873e2c..000000000000
--- a/external/libabw/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -16635,7 +16635,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk
index d53ea59e2bf6..1a72fe8be15c 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -25,10 +25,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
     external/libcdr/ubsan.patch \
 ))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
-    external/libcdr/ubsan-visibility.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libcdr/ubsan-visibility.patch b/external/libcdr/ubsan-visibility.patch
deleted file mode 100644
index 2581786e47c3..000000000000
--- a/external/libcdr/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -17651,7 +17641,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 17b1a892dc3e..0b0658652fc8 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -11,14 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libebook))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,0))
-
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libebook))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libebook, \
-    external/libebook/ubsan-visibility.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libebook/ubsan-visibility.patch b/external/libebook/ubsan-visibility.patch
deleted file mode 100644
index b18f6a4312a5..000000000000
--- a/external/libebook/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -17254,7 +17254,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libepubgen/UnpackedTarball_libepubgen.mk b/external/libepubgen/UnpackedTarball_libepubgen.mk
index 051cc29021cc..3c505ea1b2b4 100644
--- a/external/libepubgen/UnpackedTarball_libepubgen.mk
+++ b/external/libepubgen/UnpackedTarball_libepubgen.mk
@@ -10,10 +10,6 @@
 epubgen_patches :=
 epubgen_patches += tdf-120491.patch
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-epubgen_patches += ubsan-visibility.patch
-endif
-
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,libepubgen))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libepubgen,$(EPUBGEN_TARBALL)))
diff --git a/external/libepubgen/ubsan-visibility.patch b/external/libepubgen/ubsan-visibility.patch
deleted file mode 100644
index 10234b308ba5..000000000000
--- a/external/libepubgen/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -18425,7 +18425,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 01aac83c812a..cd7a30e8adea 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -32,10 +32,4 @@ endif
 endif
 endif
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
-    external/libetonyek/ubsan-visibility.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/ubsan-visibility.patch b/external/libetonyek/ubsan-visibility.patch
deleted file mode 100644
index 925f4a8c1cf8..000000000000
--- a/external/libetonyek/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -17443,7 +17443,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk
index 0853d0420129..222f013c7873 100644
--- a/external/libfreehand/UnpackedTarball_libfreehand.mk
+++ b/external/libfreehand/UnpackedTarball_libfreehand.mk
@@ -11,14 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libfreehand))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libfreehand,$(FREEHAND_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libfreehand,0))
-
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libfreehand))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \
-    external/libfreehand/ubsan-visibility.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libfreehand/ubsan-visibility.patch b/external/libfreehand/ubsan-visibility.patch
deleted file mode 100644
index dff5cdbdb57f..000000000000
--- a/external/libfreehand/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -18369,7 +18369,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk
index 3588b33f0334..287be540dee6 100644
--- a/external/libmspub/UnpackedTarball_libmspub.mk
+++ b/external/libmspub/UnpackedTarball_libmspub.mk
@@ -28,10 +28,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmspub, \
 ))
 endif
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libmspub, \
-    external/libmspub/ubsan-visibility.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmspub/ubsan-visibility.patch b/external/libmspub/ubsan-visibility.patch
deleted file mode 100644
index edaa1d0249ee..000000000000
--- a/external/libmspub/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -17060,7 +17060,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 62357c008071..935cbc1eb1c3 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -15,12 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmwaw))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
-    external/libmwaw/ubsan-visibility.patch \
-))
-endif
-
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
diff --git a/external/libmwaw/ubsan-visibility.patch b/external/libmwaw/ubsan-visibility.patch
deleted file mode 100644
index a14d201ea4c5..000000000000
--- a/external/libmwaw/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -17225,7 +17225,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index ee4ed647cb9a..c4ea2939f4cb 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -15,12 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libodfgen))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
-    external/libodfgen/ubsan-visibility.patch \
-))
-endif
-
 ifeq ($(SYSTEM_REVENGE),)
 $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
     external/libodfgen/rpath.patch \
diff --git a/external/libodfgen/ubsan-visibility.patch b/external/libodfgen/ubsan-visibility.patch
deleted file mode 100644
index 5dcae64c3b14..000000000000
--- a/external/libodfgen/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -15721,7 +15721,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libpagemaker/UnpackedTarball_libpagemaker.mk b/external/libpagemaker/UnpackedTarball_libpagemaker.mk
index a090d334c3fe..752d5c0ebe21 100644
--- a/external/libpagemaker/UnpackedTarball_libpagemaker.mk
+++ b/external/libpagemaker/UnpackedTarball_libpagemaker.mk
@@ -11,14 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libpagemaker))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libpagemaker,$(PAGEMAKER_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libpagemaker,0))
-
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libpagemaker))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \
-    external/libpagemaker/ubsan-visibility.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libpagemaker/ubsan-visibility.patch b/external/libpagemaker/ubsan-visibility.patch
deleted file mode 100644
index 90ead2b844b2..000000000000
--- a/external/libpagemaker/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -16787,7 +16787,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libqxp/UnpackedTarball_libqxp.mk b/external/libqxp/UnpackedTarball_libqxp.mk
index c0d89263a4d2..0ac69bc6f079 100644
--- a/external/libqxp/UnpackedTarball_libqxp.mk
+++ b/external/libqxp/UnpackedTarball_libqxp.mk
@@ -11,16 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libqxp))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libqxp,$(QXP_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libqxp,0))
-
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libqxp))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
-    external/libqxp/ubsan-visibility.patch \
-))
-endif
-
 $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
 	external/libqxp/android-workaround.patch.1 \
 ))
diff --git a/external/libqxp/ubsan-visibility.patch b/external/libqxp/ubsan-visibility.patch
deleted file mode 100644
index 90ead2b844b2..000000000000
--- a/external/libqxp/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -16787,7 +16787,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/librevenge/UnpackedTarball_librevenge.mk b/external/librevenge/UnpackedTarball_librevenge.mk
index 7e4c48f59619..74f28751c609 100644
--- a/external/librevenge/UnpackedTarball_librevenge.mk
+++ b/external/librevenge/UnpackedTarball_librevenge.mk
@@ -19,12 +19,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
     external/librevenge/rpath.patch \
 ))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
-    external/librevenge/ubsan-visibility.patch \
-))
-endif
-
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
diff --git a/external/librevenge/ubsan-visibility.patch b/external/librevenge/ubsan-visibility.patch
deleted file mode 100644
index ede44d4fee7d..000000000000
--- a/external/librevenge/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/Makefile.in
-+++ src/lib/Makefile.in
-@@ -79,7 +79,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-- at HAVE_VISIBILITY_TRUE@am__append_1 = -fvisibility=hidden
-+ at HAVE_VISIBILITY_TRUE@am__append_1 = -fvisibility-ms-compat
- @HAVE_VISIBILITY_TRUE at am__append_2 = -DLIBREVENGE_VISIBILITY
- @BUILD_GENERATORS_TRUE at am__append_3 = librevenge-generators- at RVNG_MAJOR_VERSION@. at RVNG_MINOR_VERSION@.la
- @BUILD_GENERATORS_TRUE@@HAVE_VISIBILITY_TRUE at am__append_4 = -DLIBREVENGE_GENERATORS_VISIBILITY
diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
index 98b8e14cdaec..f2c9ccc460af 100644
--- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk
+++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
@@ -15,12 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libstaroffice,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libstaroffice))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
-    external/libstaroffice/ubsan-visibility.patch \
-))
-endif
-
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
diff --git a/external/libstaroffice/ubsan-visibility.patch b/external/libstaroffice/ubsan-visibility.patch
deleted file mode 100644
index a14d201ea4c5..000000000000
--- a/external/libstaroffice/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -17225,7 +17225,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
index 9462075ec293..e19878740289 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -19,10 +19,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
     external/libvisio/ubsan.patch \
 ))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libvisio, \
-    external/libvisio/ubsan-visibility.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libvisio/ubsan-visibility.patch b/external/libvisio/ubsan-visibility.patch
deleted file mode 100644
index 1855c737bd79..000000000000
--- a/external/libvisio/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -17847,7 +17847,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index a383a2d12377..f53a8fffc429 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -28,10 +28,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
 endif
 endif
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libwps, \
-    external/libwps/ubsan-visibility.patch.0 \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/ubsan-visibility.patch.0 b/external/libwps/ubsan-visibility.patch.0
deleted file mode 100644
index 50efe41c22aa..000000000000
--- a/external/libwps/ubsan-visibility.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -16632,7 +16632,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/external/libzmf/UnpackedTarball_libzmf.mk b/external/libzmf/UnpackedTarball_libzmf.mk
index 5d5e7066572d..d37e16fcb711 100644
--- a/external/libzmf/UnpackedTarball_libzmf.mk
+++ b/external/libzmf/UnpackedTarball_libzmf.mk
@@ -11,16 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libzmf))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libzmf,$(ZMF_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libzmf,0))
-
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libzmf))
 
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
-    external/libzmf/ubsan-visibility.patch \
-))
-endif
-
 $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
     external/libzmf/android-workaround.patch.1 \
 ))
diff --git a/external/libzmf/ubsan-visibility.patch b/external/libzmf/ubsan-visibility.patch
deleted file mode 100644
index 90ead2b844b2..000000000000
--- a/external/libzmf/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -16787,7 +16787,7 @@
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5
- $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
-         saved_CXXFLAGS="$CXXFLAGS"
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index a17db5a82e84..485bd6e99d3d 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -126,12 +126,8 @@ endif
 
 # If CC or CXX already include -fvisibility=hidden, don't duplicate it
 ifeq (,$(filter -fvisibility=hidden,$(CC)))
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-gb_VISIBILITY_FLAGS := -fvisibility-ms-compat
-else
 gb_VISIBILITY_FLAGS := -fvisibility=hidden
 endif
-endif
 gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
 gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index df5eb7ca94c6..8854aab6c425 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -84,9 +84,6 @@ endif
 
 ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
 gb_LinkTarget_LDFLAGS += -Wl,-Bsymbolic-functions
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-gb_LinkTarget_LDFLAGS += -Wl,--dynamic-list-cpp-typeinfo
-endif
 endif
 
 gb_LINKEROPTFLAGS := -Wl,-O1
diff --git a/solenv/sanitizers/asan-suppressions b/solenv/sanitizers/asan-suppressions
deleted file mode 100644
index dd2c4f12ce61..000000000000
--- a/solenv/sanitizers/asan-suppressions
+++ /dev/null
@@ -1,31 +0,0 @@
-# [CUT] cppcanvas_emfplus
-# =================================================================
-# ==32735==ERROR: AddressSanitizer: odr-violation (0x7f8f717e28a0):
-#   [1] size=40 'vtable for graphite2::CachedFace' /home/sbergman/lo/core/workdir/UnpackedTarball/graphite/src/CachedFace.cpp
-#   [2] size=40 'vtable for graphite2::CachedFace' /home/sbergman/lo/core/workdir/UnpackedTarball/graphite/src/CachedFace.cpp
-# These globals were registered at these points:
-#   [1]:
-#  #0 in __asan_register_globals.part.13 at /home/sbergman/github.com/llvm-project/llvm-project-20170507/compiler-rt/lib/asan/asan_globals.cc:359:3 (workdir/LinkTarget/Executable/cppunittester +0x446ff0)
-#  #1 in asan.module_ctor at <null> (instdir/program/libvclplug_gtk3lo.so +0xed96cb)
-#
-#   [2]:
-#  #0 in __asan_register_globals.part.13 at /home/sbergman/github.com/llvm-project/llvm-project-20170507/compiler-rt/lib/asan/asan_globals.cc:359:3 (workdir/LinkTarget/Executable/cppunittester +0x446ff0)
-#  #1 in asan.module_ctor at <null> (instdir/program/libvcllo.so +0x6e169cb)
-#
-# ...and more (partly because -fvisibility-ms-compat (and "-XClang -ftype-visibility -XClang
-# default", which it internally uses) also gives _ZTV* symbols default visibility):
-odr_violation:^_ZTIN9graphite210CachedCmapE$
-odr_violation:^_ZTSN9graphite210CachedCmapE$
-odr_violation:^_ZTVN9graphite210CachedCmapE$
-odr_violation:^_ZTSN9graphite210CachedFaceE$
-odr_violation:^_ZTIN9graphite210CachedFaceE$
-odr_violation:^_ZTVN9graphite210CachedFaceE$
-odr_violation:^_ZTIN9graphite210DirectCmapE$
-odr_violation:^_ZTSN9graphite210DirectCmapE$
-odr_violation:^_ZTVN9graphite210DirectCmapE$
-odr_violation:^_ZTSN9graphite24FaceE$
-odr_violation:^_ZTIN9graphite24FaceE$
-odr_violation:^_ZTVN9graphite24FaceE$
-odr_violation:^_ZTSN9graphite24FontE$
-odr_violation:^_ZTIN9graphite24FontE$
-odr_violation:^_ZTVN9graphite24FontE$


More information about the Libreoffice-commits mailing list