summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Oliver Stöneberg <oliverst@online.de>2014-12-30 15:17:16 +0100
committer Oliver Stöneberg <oliverst@online.de>2014-12-30 15:17:16 +0100
commitace2339469e356b27540517bf7ded2bb3ff11b7b (patch)
treedab406cc34e88b29952752495ffd5e9bd74febf1
parentc80ba44bbf0e02b0d636ccd2c0430812cf8970ba (diff)
small clarification on disabled UndefinedBehaviorSanitizer checks (nw)
-rw-r--r--makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/makefile b/makefile
index 91ba31f1372..24bdc2af6e3 100644
--- a/makefile
+++ b/makefile
@@ -599,7 +599,9 @@ endif
ifneq (,$(findstring undefined,$(SANITIZE)))
ifneq (,$(findstring clang,$(CC)))
# TODO: check if linker is clang++
-CCOMFLAGS += -fno-sanitize=alignment -fno-sanitize=function -fno-sanitize=shift -fno-sanitize=null -fno-sanitize=vptr -fno-sanitize=object-size
+CCOMFLAGS += -fno-sanitize=alignment -fno-sanitize=function -fno-sanitize=shift -fno-sanitize=vptr -fno-sanitize=object-size
+# clang takes forever to compile src/emu/video/psx.c when this isn't disabled
+CCOMFLAGS += -fno-sanitize=null
# clang takes forever to compile src/emu/cpu/tms57002/tms57002.c when this isn't disabled
CCOMFLAGS += -fno-sanitize=signed-integer-overflow
endif
@@ -911,7 +913,7 @@ $(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBBUS) $(LIBOP
$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
@echo Linking $@...
ifeq ($(TARGETOS),emscripten)
-# Emscripten's linker seems to be stricter about the ordering of .a files
+ # Emscripten's linker seems to be stricter about the ordering of .a files
$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) -Wl,--start-group $^ -Wl,--end-group $(LIBS) -o $@
else
$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@