From 8043ba186dc9d296624d975715938bc4341cc94d Mon Sep 17 00:00:00 2001 From: Vibhav Pant Date: Sun, 18 Dec 2022 20:25:55 +0530 Subject: [PATCH] Avoid build failure when building without -fsanitize=address. * src/lisp.h (UNALIGNED_LOAD_SIZE): Only use the sanitizer version of the macro when USE_SANITIZER_UNALIGNED_LOAD is defined, avoiding link errors when building without -fsanitize=address. --- src/lisp.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lisp.h b/src/lisp.h index f466d4b0da5..be511a0eb9c 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -5296,8 +5296,12 @@ __lsan_ignore_object (void const *p) } #endif +/* If built with USE_SANITIZER_UNALIGNED_LOAD defined, use compiler + provided ASan functions to perform unaligned loads, allowing ASan + to catch bugs which it might otherwise miss. */ #if defined HAVE_SANITIZER_COMMON_INTERFACE_DEFS_H \ - && defined ADDRESS_SANITIZER + && defined ADDRESS_SANITIZER \ + && defined USE_SANITIZER_UNALIGNED_LOAD # include # if (SIZE_MAX == UINT64_MAX) # define UNALIGNED_LOAD_SIZE(a, i) \