summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-10-04 19:49:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-10-04 19:49:06 (GMT)
commit86cca370e1989e0cbcd412f8770883a20d86eee8 (patch)
tree9fa4a26d69b3d30986b470b2482afb37a63080d0 /Makefile
parent94de88c986712e79c20813ba54e797c4ca83137b (diff)
parent176380fd113a97b09c99a5f7273725527823fa1b (diff)
downloadgit-86cca370e1989e0cbcd412f8770883a20d86eee8.zip
git-86cca370e1989e0cbcd412f8770883a20d86eee8.tar.gz
git-86cca370e1989e0cbcd412f8770883a20d86eee8.tar.bz2
Merge branch 'jk/drop-unaligned-loads'
Compilation fix around type punning. * jk/drop-unaligned-loads: Revert "fast-export: use local array to store anonymized oid" bswap.h: drop unaligned loads
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1b6bf14..fb521da 100644
--- a/Makefile
+++ b/Makefile
@@ -1232,7 +1232,6 @@ SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag))
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)),)