Merge branch 'js/get-short-oid-drop-cache'

diff --git a/Makefile b/Makefile
index 3e03290d8ff7e81a58e89d6b09e4ad5834af4510..9398de8f6e39f9e4e7bbbc2f37ea90d64de84acd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1198,6 +1198,7 @@ BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE)
 BASIC_CFLAGS += -fno-omit-frame-pointer
 ifneq ($(filter undefined,$(SANITIZERS)),)
 BASIC_CFLAGS += -DNO_UNALIGNED_LOADS
+BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS
 endif
 ifneq ($(filter leak,$(SANITIZERS)),)
 BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS