Merge from mainline to fix linking problem.

llvm-svn: 31647
diff --git a/SingleSource/CustomChecked/Makefile b/SingleSource/CustomChecked/Makefile
index def849f..d111456 100644
--- a/SingleSource/CustomChecked/Makefile
+++ b/SingleSource/CustomChecked/Makefile
@@ -7,7 +7,7 @@
 include $(LEVEL)/SingleSource/Makefile.singlesrc
 
 LIBS += -lstdc++
-LDFLAGS += -lm
+LDFLAGS += -lstdc++ -lm
 
 LLI_RUN  := $(addsuffix .run-lli, $(PREFIXED_PROGRAMS_TO_TEST))
 JIT_RUN  := $(addsuffix .run-jit, $(PREFIXED_PROGRAMS_TO_TEST))