diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-04-09 20:14:26 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-09 20:14:26 +0300 |
commit | c063a537bedd3b2363494171de2bbd58bf5c66a9 (patch) | |
tree | c663a17181cefe23e619fc8de1f756ff4aeafc1e /Makefile | |
parent | 2d3372883f133ef64d3eb678e8e6bfc6ffc6169a (diff) | |
parent | 07a20f569b4b1690e717eaac0954007a8edfbfc2 (diff) |
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-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |