commit b202efb08706c323f567c3ae0b8c2be63ed9b29f
author Elliott Hughes <enh@google.com> Tue Apr 14 23:13:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 14 23:13:24 2020 +0000
tree bf242562c1f90ada778c4ed4846396860cf88f65
parent 1e3a20c09486a77fd78a09426a9b613d3675fea8
parent 38558bad85008368613a362d82289d0370e88357

Merge "Fix ifunc_test for hwasan builds." am: 38558bad85

Change-Id: I72ac610eb8c46ad7194bf9da861c3144fa8c73fb

tests/ifunc_test.cpp

diff --git a/tests/ifunc_test.cpp b/tests/ifunc_test.cpp
index e69271f..e3c437e 100644
--- a/tests/ifunc_test.cpp
+++ b/tests/ifunc_test.cpp
@@ -44,7 +44,8 @@
 static uint64_t g_hwcap;
 static __ifunc_arg_t g_arg;
 
-extern "C" fn_ptr_t hwcap_resolver(uint64_t hwcap, __ifunc_arg_t* arg) {
+extern "C" fn_ptr_t hwcap_resolver(uint64_t hwcap, __ifunc_arg_t* arg)
+    __attribute__((no_sanitize("hwaddress"))) {
   g_hwcap = hwcap;
   g_arg = *arg;
   return ret42;