Patch to fix the main.cpp compile error submitted by Dmitry Vyukov <dvyukov@google.com>. Also add a Makefile, plus some modification to main.cpp. llvm-svn: 150990