Module Name: src
Committed By: mrg
Date: Tue Feb 5 12:56:43 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_linux.cc
Log Message:
provide empty version of Aarch64GetESR() for non-linux arm64.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.25 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.26
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.25 Mon Feb 4 03:00:11 2019
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc Tue Feb 5 12:56:43 2019
@@ -1346,6 +1346,7 @@ void internal_join_thread(void *th) {}
#endif
#if defined(__aarch64__)
+#if SANITIZER_LINUX
// Android headers in the older NDK releases miss this definition.
struct __sanitizer_esr_context {
struct _aarch64_ctx head;
@@ -1366,6 +1367,11 @@ static bool Aarch64GetESR(ucontext_t *uc
}
return false;
}
+#else
+static bool Aarch64GetESR(ucontext_t *ucontext, u64 *esr) {
+ return false;
+}
+#endif
#endif
SignalContext::WriteFlag SignalContext::GetWriteFlag(void *context) {
