Merge

diff --cc mabain/src/Makefile
index 27ae5f57416fef284f6857e87b55b5679b3a55dd,93d39850441fc42ff1f2654c98a6fbb3e6c02a5f..058557ba9659cc6283a66509febfae0f0d68aaa5
--- 1/mabain/src/Makefile
--- 2/mabain/src/Makefile
+++ b/mabain/src/Makefile
@@@ -3,10 -3,10 +3,15 @@@ TARGET=libmabain.s
  
  all: $(TARGET)
  
++<<<<<<< HEAD
 +CFLAGS  = -Xclang -load -Xclang /scratch/llvm-project/build/lib/libCDSPass.so -I. -I.. -Iutil -Wall -Werror -c -Wwrite-strings -Wsign-compare -Wcast-align -Wformat-security -fdiagnostics-show-option
 +CFLAGS += -g -ggdb -fPIC -O2 -std=c++11
++=======
+ CFLAGS  = -Xclang -load -Xclang /scratch/llvm/build/lib/libCDSPass.so -I. -I.. -Iutil -Wall -Werror -c -Wwrite-strings -Wsign-compare -Wcast-align -Wformat-security -fdiagnostics-show-option
+ CFLAGS += -g -ggdb -fPIC -O1 -std=c++11
++>>>>>>> e6990e6549277f6415536f7584bda1b584e194b7
  CFLAGS += -D__SHM_LOCK__ -D__LOCK_FREE__ -D__SHM_QUEUE__
- LDFLAGS = -lpthread
+ LDFLAGS = -pthread
  
  SOURCES = $(wildcard *.cpp) $(wildcard util/*.cpp)
  HEADERS = $(wildcard *.h) $(wildcard util/*.h)