Skip to content

avoids a segfault when running ASAN, plus auto-clean if switching from asan=1 to no asan. #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bwlang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

avoids a segfault when running ASAN, plus auto-clean if switching from asan=1 to no asan. #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
Makefile.bak
minibwa
tmp
.build-cfg
16 changes: 14 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ ifneq ($(asan),)
override CFLAGS+=-fsanitize=address
override LDFLAGS+=-fsanitize=address
override LIBS+=-ldl
MALLOC_O= # mimalloc overrides malloc/free, as does ASan; linking both segfaults
endif

ifeq ($(omp),1)
Expand All @@ -39,13 +40,24 @@ ifeq ($(ARCH), x86_64)
endif

.SUFFIXES:.c .o
.PHONY:all clean depend
.PHONY:all clean depend FORCE

.c.o:
$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $< -o $@

all:$(PROG)

# Objects and the binary depend on the build configuration, so switching between e.g.
# asan=1 and a plain build recompiles instead of leaving instrumented objects in the
# archive -- ar replaces members by name, so a stale one survives and fails the link.
# mimalloc.o is left out: its rule does not use CFLAGS, so it is never instrumented.
BUILD_CFG= $(CC)|$(CFLAGS)|$(CPPFLAGS)|$(INCLUDES)|$(LDFLAGS)|$(LIBS)|$(MALLOC_O)

.build-cfg: FORCE
@echo '$(BUILD_CFG)' | cmp -s - $@ || echo '$(BUILD_CFG)' > $@

$(LOBJS) $(AOBJS) main.o $(PROG): .build-cfg

mimalloc.o:
$(CC) -c -std=gnu11 -O3 -Wall -Wextra -DNDEBUG -DMI_MALLOC_OVERRIDE -DMI_OSX_INTERPOSE=1 -DMI_OSX_ZONE=1 -Imimalloc mimalloc/static.c -o $@

Expand All @@ -56,7 +68,7 @@ minibwa:libminibwa.a $(MALLOC_O) $(AOBJS) main.o
$(CC) $(CFLAGS) $(LDFLAGS) $(MALLOC_O) $(AOBJS) main.o -o $@ -L. -lminibwa $(LIBS)

clean:
rm -fr *.o a.out $(PROG) *~ *.a *.dSYM
rm -fr *.o a.out $(PROG) *~ *.a *.dSYM .build-cfg

depend:
(LC_ALL=C; export LC_ALL; makedepend -Y -- $(CFLAGS) $(DFLAGS) -- *.c *.cpp)
Expand Down