projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
31c401a
)
add futex.o as a recipe for libmodel
author
weiyu
<weiyuluo1232@gmail.com>
Wed, 29 May 2019 00:00:31 +0000
(17:00 -0700)
committer
weiyu
<weiyuluo1232@gmail.com>
Wed, 29 May 2019 00:00:31 +0000
(17:00 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index a7d2b5264c36c0fe7f5357ae82fd684995526f27..94109b4f3e3ec21d1e73c34d056468c508846832 100644
(file)
--- 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 \
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
CPPFLAGS += -Iinclude -I.
LDFLAGS := -ldl -lrt -rdynamic
@@
-32,10
+32,13
@@
docs: *.c *.cc *.h README.html
README.html: README.md
$(MARKDOWN) $< > $@
README.html: README.md
$(MARKDOWN) $< > $@
-
malloc.o: malloc.c
$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
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)
%.o : %.cc
$(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)
@@
-63,7
+66,7
@@
tags:
PHONY += tests
tests: $(LIB_SO)
PHONY += tests
tests: $(LIB_SO)
-
$(MAKE) -C $(TESTS_DIR)
+
#
$(MAKE) -C $(TESTS_DIR)
BENCH_DIR := benchmarks
BENCH_DIR := benchmarks