From: weiyu Date: Wed, 29 May 2019 00:00:31 +0000 (-0700) Subject: add futex.o as a recipe for libmodel X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dfa2740b54c86410b60f0df52fc279ef75fd870f;p=c11tester.git add futex.o as a recipe for libmodel --- diff --git a/Makefile b/Makefile index a7d2b526..94109b4f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ OBJECTS := libthreads.o schedule.o model.o threads.o librace.o action.o \ nodestack.o clockvector.o main.o snapshot-interface.o cyclegraph.o \ datarace.o impatomic.o cmodelint.o \ snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o \ - context.o execution.o libannotate.o pthread.o + context.o execution.o libannotate.o pthread.o futex.o CPPFLAGS += -Iinclude -I. LDFLAGS := -ldl -lrt -rdynamic @@ -32,10 +32,13 @@ docs: *.c *.cc *.h README.html README.html: README.md $(MARKDOWN) $< > $@ - malloc.o: malloc.c $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable +futex.o: futex.cc + $(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS) + + %.o : %.cc $(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS) @@ -63,7 +66,7 @@ tags: PHONY += tests tests: $(LIB_SO) - $(MAKE) -C $(TESTS_DIR) +# $(MAKE) -C $(TESTS_DIR) BENCH_DIR := benchmarks