diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-09-14 22:56:58 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-09-15 07:58:37 +0200 |
| commit | 233e0a009a6a22342a86a03eeb1349be2cd2d3eb (patch) | |
| tree | d7a77170f20ef9eef3272dc7415cc77e745ee55d /external/cairo | |
| parent | d039fcd1cc6ce1f746b412f364790614bf972740 (diff) | |
A more principled suppression of -fsanitize=function in external C code
...after
<https://github.com/llvm/llvm-project/commit/279a4d0d67c874e80c171666822f2fabdd6fa926>
"-fsanitize=function: support C".
This includes reverts of 16af9e81863a80116f808ee3cfa4a1bab7c67ac5 "update clang
asan suppressions" and 151a43f3d00f6523079c53d6c2d064f80b9a55d6 ""update clang
asan suppressions".
Change-Id: I49740f5f3a784af1d62b830b47bfdfa27fe3e471
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156935
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 1 | ||||
| -rw-r--r-- | external/cairo/ExternalProject_pixman.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index b677098482ff..df6bd5a37b78 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -49,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(if $(debug),STRIP=" ") \ $(if $(filter ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \ $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS="-O3 -DCAIRO_NO_MUTEX $(ZLIB_CFLAGS) -Wno-enum-conversion $(gb_EMSCRIPTEN_CPPFLAGS)" ) \ + $(if $(filter -fsanitize=undefined,$(CC)),CC='$(CC) -fno-sanitize=function') \ $(if $(filter-out EMSCRIPTEN ANDROID iOS,$(OS)), \ CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,cairo) $(ZLIB_CFLAGS)" \ LDFLAGS="$(call gb_ExternalProject_get_link_flags,cairo)" \ diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk index 29902b4c1f5c..f95fcb626ccc 100644 --- a/external/cairo/ExternalProject_pixman.mk +++ b/external/cairo/ExternalProject_pixman.mk @@ -29,6 +29,7 @@ $(call gb_ExternalProject_get_state_target,pixman,build) : $(gb_CONFIGURE_PLATFORMS) \ $(if $(CROSS_COMPILING),$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS="-O3 -pthread -msimd128") \ + $(if $(filter -fsanitize=undefined,$(CC)),CC='$(CC) -fno-sanitize=function') \ && $(MAKE) \ ) $(call gb_Trace_EndRange,pixman,EXTERNAL) |