-OPT := -fwhole-program -combine -03 #-DNDEBUG
-CFLAGS := -g -Wall -Werror -std=c99 $(OPT) -m64 -DTEST_STRING_KEYS #-DNBD32 #-DENABLE_TRACE
-INCS := $(addprefix -I, include)
-TESTS := output/map_test1 output/map_test2 output/txn_test
-EXES := $(TESTS)
+CFLAGS0 := -g -Wall -Werror -std=c99 -lpthread
+CFLAGS1 := $(CFLAGS0) -O3 #-DNDEBUG #-DENABLE_TRACE #-fwhole-program -combine
+CFLAGS := $(CFLAGS1) -DUSE_SYSTEM_MALLOC #-DLIST_USE_HAZARD_POINTER #-DTEST_STRING_KEYS #-DNBD32
+INCS := $(addprefix -I, include)
+TESTS := output/rcu_test output/haz_test output/map_test2 output/map_test1 output/txn_test
+EXES := $(TESTS)