Conditionalize the use of 4.4 or 4.2 format based on the target.

<rdar://problem/8107317>

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

diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp
index 1264473dabcede57be7f9a332fe67de5861bf3b7..e6570d4086677982855e66233878688a8520dc96 100644 (file)
--- a/lib/CodeGen/BackendUtil.cpp
+++ b/lib/CodeGen/BackendUtil.cpp
@@ -112,8 +112,8 @@ void EmitAssemblyHelper::CreatePasses() {
 
   FunctionPassManager *FPM = getPerFunctionPasses();
 
-  TargetLibraryInfo *TLI =
-    new TargetLibraryInfo(Triple(TheModule->getTargetTriple()));
+  Triple TargetTriple(TheModule->getTargetTriple());
+  TargetLibraryInfo *TLI = new TargetLibraryInfo(TargetTriple);
   if (!CodeGenOpts.SimplifyLibCalls)
     TLI->disableAllFunctions();
   FPM->add(TLI);
@@ -150,14 +150,16 @@ void EmitAssemblyHelper::CreatePasses() {
 
   PassManager *MPM = getPerModulePasses();
 
-  TLI = new TargetLibraryInfo(Triple(TheModule->getTargetTriple()));
+  TLI = new TargetLibraryInfo(TargetTriple);
   if (!CodeGenOpts.SimplifyLibCalls)
     TLI->disableAllFunctions();
   MPM->add(TLI);
 
   if (CodeGenOpts.EmitGcovArcs || CodeGenOpts.EmitGcovNotes) {
     MPM->add(createGCOVProfilerPass(CodeGenOpts.EmitGcovNotes,
-                                    CodeGenOpts.EmitGcovArcs));
+                                    CodeGenOpts.EmitGcovArcs,
+                                    TargetTriple.isMacOSX()));
+
     if (!CodeGenOpts.DebugInfo)
       MPM->add(createStripSymbolsPass(true));
   }