[PATCH] D74142: [GWP-ASan] Use weak abort message definition.
Mitch Phillips via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Feb 6 10:40:16 PST 2020
This revision was automatically updated to reflect the committed changes.
Closed by commit rG8d19af685c9b: [GWP-ASan] Use weak abort message definition. (authored by hctim).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D74142/new/
https://reviews.llvm.org/D74142
Files:
compiler-rt/lib/gwp_asan/definitions.h
compiler-rt/lib/gwp_asan/platform_specific/utilities_posix.cpp
Index: compiler-rt/lib/gwp_asan/platform_specific/utilities_posix.cpp
===================================================================
--- compiler-rt/lib/gwp_asan/platform_specific/utilities_posix.cpp
+++ compiler-rt/lib/gwp_asan/platform_specific/utilities_posix.cpp
@@ -6,11 +6,12 @@
//
//===----------------------------------------------------------------------===//
+#include "gwp_asan/definitions.h"
#include "gwp_asan/utilities.h"
#ifdef ANDROID
-#include <android/set_abort_message.h>
#include <stdlib.h>
+extern "C" GWP_ASAN_WEAK void android_set_abort_message(const char *);
#else // ANDROID
#include <stdio.h>
#endif
@@ -21,7 +22,8 @@
void Check(bool Condition, const char *Message) {
if (Condition)
return;
- android_set_abort_message(Message);
+ if (&android_set_abort_message != nullptr)
+ android_set_abort_message(Message);
abort();
}
#else // ANDROID
Index: compiler-rt/lib/gwp_asan/definitions.h
===================================================================
--- compiler-rt/lib/gwp_asan/definitions.h
+++ compiler-rt/lib/gwp_asan/definitions.h
@@ -15,4 +15,6 @@
#define GWP_ASAN_UNLIKELY(X) __builtin_expect(!!(X), 0)
#define GWP_ASAN_ALWAYS_INLINE inline __attribute__((always_inline))
+#define GWP_ASAN_WEAK __attribute__((weak))
+
#endif // GWP_ASAN_DEFINITIONS_H_
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D74142.242945.patch
Type: text/x-patch
Size: 1332 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200206/f1cc59dd/attachment.bin>
More information about the llvm-commits
mailing list