diff options
| author |  Jeff King <peff@peff.net> | 2019-03-12 17:06:26 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-03-13 13:45:52 +0900 |
| commit | 07a20f569b4b1690e717eaac0954007a8edfbfc2 (patch) | |
| tree | b8e3f56f320eaaba3f3e092869367a23263a3ee1 /sha1dc | |
| parent | mingw: allow building with an MSYS2 runtime v3.x (diff) | |
| download | tgif-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 'sha1dc')
| -rw-r--r-- | sha1dc/sha1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c index df0630bc6d..5931cf25d5 100644 --- a/sha1dc/sha1.c +++ b/sha1dc/sha1.c @@ -124,10 +124,11 @@ #endif /*ENDIANNESS SELECTION*/ +#ifndef SHA1DC_FORCE_ALIGNED_ACCESS #if defined(SHA1DC_FORCE_UNALIGNED_ACCESS) || defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR) #define SHA1DC_ALLOW_UNALIGNED_ACCESS -#endif /*UNALIGNMENT DETECTION*/ - +#endif /*UNALIGNED ACCESS DETECTION*/ +#endif /*FORCE ALIGNED ACCESS*/ #define rotate_right(x,n) (((x)>>(n))|((x)<<(32-(n)))) #define rotate_left(x,n) (((x)<<(n))|((x)>>(32-(n)))) |