From: Brian Demsky <bdemsky@uci.edu>
Date: Fri, 28 Jun 2019 02:36:21 +0000 (-0700)
Subject: fix compile
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=87ab9a23fb4a61d10a07912c2e49500bef916531;p=c11concurrency-benchmarks.git

fix compile
---

diff --git a/g++ b/g++
new file mode 100755
index 0000000..ae69a47
--- /dev/null
+++ b/g++
@@ -0,0 +1,3 @@
+#/bin/bash
+
+/usr/local/bin/clang++ -Xclang -load -Xclang /scratch/llvm-project/build/lib/libCDSPass.so -L/scratch/fuzzer/random-fuzzer -lmodel -Wno-unused-command-line-argument -Wno-address-of-packed-member -Wno-mismatched-tags -Wno-unused-private-field -Wno-constant-conversion -Wno-null-dereference $@
\ No newline at end of file
diff --git a/gcc b/gcc
new file mode 100755
index 0000000..d18ecea
--- /dev/null
+++ b/gcc
@@ -0,0 +1,3 @@
+#/bin/bash
+
+/usr/local/bin/clang -Xclang -load -Xclang /scratch/llvm-project/build/lib/libCDSPass.so -Wno-unused-command-line-argument $@
\ No newline at end of file
diff --git a/silo/Makefile b/silo/Makefile
index 682b4cb..0c0f04f 100644
--- a/silo/Makefile
+++ b/silo/Makefile
@@ -75,7 +75,7 @@ else
 	$(error invalid mode)
 endif
 
-CXXFLAGS := -g -Wall -std=c++0x
+CXXFLAGS := -g -std=c++0x
 CXXFLAGS += -MD -Ithird-party/lz4 -DCONFIG_H=\"$(CONFIG_H)\"
 ifeq ($(DEBUG_S),1)
         CXXFLAGS += -fno-omit-frame-pointer -DDEBUG
@@ -249,13 +249,13 @@ ifneq ($(DEPFILES),)
 -include $(DEPFILES)
 endif
 
-ifeq ($(wildcard masstree/GNUmakefile.in),)
-INSTALL_MASSTREE := $(shell git submodule init; git submodule update)
-endif
+#ifeq ($(wildcard masstree/GNUmakefile.in),)
+#INSTALL_MASSTREE := $(shell git submodule init; git submodule update)
+#endif
 
-ifeq ($(MASSTREE_S),1)
-UPDATE_MASSTREE := $(shell cd ./`git rev-parse --show-cdup` && cur=`git submodule status --cached masstree | head -c 41 | tail -c +2` && if test -z `cd masstree; git rev-list -n1 $$cur^..HEAD 2>/dev/null`; then (echo Updating masstree... 1>&2; cd masstree; git checkout -f master >/dev/null; git pull; cd ..; git submodule update masstree); fi)
-endif
+#ifeq ($(MASSTREE_S),1)
+#UPDATE_MASSTREE := $(shell cd ./`git rev-parse --show-cdup` && cur=`git submodule status --cached masstree | head -c 41 | tail -c +2` && if test -z `cd masstree; git rev-list -n1 $$cur^..HEAD 2>/dev/null`; then (echo Updating masstree... 1>&2; cd masstree; git checkout -f master >/dev/null; git pull; cd ..; git submodule update masstree); fi)
+#endif
 
 ifneq ($(strip $(DEBUG_S).$(CHECK_INVARIANTS_S).$(EVENT_COUNTERS_S)),$(strip $(DEP_MAIN_CONFIG)))
 DEP_MAIN_CONFIG := $(shell mkdir -p $(O); echo >$(O)/buildstamp; echo "DEP_MAIN_CONFIG:=$(DEBUG_S).$(CHECK_INVARIANTS_S).$(EVENT_COUNTERS_S)" >$(O)/_main_config.d)
diff --git a/silo/benchmarks/bench.cc b/silo/benchmarks/bench.cc
index a1c12bb..cfd4f1b 100644
--- a/silo/benchmarks/bench.cc
+++ b/silo/benchmarks/bench.cc
@@ -340,7 +340,8 @@ bench_runner::run()
     cerr << "avg_persist_latency: " << avg_persist_latency_ms << " ms" << endl;
     cerr << "agg_abort_rate: " << agg_abort_rate << " aborts/sec" << endl;
     cerr << "avg_per_core_abort_rate: " << avg_per_core_abort_rate << " aborts/sec/core" << endl;
-    cerr << "txn breakdown: " << format_list(agg_txn_counts.begin(), agg_txn_counts.end()) << endl;
+    //BD next line doesn't compile
+    //    cerr << "txn breakdown: " << format_list(agg_txn_counts.begin(), agg_txn_counts.end()) << endl;
     cerr << "--- system counters (for benchmark) ---" << endl;
     for (map<string, counter_data>::iterator it = ctrs.begin();
          it != ctrs.end(); ++it)
diff --git a/silo/benchmarks/dbtest.cc b/silo/benchmarks/dbtest.cc
index 0605654..b142171 100644
--- a/silo/benchmarks/dbtest.cc
+++ b/silo/benchmarks/dbtest.cc
@@ -396,12 +396,12 @@ main(int argc, char **argv)
   }
 
   vector<string> bench_toks = split_ws(bench_opts);
-  int argc = 1 + bench_toks.size();
-  char *argv[argc];
-  argv[0] = (char *) bench_type.c_str();
+  int argc2 = 1 + bench_toks.size();
+  char *argv2[argc];
+  argv2[0] = (char *) bench_type.c_str();
   for (size_t i = 1; i <= bench_toks.size(); i++)
-    argv[i] = (char *) bench_toks[i - 1].c_str();
-  test_fn(db, argc, argv);
+    argv2[i] = (char *) bench_toks[i - 1].c_str();
+  test_fn(db, argc2, argv2);
   delete db;
   return 0;
 }
diff --git a/silo/masstree/GNUmakefile b/silo/masstree/GNUmakefile
index d6cd8b6..f9bf795 100644
--- a/silo/masstree/GNUmakefile
+++ b/silo/masstree/GNUmakefile
@@ -1,7 +1,7 @@
 AR = ar
 CC = gcc
-CXX = g++ -std=gnu++0x
-CFLAGS = -g -W -Wall -O3
+CXX = g++
+CFLAGS = -g -O3
 DEPSDIR := .deps
 DEPCFLAGS = -MD -MF $(DEPSDIR)/$*.d -MP
 ifeq ($(strip $(MEMMGR)), )
@@ -73,7 +73,7 @@ configure config.h.in: configure.ac
 	touch config.h.in
 
 config.status: configure
-	./configure  '--enable-max-key-len=1024' '--disable-assertions' '--enable-invariants' '--enable-preconditions' '--with-malloc=jemalloc'
+	./configure  '--enable-max-key-len=1024' '--disable-assertions' '--disable-invariants' '--disable-preconditions' '--with-malloc=jemalloc'
 
 $(DEPSDIR)/stamp:
 	mkdir -p $(DEPSDIR)
diff --git a/silo/masstree/GNUmakefile.in b/silo/masstree/GNUmakefile.in
index e1d37db..1be3b1a 100644
--- a/silo/masstree/GNUmakefile.in
+++ b/silo/masstree/GNUmakefile.in
@@ -1,7 +1,7 @@
 AR = ar
 CC = @CC@
 CXX = @CXX@
-CFLAGS = -g -W -Wall -O3
+CFLAGS = -g -O3
 DEPSDIR := .deps
 DEPCFLAGS = -MD -MF $(DEPSDIR)/$*.d -MP
 ifeq ($(strip $(MEMMGR)), )
diff --git a/silo/masstree/_masstree_config.d b/silo/masstree/_masstree_config.d
index 49ea7f1..6dc6e23 100644
--- a/silo/masstree/_masstree_config.d
+++ b/silo/masstree/_masstree_config.d
@@ -1 +1 @@
-DEP_MASSTREE_CONFIG:=--enable-max-key-len=1024 --disable-assertions --enable-invariants --enable-preconditions --with-malloc=jemalloc
+DEP_MASSTREE_CONFIG:=--enable-max-key-len=1024 --disable-assertions --disable-invariants --disable-preconditions --with-malloc=jemalloc
diff --git a/silo/masstree/config.h b/silo/masstree/config.h
index 8acdb66..f97eaa8 100644
--- a/silo/masstree/config.h
+++ b/silo/masstree/config.h
@@ -14,10 +14,10 @@
 /* #undef ENABLE_ASSERTIONS */
 
 /* Define to enable invariant assertions. */
-#define ENABLE_INVARIANTS 1
+#define ENABLE_INVARIANTS 0
 
 /* Define to enable precondition assertions. */
-#define ENABLE_PRECONDITIONS 1
+#define ENABLE_PRECONDITIONS 0
 
 /* Define to 1 if you have the `clock_gettime' function. */
 #define HAVE_CLOCK_GETTIME 1
diff --git a/silo/masstree/config.log b/silo/masstree/config.log
index db63de7..95c3116 100644
--- a/silo/masstree/config.log
+++ b/silo/masstree/config.log
@@ -4,17 +4,17 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by masstree-beta configure 0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure --enable-max-key-len=1024 --disable-assertions --enable-invariants --enable-preconditions --with-malloc=jemalloc
+  $ ./configure --enable-max-key-len=1024 --disable-assertions --disable-invariants --disable-preconditions --with-malloc=jemalloc
 
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 
-hostname = dw-10
+hostname = dw-6
 uname -m = x86_64
-uname -r = 4.4.0-119-generic
+uname -r = 4.18.0-18-generic
 uname -s = Linux
-uname -v = #143-Ubuntu SMP Mon Apr 2 16:08:24 UTC 2018
+uname -v = #19~18.04.1-Ubuntu SMP Fri Apr 5 10:22:13 UTC 2019
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -27,8 +27,8 @@ uname -v = #143-Ubuntu SMP Mon Apr 2 16:08:24 UTC 2018
 /usr/bin/oslevel       = unknown
 /bin/universe          = unknown
 
-PATH: /scratch/build/bin
-PATH: /home/ahmad/bin
+PATH: /scratch/fuzzer/benchmark-fuzzying-tool/
+PATH: /usr/local/jdk1.5.0_06/bin
 PATH: /usr/local/sbin
 PATH: /usr/local/bin
 PATH: /usr/sbin
@@ -38,11 +38,6 @@ PATH: /bin
 PATH: /usr/games
 PATH: /usr/local/games
 PATH: /snap/bin
-PATH: /usr/lib/jvm/java-8-oracle/bin
-PATH: /usr/lib/jvm/java-8-oracle/db/bin
-PATH: /usr/lib/jvm/java-8-oracle/jre/bin
-PATH: /usr/lib/go/bin
-PATH: /home/ahmad/go/bin
 
 
 ## ----------- ##
@@ -50,34 +45,35 @@ PATH: /home/ahmad/go/bin
 ## ----------- ##
 
 configure:2507: checking for gcc
-configure:2523: found /usr/bin/gcc
+configure:2523: found /scratch/fuzzer/benchmark-fuzzying-tool//gcc
 configure:2534: result: gcc
 configure:2763: checking for C compiler version
 configure:2772: gcc --version >&5
-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.11) 5.4.0 20160609
-Copyright (C) 2015 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
+clang version 8.0.0 
+Target: x86_64-unknown-linux-gnu
+Thread model: posix
+InstalledDir: /usr/local/bin
 configure:2783: $? = 0
 configure:2772: gcc -v >&5
-Using built-in specs.
-COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.11' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
+clang version 8.0.0 
+Target: x86_64-unknown-linux-gnu
 Thread model: posix
-gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.11) 
+InstalledDir: /usr/local/bin
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/5
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/5.5.0
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/6
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/6.5.0
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/7
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/7.4.0
+... rest of stderr output deleted ...
 configure:2783: $? = 0
 configure:2772: gcc -V >&5
-gcc: error: unrecognized command line option '-V'
-gcc: fatal error: no input files
-compilation terminated.
+clang-8: error: argument to '-V' is missing (expected 1 value)
+clang-8: error: no input files
 configure:2783: $? = 1
 configure:2772: gcc -qversion >&5
-gcc: error: unrecognized command line option '-qversion'
-gcc: fatal error: no input files
-compilation terminated.
+clang-8: error: unknown argument '-qversion', did you mean '--version'?
+clang-8: error: no input files
 configure:2783: $? = 1
 configure:2803: checking whether the C compiler works
 configure:2825: gcc    conftest.c  >&5
@@ -109,37 +105,37 @@ configure:3094: $? = 0
 configure:3135: result: yes
 configure:3152: checking for gcc option to accept ISO C89
 configure:3215: gcc  -c -g -O2  conftest.c >&5
+main replaced by user_main
 configure:3215: $? = 0
 configure:3228: result: none needed
 configure:3306: checking for g++
-configure:3322: found /usr/bin/g++
+configure:3322: found /scratch/fuzzer/benchmark-fuzzying-tool//g++
 configure:3333: result: g++
 configure:3360: checking for C++ compiler version
 configure:3369: g++ --version >&5
-g++ (Ubuntu 5.4.0-6ubuntu1~16.04.11) 5.4.0 20160609
-Copyright (C) 2015 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
+clang version 8.0.0 
+Target: x86_64-unknown-linux-gnu
+Thread model: posix
+InstalledDir: /usr/local/bin
 configure:3380: $? = 0
 configure:3369: g++ -v >&5
-Using built-in specs.
-COLLECT_GCC=g++
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.11' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
+clang version 8.0.0 
+Target: x86_64-unknown-linux-gnu
 Thread model: posix
-gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.11) 
-configure:3380: $? = 0
+InstalledDir: /usr/local/bin
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/5
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/5.5.0
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/6
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/6.5.0
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/7
+Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/7.4.0
+... rest of stderr output deleted ...
+configure:3380: $? = 1
 configure:3369: g++ -V >&5
-g++: error: unrecognized command line option '-V'
-g++: fatal error: no input files
-compilation terminated.
+clang-8: error: argument to '-V' is missing (expected 1 value)
 configure:3380: $? = 1
 configure:3369: g++ -qversion >&5
-g++: error: unrecognized command line option '-qversion'
-g++: fatal error: no input files
-compilation terminated.
+clang-8: error: unknown argument '-qversion', did you mean '--version'?
 configure:3380: $? = 1
 configure:3384: checking whether we are using the GNU C++ compiler
 configure:3403: g++ -c   conftest.cpp >&5
@@ -153,8 +149,10 @@ configure:3521: checking how to run the C++ preprocessor
 configure:3548: g++ -E  conftest.cpp
 configure:3548: $? = 0
 configure:3562: g++ -E  conftest.cpp
-conftest.cpp:10:28: fatal error: ac_nonexistent.h: No such file or directory
-compilation terminated.
+conftest.cpp:10:10: fatal error: 'ac_nonexistent.h' file not found
+#include <ac_nonexistent.h>
+         ^~~~~~~~~~~~~~~~~~
+1 error generated.
 configure:3562: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -171,8 +169,10 @@ configure:3587: result: g++ -E
 configure:3607: g++ -E  conftest.cpp
 configure:3607: $? = 0
 configure:3621: g++ -E  conftest.cpp
-conftest.cpp:10:28: fatal error: ac_nonexistent.h: No such file or directory
-compilation terminated.
+conftest.cpp:10:10: fatal error: 'ac_nonexistent.h' file not found
+#include <ac_nonexistent.h>
+         ^~~~~~~~~~~~~~~~~~
+1 error generated.
 configure:3621: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -191,8 +191,10 @@ configure:3713: checking for egrep
 configure:3775: result: /bin/grep -E
 configure:3780: checking for ANSI C header files
 configure:3800: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:3800: $? = 0
 configure:3873: g++ -o conftest -g -O2   conftest.cpp  >&5
+main replaced by user_main
 configure:3873: $? = 0
 configure:3873: ./conftest
 configure:3873: $? = 0
@@ -235,9 +237,10 @@ configure:3897: $? = 0
 configure:3897: result: yes
 configure:3909: checking whether byte ordering is bigendian
 configure:3924: g++ -c -g -O2  conftest.cpp >&5
-conftest.cpp:21:9: error: expected unqualified-id before 'not' token
-         not a universal capable compiler
-         ^
+conftest.cpp:21:9: error: expected unqualified-id
+               not a universal capable compiler
+               ^
+1 error generated.
 configure:3924: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -265,12 +268,20 @@ configure: failed program was:
 | 	     typedef int dummy;
 | 
 configure:3969: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:3969: $? = 0
 configure:3987: g++ -c -g -O2  conftest.cpp >&5
-conftest.cpp: In function 'int main()':
-conftest.cpp:27:8: error: 'big' was not declared in this scope
-    not big endian
-        ^
+conftest.cpp:27:11: error: expected ';' after expression
+                 not big endian
+                        ^
+                        ;
+conftest.cpp:27:8: error: use of undeclared identifier 'big'
+                 not big endian
+                     ^
+conftest.cpp:27:12: error: use of undeclared identifier 'endian'
+                 not big endian
+                         ^
+3 errors generated.
 configure:3987: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -328,9 +339,10 @@ configure:4137: checking for numa.h
 configure:4137: result: yes
 configure:4148: checking for library containing numa_available
 configure:4179: g++ -o conftest -g -O2   conftest.cpp  >&5
-/tmp/cckSsuNW.o: In function `main':
-/home/ahmad/benchmark-fuzzying-tool/silo/masstree/conftest.cpp:33: undefined reference to `numa_available'
-collect2: error: ld returned 1 exit status
+main replaced by user_main
+/tmp/conftest-3b6c40.o: In function `user_main':
+/scratch/fuzzer/benchmark-fuzzying-tool/silo/masstree/conftest.cpp:33: undefined reference to `numa_available'
+clang-8: error: linker command failed with exit code 1 (use -v to see invocation)
 configure:4179: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -370,195 +382,185 @@ configure: failed program was:
 |   return 0;
 | }
 configure:4179: g++ -o conftest -g -O2   conftest.cpp -lnuma   >&5
+main replaced by user_main
 configure:4179: $? = 0
 configure:4196: result: -lnuma
 configure:4212: checking for __builtin_clz builtin
 configure:4228: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4228: $? = 0
 configure:4236: result: yes
 configure:4246: checking for __builtin_clzl builtin
 configure:4262: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4262: $? = 0
 configure:4270: result: yes
 configure:4280: checking for __builtin_clzll builtin
 configure:4296: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4296: $? = 0
 configure:4304: result: yes
 configure:4314: checking for __builtin_ctz builtin
 configure:4330: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4330: $? = 0
 configure:4338: result: yes
 configure:4348: checking for __builtin_ctzl builtin
 configure:4364: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4364: $? = 0
 configure:4372: result: yes
 configure:4382: checking for __builtin_ctzll builtin
 configure:4398: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4398: $? = 0
 configure:4406: result: yes
 configure:4416: checking for __sync_synchronize builtin
 configure:4433: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4433: $? = 0
 configure:4441: result: yes
 configure:4451: checking for __sync_fetch_and_add builtin
 configure:4467: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4467: $? = 0
 configure:4475: result: yes
 configure:4485: checking for __sync_add_and_fetch builtin
 configure:4501: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4501: $? = 0
 configure:4509: result: yes
 configure:4519: checking for __sync_fetch_and_add_8 builtin
 configure:4536: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4536: $? = 0
 configure:4544: result: yes
 configure:4554: checking for __sync_add_and_fetch_8 builtin
 configure:4571: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4571: $? = 0
 configure:4579: result: yes
 configure:4589: checking for __sync_fetch_and_or builtin
 configure:4605: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4605: $? = 0
 configure:4613: result: yes
 configure:4623: checking for __sync_or_and_fetch builtin
 configure:4639: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4639: $? = 0
 configure:4647: result: yes
 configure:4657: checking for __sync_fetch_and_or_8 builtin
 configure:4674: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4674: $? = 0
 configure:4682: result: yes
 configure:4692: checking for __sync_or_and_fetch_8 builtin
 configure:4709: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4709: $? = 0
 configure:4717: result: yes
 configure:4727: checking for __sync_bool_compare_and_swap builtin
 configure:4743: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4743: $? = 0
 configure:4751: result: yes
 configure:4761: checking for __sync_bool_compare_and_swap_8 builtin
 configure:4778: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4778: $? = 0
 configure:4786: result: yes
 configure:4796: checking for __sync_val_compare_and_swap builtin
 configure:4812: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4812: $? = 0
 configure:4820: result: yes
 configure:4830: checking for __sync_val_compare_and_swap_8 builtin
 configure:4847: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4847: $? = 0
 configure:4855: result: yes
 configure:4865: checking for __sync_lock_test_and_set builtin
 configure:4881: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4881: $? = 0
 configure:4889: result: yes
 configure:4899: checking for __sync_lock_test_and_set_val builtin
 configure:4915: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4915: $? = 0
 configure:4923: result: yes
 configure:4933: checking for __sync_lock_release_set builtin
 configure:4949: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:4949: $? = 0
 configure:4957: result: yes
 configure:4968: checking whether the C++ compiler understands 'auto'
 configure:4985: g++ -c -g -O2  conftest.cpp >&5
-conftest.cpp: In function 'int f(s)':
-conftest.cpp:45:41: error: ISO C++ forbids declaration of 'y' with no type [-fpermissive]
- struct s { int a; }; int f(s x) { auto &y = x; return y.a; }
-                                         ^
-conftest.cpp:45:45: error: invalid initialization of reference of type 'int&' from expression of type 's'
- struct s { int a; }; int f(s x) { auto &y = x; return y.a; }
-                                             ^
-conftest.cpp:45:57: error: request for member 'a' in 'y', which is of non-class type 'int'
- struct s { int a; }; int f(s x) { auto &y = x; return y.a; }
-                                                         ^
-configure:4985: $? = 1
-configure: failed program was:
-| /* confdefs.h */
-| #define PACKAGE_NAME "masstree-beta"
-| #define PACKAGE_TARNAME "masstree-beta"
-| #define PACKAGE_VERSION "0.1"
-| #define PACKAGE_STRING "masstree-beta 0.1"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE_URL ""
-| #define WORDS_BIGENDIAN_SET 1
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_SYS_EPOLL_H 1
-| #define HAVE_NUMA_H 1
-| #define HAVE_LIBNUMA 1
-| #define HAVE___BUILTIN_CLZ 1
-| #define HAVE___BUILTIN_CLZL 1
-| #define HAVE___BUILTIN_CLZLL 1
-| #define HAVE___BUILTIN_CTZ 1
-| #define HAVE___BUILTIN_CTZL 1
-| #define HAVE___BUILTIN_CTZLL 1
-| #define HAVE___SYNC_SYNCHRONIZE 1
-| #define HAVE___SYNC_FETCH_AND_ADD 1
-| #define HAVE___SYNC_ADD_AND_FETCH 1
-| #define HAVE___SYNC_FETCH_AND_ADD_8 1
-| #define HAVE___SYNC_ADD_AND_FETCH_8 1
-| #define HAVE___SYNC_FETCH_AND_OR 1
-| #define HAVE___SYNC_OR_AND_FETCH 1
-| #define HAVE___SYNC_FETCH_AND_OR_8 1
-| #define HAVE___SYNC_OR_AND_FETCH_8 1
-| #define HAVE___SYNC_BOOL_COMPARE_AND_SWAP 1
-| #define HAVE___SYNC_BOOL_COMPARE_AND_SWAP_8 1
-| #define HAVE___SYNC_VAL_COMPARE_AND_SWAP 1
-| #define HAVE___SYNC_VAL_COMPARE_AND_SWAP_8 1
-| #define HAVE___SYNC_LOCK_TEST_AND_SET 1
-| #define HAVE___SYNC_LOCK_TEST_AND_SET_VAL 1
-| #define HAVE___SYNC_LOCK_RELEASE_SET 1
-| /* end confdefs.h.  */
-| struct s { int a; }; int f(s x) { auto &y = x; return y.a; }
-| int
-| main ()
-| {
-| 
-|   ;
-|   return 0;
-| }
-configure:4992: result: no
-configure:4996: checking whether the C++ compiler with -std=gnu++0x understands 'auto'
-configure:5009: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-configure:5009: $? = 0
-configure:5015: result: yes
+main replaced by user_main
+configure:4985: $? = 0
+configure:4992: result: yes
 configure:5033: checking whether the C++ compiler understands constexpr
-configure:5050: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5050: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:5050: $? = 0
 configure:5057: result: yes
 configure:5065: checking whether the C++ compiler understands static_assert
-configure:5082: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5082: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:5082: $? = 0
 configure:5089: result: yes
 configure:5097: checking whether the C++ compiler understands rvalue references
-configure:5114: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5114: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:5114: $? = 0
 configure:5121: result: yes
 configure:5129: checking whether the C++ compiler understands template alias
-configure:5146: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5146: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:5146: $? = 0
 configure:5153: result: yes
 configure:5163: checking type_traits usability
-configure:5163: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5163: g++ -c -g -O2  conftest.cpp >&5
 configure:5163: $? = 0
 configure:5163: result: yes
 configure:5163: checking type_traits presence
 configure:5163: g++ -E  conftest.cpp
-In file included from /usr/include/c++/5/type_traits:35:0,
-                 from conftest.cpp:50:
-/usr/include/c++/5/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support must be enabled with the -std=c++11 or -std=gnu++11 compiler options.
- #error This file requires compiler and library support \
-  ^
-configure:5163: $? = 1
+configure:5163: $? = 0
+configure:5163: result: yes
+configure:5163: checking for type_traits
+configure:5163: result: yes
+configure:5174: checking for std::hash
+configure:5192: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
+configure:5192: $? = 0
+configure:5199: result: yes
+configure:5207: checking for __has_trivial_copy
+configure:5224: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
+configure:5224: $? = 0
+configure:5231: result: yes
+configure:5240: checking for std::move
+configure:5253: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
+configure:5253: $? = 0
+configure:5259: result: yes
+configure:5271: checking for std::is_trivially_copyable
+configure:5288: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
+configure:5288: $? = 0
+configure:5295: result: yes
+configure:5303: checking for std::is_rvalue_reference
+configure:5320: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
+configure:5320: $? = 0
+configure:5327: result: yes
+configure:5337: checking for malloc in -lflow
+configure:5362: g++ -o conftest -g -O2   conftest.cpp -lflow  -lnuma  >&5
+main replaced by user_main
+/usr/bin/ld: cannot find -lflow
+clang-8: error: linker command failed with exit code 1 (use -v to see invocation)
+configure:5362: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "masstree-beta"
@@ -608,38 +610,39 @@ configure: failed program was:
 | #define HAVE_CXX_STATIC_ASSERT 1
 | #define HAVE_CXX_RVALUE_REFERENCES 1
 | #define HAVE_CXX_TEMPLATE_ALIAS 1
+| #define HAVE_TYPE_TRAITS 1
+| #define HAVE_STD_HASH 1
+| #define HAVE___HAS_TRIVIAL_COPY 1
+| #define HAVE_STD_IS_TRIVIALLY_COPYABLE 1
+| #define HAVE_STD_IS_RVALUE_REFERENCE 1
 | /* end confdefs.h.  */
-| #include <type_traits>
-configure:5163: result: no
-configure:5163: WARNING: type_traits: accepted by the compiler, rejected by the preprocessor!
-configure:5163: WARNING: type_traits: proceeding with the compiler's result
-configure:5163: checking for type_traits
-configure:5163: result: yes
-configure:5174: checking for std::hash
-configure:5192: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-configure:5192: $? = 0
-configure:5199: result: yes
-configure:5207: checking for __has_trivial_copy
-configure:5224: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-configure:5224: $? = 0
-configure:5231: result: yes
-configure:5240: checking for std::move
-configure:5253: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-configure:5253: $? = 0
-configure:5259: result: yes
-configure:5271: checking for std::is_trivially_copyable
-configure:5288: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-configure:5288: $? = 0
-configure:5295: result: yes
-configure:5303: checking for std::is_rvalue_reference
-configure:5320: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-configure:5320: $? = 0
-configure:5327: result: yes
-configure:5337: checking for malloc in -lflow
-configure:5362: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -lflow  -lnuma  >&5
-/usr/bin/ld: cannot find -lflow
-collect2: error: ld returned 1 exit status
-configure:5362: $? = 1
+| 
+| /* Override any GCC internal prototype to avoid an error.
+|    Use char because int might match the return type of a GCC
+|    builtin and then its argument prototype would still apply.  */
+| #ifdef __cplusplus
+| extern "C"
+| #endif
+| char malloc ();
+| int
+| main ()
+| {
+| return malloc ();
+|   ;
+|   return 0;
+| }
+configure:5371: result: no
+configure:5379: checking for mallctl in -ljemalloc
+configure:5404: g++ -o conftest -g -O2   conftest.cpp -ljemalloc  -lnuma  >&5
+main replaced by user_main
+configure:5404: $? = 0
+configure:5413: result: yes
+configure:5421: checking for tc_malloc in -ltcmalloc_minimal
+configure:5446: g++ -o conftest -g -O2   conftest.cpp -ltcmalloc_minimal  -lnuma  >&5
+main replaced by user_main
+/usr/bin/ld: cannot find -ltcmalloc_minimal
+clang-8: error: linker command failed with exit code 1 (use -v to see invocation)
+configure:5446: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "masstree-beta"
@@ -702,27 +705,20 @@ configure: failed program was:
 | #ifdef __cplusplus
 | extern "C"
 | #endif
-| char malloc ();
+| char tc_malloc ();
 | int
 | main ()
 | {
-| return malloc ();
+| return tc_malloc ();
 |   ;
 |   return 0;
 | }
-configure:5371: result: no
-configure:5379: checking for mallctl in -ljemalloc
-configure:5404: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -ljemalloc  -lnuma  >&5
-configure:5404: $? = 0
-configure:5413: result: yes
-configure:5421: checking for tc_malloc in -ltcmalloc_minimal
-configure:5446: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -ltcmalloc_minimal  -lnuma  >&5
-configure:5446: $? = 0
-configure:5455: result: yes
+configure:5455: result: no
 configure:5463: checking for _Z16getMainHoardHeapv in -lhoard
-configure:5488: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -lhoard  -lnuma  >&5
+configure:5488: g++ -o conftest -g -O2   conftest.cpp -lhoard  -lnuma  >&5
+main replaced by user_main
 /usr/bin/ld: cannot find -lhoard
-collect2: error: ld returned 1 exit status
+clang-8: error: linker command failed with exit code 1 (use -v to see invocation)
 configure:5488: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -798,14 +794,14 @@ configure:5497: result: no
 configure:5537: checking for malloc library
 configure:5551: result: -ljemalloc
 configure:5580: checking whether off_t and long are the same type
-configure:5597: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-conftest.cpp: In function 'int f(long int)':
-conftest.cpp:57:30: error: redefinition of 'int f(long int)'
- int f(off_t) {return 0;} int f(long) {return 0;}
-                              ^
-conftest.cpp:57:5: note: 'int f(off_t)' previously defined here
- int f(off_t) {return 0;} int f(long) {return 0;}
-     ^
+configure:5597: g++ -c -g -O2  conftest.cpp >&5
+conftest.cpp:57:30: error: redefinition of 'f'
+int f(off_t) {return 0;} int f(long) {return 0;}
+                             ^
+conftest.cpp:57:5: note: previous definition is here
+int f(off_t) {return 0;} int f(long) {return 0;}
+    ^
+1 error generated.
 configure:5597: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -874,18 +870,19 @@ configure: failed program was:
 | }
 configure:5604: result: yes
 configure:5615: checking whether off_t and long long are the same type
-configure:5632: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5632: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:5632: $? = 0
 configure:5639: result: no
 configure:5650: checking whether int64_t and long are the same type
-configure:5667: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-conftest.cpp: In function 'int f(long int)':
-conftest.cpp:58:32: error: redefinition of 'int f(long int)'
- int f(int64_t) {return 0;} int f(long) {return 0;}
-                                ^
-conftest.cpp:58:5: note: 'int f(int64_t)' previously defined here
- int f(int64_t) {return 0;} int f(long) {return 0;}
-     ^
+configure:5667: g++ -c -g -O2  conftest.cpp >&5
+conftest.cpp:58:32: error: redefinition of 'f'
+int f(int64_t) {return 0;} int f(long) {return 0;}
+                               ^
+conftest.cpp:58:5: note: previous definition is here
+int f(int64_t) {return 0;} int f(long) {return 0;}
+    ^
+1 error generated.
 configure:5667: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -955,22 +952,24 @@ configure: failed program was:
 | }
 configure:5674: result: yes
 configure:5685: checking whether int64_t and long long are the same type
-configure:5702: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5702: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:5702: $? = 0
 configure:5709: result: no
 configure:5720: checking whether size_t and unsigned are the same type
-configure:5737: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5737: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:5737: $? = 0
 configure:5744: result: no
 configure:5755: checking whether size_t and unsigned long are the same type
-configure:5772: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-conftest.cpp: In function 'int f(long unsigned int)':
-conftest.cpp:59:31: error: redefinition of 'int f(long unsigned int)'
- int f(size_t) {return 0;} int f(unsigned long) {return 0;}
-                               ^
-conftest.cpp:59:5: note: 'int f(size_t)' previously defined here
- int f(size_t) {return 0;} int f(unsigned long) {return 0;}
-     ^
+configure:5772: g++ -c -g -O2  conftest.cpp >&5
+conftest.cpp:59:31: error: redefinition of 'f'
+int f(size_t) {return 0;} int f(unsigned long) {return 0;}
+                              ^
+conftest.cpp:59:5: note: previous definition is here
+int f(size_t) {return 0;} int f(unsigned long) {return 0;}
+    ^
+1 error generated.
 configure:5772: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1041,22 +1040,19 @@ configure: failed program was:
 | }
 configure:5779: result: yes
 configure:5790: checking whether size_t and unsigned long long are the same type
-configure:5807: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5807: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:5807: $? = 0
 configure:5814: result: no
 configure:5824: checking for long long
-configure:5824: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:5824: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:5824: $? = 0
-configure:5824: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
-conftest.cpp: In function 'int main()':
-conftest.cpp:95:14: error: expected primary-expression before 'long'
- if (sizeof ((long long)))
-              ^
-conftest.cpp:95:14: error: expected ')' before 'long'
-conftest.cpp:96:14: error: expected ')' before ';' token
-      return 0;
-              ^
-conftest.cpp:96:14: error: expected ')' before ';' token
+configure:5824: g++ -c -g -O2  conftest.cpp >&5
+conftest.cpp:95:24: error: expected expression
+if (sizeof ((long long)))
+                       ^
+1 error generated.
 configure:5824: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1160,41 +1156,47 @@ configure: failed program was:
 | }
 configure:5824: result: yes
 configure:5838: checking size of short
-configure:5843: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -lnuma  >&5
+configure:5843: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:5843: $? = 0
 configure:5843: ./conftest
 configure:5843: $? = 0
 configure:5857: result: 2
 configure:5871: checking size of int
-configure:5876: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -lnuma  >&5
+configure:5876: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:5876: $? = 0
 configure:5876: ./conftest
 configure:5876: $? = 0
 configure:5890: result: 4
 configure:5904: checking size of long
-configure:5909: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -lnuma  >&5
+configure:5909: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:5909: $? = 0
 configure:5909: ./conftest
 configure:5909: $? = 0
 configure:5923: result: 8
 configure:5937: checking size of long long
-configure:5942: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -lnuma  >&5
+configure:5942: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:5942: $? = 0
 configure:5942: ./conftest
 configure:5942: $? = 0
 configure:5956: result: 8
 configure:5970: checking size of void *
-configure:5975: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -lnuma  >&5
+configure:5975: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:5975: $? = 0
 configure:5975: ./conftest
 configure:5975: $? = 0
 configure:5989: result: 8
 configure:6000: checking whether getline is declared
-configure:6000: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:6000: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:6000: $? = 0
 configure:6000: result: yes
 configure:6015: checking time.h usability
-configure:6015: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:6015: g++ -c -g -O2  conftest.cpp >&5
 configure:6015: $? = 0
 configure:6015: result: yes
 configure:6015: checking time.h presence
@@ -1204,7 +1206,7 @@ configure:6015: result: yes
 configure:6015: checking for time.h
 configure:6015: result: yes
 configure:6015: checking execinfo.h usability
-configure:6015: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:6015: g++ -c -g -O2  conftest.cpp >&5
 configure:6015: $? = 0
 configure:6015: result: yes
 configure:6015: checking execinfo.h presence
@@ -1214,15 +1216,18 @@ configure:6015: result: yes
 configure:6015: checking for execinfo.h
 configure:6015: result: yes
 configure:6025: checking whether clock_gettime is declared
-configure:6025: g++ -std=gnu++0x -c -g -O2  conftest.cpp >&5
+configure:6025: g++ -c -g -O2  conftest.cpp >&5
+main replaced by user_main
 configure:6025: $? = 0
 configure:6025: result: yes
 configure:6039: checking for library containing clock_gettime
-configure:6070: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -lnuma  >&5
+configure:6070: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:6070: $? = 0
 configure:6087: result: none required
 configure:6097: checking for clock_gettime
-configure:6097: g++ -std=gnu++0x -o conftest -g -O2   conftest.cpp -lnuma  >&5
+configure:6097: g++ -o conftest -g -O2   conftest.cpp -lnuma  >&5
+main replaced by user_main
 configure:6097: $? = 0
 configure:6097: result: yes
 configure:6156: checking whether MADV_HUGEPAGE is supported
@@ -1248,7 +1253,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on dw-10
+on dw-6
 
 config.status:863: creating GNUmakefile
 config.status:863: creating config.h
@@ -1343,7 +1348,7 @@ ac_cv_header_unistd_h=yes
 ac_cv_lib_flow_malloc=no
 ac_cv_lib_hoard__Z16getMainHoardHeapv=no
 ac_cv_lib_jemalloc_mallctl=yes
-ac_cv_lib_tcmalloc_minimal_tc_malloc=yes
+ac_cv_lib_tcmalloc_minimal_tc_malloc=no
 ac_cv_max_key_len=1024
 ac_cv_objext=o
 ac_cv_path_EGREP='/bin/grep -E'
@@ -1372,7 +1377,7 @@ ac_cv_type_long_long=yes
 CC='gcc'
 CFLAGS='-g -O2'
 CPPFLAGS=''
-CXX='g++ -std=gnu++0x'
+CXX='g++'
 CXXCPP='g++ -E'
 CXXFLAGS='-g -O2'
 DEFS='-DHAVE_CONFIG_H'
@@ -1396,7 +1401,7 @@ PACKAGE_URL=''
 PACKAGE_VERSION='0.1'
 PATH_SEPARATOR=':'
 SHELL='/bin/bash'
-ac_configure_args=' '\''--enable-max-key-len=1024'\'' '\''--disable-assertions'\'' '\''--enable-invariants'\'' '\''--enable-preconditions'\'' '\''--with-malloc=jemalloc'\'''
+ac_configure_args=' '\''--enable-max-key-len=1024'\'' '\''--disable-assertions'\'' '\''--disable-invariants'\'' '\''--disable-preconditions'\'' '\''--with-malloc=jemalloc'\'''
 ac_ct_CC='gcc'
 ac_ct_CXX='g++'
 bindir='${exec_prefix}/bin'
@@ -1503,8 +1508,8 @@ target_alias=''
 #define HAVE_MADV_HUGEPAGE 1
 #define HAVE_MAP_HUGETLB 1
 #define HAVE_SUPERPAGE 1
-#define ENABLE_PRECONDITIONS 1
-#define ENABLE_INVARIANTS 1
+#define ENABLE_PRECONDITIONS 0
+#define ENABLE_INVARIANTS 0
 #define CACHE_LINE_SIZE 64
 #define HAVE_UNALIGNED_ACCESS 1
 
diff --git a/silo/masstree/config.status b/silo/masstree/config.status
index 8eec13f..07a54a2 100755
--- a/silo/masstree/config.status
+++ b/silo/masstree/config.status
@@ -423,7 +423,7 @@ $config_headers
 
 Report bugs to the package provider."
 
-ac_cs_config="'--enable-max-key-len=1024' '--disable-assertions' '--enable-invariants' '--enable-preconditions' '--with-malloc=jemalloc'"
+ac_cs_config="'--enable-max-key-len=1024' '--disable-assertions' '--disable-invariants' '--disable-preconditions' '--with-malloc=jemalloc'"
 ac_cs_version="\
 masstree-beta config.status 0.1
 configured by ./configure, generated by GNU Autoconf 2.69,
@@ -433,7 +433,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/ahmad/benchmark-fuzzying-tool/silo/masstree'
+ac_pwd='/scratch/fuzzer/benchmark-fuzzying-tool/silo/masstree'
 srcdir='.'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -512,7 +512,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/bash './configure'  '--enable-max-key-len=1024' '--disable-assertions' '--enable-invariants' '--enable-preconditions' '--with-malloc=jemalloc' $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/bash './configure'  '--enable-max-key-len=1024' '--disable-assertions' '--disable-invariants' '--disable-preconditions' '--with-malloc=jemalloc' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
   CONFIG_SHELL='/bin/bash'
@@ -608,7 +608,7 @@ S["GREP"]="/bin/grep"
 S["CXXCPP"]="g++ -E"
 S["ac_ct_CXX"]="g++"
 S["CXXFLAGS"]="-g -O2"
-S["CXX"]="g++ -std=gnu++0x"
+S["CXX"]="g++"
 S["OBJEXT"]="o"
 S["EXEEXT"]=""
 S["ac_ct_CC"]="gcc"
@@ -616,7 +616,7 @@ S["CPPFLAGS"]=""
 S["LDFLAGS"]=""
 S["CFLAGS"]="-g -O2"
 S["CC"]="gcc"
-S["ac_configure_args"]=" '--enable-max-key-len=1024' '--disable-assertions' '--enable-invariants' '--enable-preconditions' '--with-malloc=jemalloc'"
+S["ac_configure_args"]=" '--enable-max-key-len=1024' '--disable-assertions' '--disable-invariants' '--disable-preconditions' '--with-malloc=jemalloc'"
 S["target_alias"]=""
 S["host_alias"]=""
 S["build_alias"]=""
@@ -769,8 +769,8 @@ D["MASSTREE_MAXKEYLEN"]=" 1024"
 D["HAVE_MADV_HUGEPAGE"]=" 1"
 D["HAVE_MAP_HUGETLB"]=" 1"
 D["HAVE_SUPERPAGE"]=" 1"
-D["ENABLE_PRECONDITIONS"]=" 1"
-D["ENABLE_INVARIANTS"]=" 1"
+D["ENABLE_PRECONDITIONS"]=" 0"
+D["ENABLE_INVARIANTS"]=" 0"
 D["CACHE_LINE_SIZE"]=" 64"
 D["HAVE_UNALIGNED_ACCESS"]=" 1"
   for (key in D) D_is_set[key] = 1
diff --git a/silo/record/inline_str.h b/silo/record/inline_str.h
index c44cb5f..d00f351 100644
--- a/silo/record/inline_str.h
+++ b/silo/record/inline_str.h
@@ -15,7 +15,7 @@
 template <typename IntSizeType, unsigned int N>
 class inline_str_base {
   // XXX: argh...
-  template <typename T, bool DoCompress> friend class serializer;
+  template <typename T, bool DoCompress> friend struct serializer;
 public:
 
   inline_str_base() : sz(0) {}
@@ -174,7 +174,7 @@ public:
 template <unsigned int N, char FillChar = ' '>
 class inline_str_fixed {
   // XXX: argh...
-  template <typename T, bool DoCompress> friend class serializer;
+  template <typename T, bool DoCompress> friend struct serializer;
 public:
   inline_str_fixed()
   {
diff --git a/silo/third-party/lz4/liblz4.so b/silo/third-party/lz4/liblz4.so
deleted file mode 100755
index cec49d3..0000000
Binary files a/silo/third-party/lz4/liblz4.so and /dev/null differ
diff --git a/silo/third-party/lz4/lz4.o b/silo/third-party/lz4/lz4.o
deleted file mode 100644
index f438ab4..0000000
Binary files a/silo/third-party/lz4/lz4.o and /dev/null differ
diff --git a/silo/third-party/lz4/xxhash.o b/silo/third-party/lz4/xxhash.o
deleted file mode 100644
index a5e68b9..0000000
Binary files a/silo/third-party/lz4/xxhash.o and /dev/null differ