summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2019-03-12 17:06:26 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-13 13:45:52 +0900
commit07a20f569b4b1690e717eaac0954007a8edfbfc2 (patch)
treeb8e3f56f320eaaba3f3e092869367a23263a3ee1 /git-mergetool.sh
parentmingw: allow building with an MSYS2 runtime v3.x (diff)
downloadtgif-07a20f569b4b1690e717eaac0954007a8edfbfc2.tar.xz
Makefile: fix unaligned loads in sha1dc with UBSan
The sha1dc library uses unaligned loads on platforms that support them. This is normally what you'd want for performance, but it does cause UBSan to complain when we compile with SANITIZE=undefined. Just like we set -DNO_UNALIGNED_LOADS for our own code in that case, we should set -DSHA1DC_FORCE_ALIGNED_ACCESS. Of course that does nothing without pulling in the patches from sha1dc to respect that define. So let's do that, too, updating both the submodule link and our in-tree copy (from the same commit). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions