From: weiyu <weiyuluo1232@gmail.com>
Date: Mon, 1 Jul 2019 18:59:13 +0000 (-0700)
Subject: resolve git conflict
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0bcdc6472ef63a9bd55a8e7bde3d103708e48078;p=c11tester.git

resolve git conflict
---

diff --git a/Makefile b/Makefile
index 214873ac..75639215 100644
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,8 @@ README.html: README.md
 malloc.o: malloc.c
 	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=1 $(CPPFLAGS) -Wno-unused-variable
 
-#futex.o: futex.cc
-#	$(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
+futex.o: futex.cc
+	$(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
 
 %.o : %.cc
 	$(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)