external/dtoa/StaticLibrary_dtoa.mk | 1 +
jurt/Library_jpipe.mk | 4 ++++
jurt/source/pipe/staticsalhack.cxx | 6 ++++++
3 files changed, 11 insertions(+)
New commits:
commit 8bda8ad7c0e48867c2abe44e0e84c0d86187f9ff
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Feb 28 09:21:45 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Feb 28 10:25:45 2020 +0100
Adapt Clang -fsanitize jurt/source/pipe/staticsalhack.cxx
...to 1782810f886acd26db211d8fdd7ae8796d203c57 "Related: tdf#130725: use
strtod
also in rtl::math::stringToDouble". The sal code recompiled into
staticsalhack
now uses StaticLibrary_dtoa, and that external/dtoa code needs to be
recompiled,
too.
Change-Id: I60a88fc2b38766da36b356f89853f322657bde34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89662
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/dtoa/StaticLibrary_dtoa.mk
b/external/dtoa/StaticLibrary_dtoa.mk
index edb358c21da4..9726ffbbd51f 100644
--- a/external/dtoa/StaticLibrary_dtoa.mk
+++ b/external/dtoa/StaticLibrary_dtoa.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,dtoa))
$(eval $(call gb_StaticLibrary_use_unpacked,dtoa,dtoa))
+# A place that duplicates these settings is jurt/source/pipe/staticsalhack.cxx:
$(eval $(call gb_StaticLibrary_add_cflags,dtoa,-DIEEE_8087))
$(eval $(call gb_StaticLibrary_set_warnings_disabled,dtoa))
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 204da654c553..334f6b16e1fc 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -62,6 +62,8 @@ $(eval $(call gb_Library_set_include,jpipe, \
-I$(SRCDIR)/sal/osl/unx \
-I$(SRCDIR)/sal/rtl \
-I$(SRCDIR)/sal/textenc \
+ -I$(call gb_UnpackedTarball_get_dir,dtoa) \
+ -I$(call gb_UnpackedTarball_get_dir,dtoa/include) \
))
$(eval $(call gb_Library_use_externals,jpipe, \
@@ -74,6 +76,8 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,jpipe, \
))
endif
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \
+ $(call gb_UnpackedTarball_get_target,dtoa)
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \
gb_CC := $(filter-out -fsanitize%,$(gb_CC))
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \
diff --git a/jurt/source/pipe/staticsalhack.cxx
b/jurt/source/pipe/staticsalhack.cxx
index 4c25067f13c0..fa9547a9e0b8 100644
--- a/jurt/source/pipe/staticsalhack.cxx
+++ b/jurt/source/pipe/staticsalhack.cxx
@@ -76,4 +76,10 @@ extern "C" ImplTextEncodingData const *
sal_getFullTextEncodingData(
std::abort();
}
+#define IEEE_8087 // see external/dtoa/StaticLibrary_dtoa.mk
+#pragma clang diagnostic ignored "-Weverything"
+extern "C" {
+#include <src/dtoa.c> // workdir/UnpackedTarball/dtoa/src/dtoa.c
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
