resolve git conflict

diff --git a/Makefile b/Makefile
index 214873ac0e0a7edacade3df693bbdc94193675c1..7563921591961f81353e361a2dbd433d0514c44b 100644 (file)
--- 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)