summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-04-10 02:14:26 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-10 02:14:26 +0900
commitc063a537bedd3b2363494171de2bbd58bf5c66a9 (patch)
treec663a17181cefe23e619fc8de1f756ff4aeafc1e /Makefile
parentMerge branch 'jk/promote-ggg' (diff)
parentMakefile: fix unaligned loads in sha1dc with UBSan (diff)
downloadtgif-c063a537bedd3b2363494171de2bbd58bf5c66a9.tar.xz
Merge branch 'jk/sha1dc'
Build update for SHA-1 with collision detection. * jk/sha1dc: Makefile: fix unaligned loads in sha1dc with UBSan
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3e03290d8f..9398de8f6e 100644
--- 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