external/firebird/asan.patch | 11 ++++-------
external/firebird/firebird-cygwin-msvc.patch | 4 ++--
2 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 285d275816e58798a0a830f356cc76ef5ef506e1
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Feb 20 18:32:42 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Feb 21 00:04:34 2020 +0100
external/firebird: Remove dead conditionals
For one, Clang appears to support __has_feature since at least 3.x times.
That
simplifies the first check, from 14955ed91b282ccbb395cb47c6d76e3b42b34748
"external/firebird: Support Clang ASan".
And for another, the second check, from
25764ffd4db0e5db6f9cc9f3da8691e607f48b83
"external/firebird: Better workaround for Clang alignment expectations",
can be
simplified now that we no longer support neither Clang < 4 on Linux (since
685aca47da835e80f34b295c5d6389df03d1a8c2 "Bump (Linux) Clang baseline to
5.0.2")
nor Xcode < 9 on macOS (since b4f666f2e677b05cab8395fe7972b45b15f60c3f "Bump
Xcode baseline to 9.3").
But that means we are always setting USE_ASAN when building with Clang now
(to
work around certain Clang alignment expectations, regardless of whether or
not
we build with -fsanitize=address). Nevertheless, keep the
__has_feature(address_sanitizer) check as a comment, to make this a bit
clearer.
Change-Id: Idc9720bd763bc1e00585773ef096202e2a8a6a59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89162
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index a4ef7075a884..5ee7744e1038 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -204,17 +204,14 @@
#ifdef DEBUG_GDS_ALLOC
--- src/include/firebird.h
+++ src/include/firebird.h
-@@ -38,8 +38,20 @@
+@@ -38,8 +38,17 @@
#include "gen/autoconfig.h"
#endif
-+#if defined __clang__ && defined __has_feature
-+#if __has_feature(address_sanitizer)
-+#define USE_ASAN
-+#endif
-+#endif
-+#if defined __clang__ && (defined __apple_build_version__ ? __clang_major__
>= 9 : __clang_major__ >= 4)
++#if defined __clang__
++//#if __has_feature(address_sanitizer)
+#define USE_ASAN
++//#endif
+#endif
+#if defined __SANITIZE_ADDRESS__
+#define USE_ASAN
diff --git a/external/firebird/firebird-cygwin-msvc.patch
b/external/firebird/firebird-cygwin-msvc.patch
index 12dcb3c9513a..317ea8026b5d 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -10,8 +10,8 @@
#include "gen/autoconfig.h"
-#endif
- #if defined __clang__ && defined __has_feature
- #if __has_feature(address_sanitizer)
+ #if defined __clang__
+ //#if __has_feature(address_sanitizer)
--- src/misc/writeBuildNum.sh 2016-07-07 15:57:04.538983200 +0200
+++ src/misc/writeBuildNum.sh 2016-07-13 11:31:18.132820200 +0200
@@ -95,9 +95,9 @@
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
