Take a stab at trying to unbreak the makefile build.

There is no clangRewrite.a.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@181781 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index d18767897f39ae7ee7e7e21eb6b6f86af4725911..cacdf3438d84e9246437d50c48f1c5ebf05920bb 100644 (file)
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -160,7 +160,9 @@ static Value *EmitFAbs(CodeGenFunction &CGF, Value *V, QualType ValTy) {
                                                    false);
   llvm::Value *Fn = CGF.CGM.CreateRuntimeFunction(FT, FnName);
 
-  return CGF.EmitNounwindRuntimeCall(Fn, V, "abs");
+  llvm::CallInst *Call = CGF.EmitNounwindRuntimeCall(Fn, V, "abs");
+  Call->setDoesNotAccessMemory();
+  return Call;
 }
 
 static RValue emitLibraryCall(CodeGenFunction &CGF, const FunctionDecl *Fn,

diff --git a/unittests/ASTMatchers/Dynamic/Makefile b/unittests/ASTMatchers/Dynamic/Makefile
index 18473782b86d5ae1c9fa60501021c51081feb869..52a02d0ec50f44dd0f7c05404ea28b04a06c7da6 100644 (file)
--- a/unittests/ASTMatchers/Dynamic/Makefile
+++ b/unittests/ASTMatchers/Dynamic/Makefile
@@ -10,11 +10,11 @@
 CLANG_LEVEL = ../../..
 
 TESTNAME = DynamicASTMatchers
-#include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := support mc
-USEDLIBS = clangEdit.a clangTooling.a clangFrontend.a clangSerialization.a \
-           clangDriver.a clangRewrite.a clangParse.a clangSema.a \
-           clangAnalysis.a clangAST.a clangASTMatchers.a clangLex.a \
-           clangBasic.a clangDynamicASTMatchers.a
+include $(CLANG_LEVEL)/../../Makefile.config
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc
+USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
+           clangRewriteCore.a clangRewriteFrontend.a clangParse.a clangSema.a \
+           clangAnalysis.a clangEdit.a clangAST.a clangASTMatchers.a \
+           clangLex.a clangBasic.a clangDynamicASTMatchers.a
 
 include $(CLANG_LEVEL)/unittests/Makefile