update Makefile and fix compilation error for printf.o temporarily

diff --git a/Makefile b/Makefile
index f03c7ca621827e95e7344980e1624422f4bd09c1..e5fc14f78f9e97d0d2aa9c745e44e2ab6922b00f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ OBJECTS := libthreads.o schedule.o model.o threads.o librace.o action.o \
           datarace.o impatomic.o cmodelint.o \
           snapshot.o malloc.o mymemory.o common.o mutex.o conditionvariable.o \
           context.o execution.o libannotate.o plugins.o pthread.o futex.o fuzzer.o \
-          sleeps.o history.o funcnode.o printf.o
+          sleeps.o history.o funcnode.o funcinst.o printf.o
 
 CPPFLAGS += -Iinclude -I.
 LDFLAGS := -ldl -lrt -rdynamic
@@ -36,6 +36,9 @@ README.html: README.md
 malloc.o: malloc.c
        $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=1 $(CPPFLAGS) -Wno-unused-variable
 
+printf.o: printf.c
+       $(CC) -fPIC -c printf.c $(CPPFLAGS)
+
 futex.o: futex.cc
        $(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
 

diff --git a/classlist.h b/classlist.h
index 3aca3e11ceb086a65aef19bf2dec9caf05b90db4..d3d9d3d2c0f2389ae7214f9a0527585c06deb2a5 100644 (file)
--- a/classlist.h
+++ b/classlist.h
@@ -21,6 +21,7 @@ struct model_snapshot_members;
 struct bug_message;
 typedef SnapList<ModelAction *> action_list_t;
 typedef SnapList<uint32_t> func_id_list_t;
+typedef SnapList<FuncInst *> func_inst_list_t;
 
 extern volatile int forklock;
 #endif