summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-09 17:14:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-09 17:14:26 (GMT)
commitc063a537bedd3b2363494171de2bbd58bf5c66a9 (patch)
treec663a17181cefe23e619fc8de1f756ff4aeafc1e /Makefile
parent2d3372883f133ef64d3eb678e8e6bfc6ffc6169a (diff)
parent07a20f569b4b1690e717eaac0954007a8edfbfc2 (diff)
downloadgit-c063a537bedd3b2363494171de2bbd58bf5c66a9.zip
git-c063a537bedd3b2363494171de2bbd58bf5c66a9.tar.gz
git-c063a537bedd3b2363494171de2bbd58bf5c66a9.tar.bz2
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 3e03290..9398de8 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