Bring the contrib/llvm/patches directory up-to-date.

MFC r263892:
Add the llvm/clang patch for r263891.

MFC r264350:
Update the llvm/clang patch for r264345.

MFC r266675:
Add the clang patch for r266674.

MFC r275651:
Add llvm patch corresponding to r275633.

MFC r275747:
Update llvm patches for r274286 and r275633 so all the tests will pass.

MFC r275760:
Add clang patch corresponding to r275759.

MFC r275772:
Update clang patch for r275759 to use correct test cases.

Additionally:
* Remove the clang patch corresponding to r263619, as ARM EABI
  hard-float support was never MFC'd.
* Add clang patch corresponding to r279302.

7 files changed, 1454 insertions, 89 deletions

diff --git a/contrib/llvm/patches/patch-r263619-clang-r201662-arm-gnueabihf.diff b/contrib/llvm/patches/patch-r263619-clang-r201662-arm-gnueabihf.diff
deleted file mode 100644
index 0e1997c..0000000
--- a/contrib/llvm/patches/patch-r263619-clang-r201662-arm-gnueabihf.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-Pull in r201662 from upstream clang trunk:
-
-  Add FreeBSD ARM EABI hard-float support
-
-  Patch by Andrew Turner.
-
-Introduced here: http://svnweb.freebsd.org/changeset/base/263619
-
-Index: tools/clang/lib/Driver/ToolChains.cpp
-===================================================================
---- tools/clang/lib/Driver/ToolChains.cpp
-+++ tools/clang/lib/Driver/ToolChains.cpp
-@@ -2034,6 +2034,7 @@
- bool FreeBSD::UseSjLjExceptions() const {
-   // FreeBSD uses SjLj exceptions on ARM oabi.
-   switch (getTriple().getEnvironment()) {
-+  case llvm::Triple::GNUEABIHF:
-   case llvm::Triple::GNUEABI:
-   case llvm::Triple::EABI:
-     return false;
-Index: tools/clang/lib/Driver/Tools.cpp
-===================================================================
---- tools/clang/lib/Driver/Tools.cpp
-+++ tools/clang/lib/Driver/Tools.cpp
-@@ -737,8 +737,15 @@
-     }
- 
-     case llvm::Triple::FreeBSD:
--      // FreeBSD defaults to soft float
--      FloatABI = "soft";
-+      switch(Triple.getEnvironment()) {
-+      case llvm::Triple::GNUEABIHF:
-+        FloatABI = "hard";
-+        break;
-+      default:
-+        // FreeBSD defaults to soft float
-+        FloatABI = "soft";
-+        break;
-+      }
-       break;
- 
-     default:
-@@ -5776,8 +5783,18 @@
-     }
-   } else if (getToolChain().getArch() == llvm::Triple::arm ||
-              getToolChain().getArch() == llvm::Triple::thumb) {
--    CmdArgs.push_back("-mfpu=softvfp");
-+    const Driver &D = getToolChain().getDriver();
-+    llvm::Triple Triple = getToolChain().getTriple();
-+    StringRef FloatABI = getARMFloatABI(D, Args, Triple);
-+
-+    if (FloatABI == "hard") {
-+      CmdArgs.push_back("-mfpu=vfp");
-+    } else {
-+      CmdArgs.push_back("-mfpu=softvfp");
-+    }
-+
-     switch(getToolChain().getTriple().getEnvironment()) {
-+    case llvm::Triple::GNUEABIHF:
-     case llvm::Triple::GNUEABI:
-     case llvm::Triple::EABI:
-       CmdArgs.push_back("-meabi=5");
-Index: tools/clang/test/Driver/freebsd.c
-===================================================================
---- tools/clang/test/Driver/freebsd.c
-+++ tools/clang/test/Driver/freebsd.c
-@@ -101,13 +101,22 @@
- // RUN:   | FileCheck --check-prefix=CHECK-ARM %s
- // CHECK-ARM: clang{{.*}}" "-cc1"{{.*}}" "-fsjlj-exceptions"
- // CHECK-ARM: as{{.*}}" "-mfpu=softvfp"{{.*}}"-matpcs"
-+// CHECK-ARM-EABI-NOT: as{{.*}}" "-mfpu=vfp"
- 
- // RUN: %clang %s -### -target arm-gnueabi-freebsd10.0 2>&1 \
- // RUN:   | FileCheck --check-prefix=CHECK-ARM-EABI %s
- // CHECK-ARM-EABI-NOT: clang{{.*}}" "-cc1"{{.*}}" "-fsjlj-exceptions"
- // CHECK-ARM-EABI: as{{.*}}" "-mfpu=softvfp" "-meabi=5"
-+// CHECK-ARM-EABI-NOT: as{{.*}}" "-mfpu=vfp"
- // CHECK-ARM-EABI-NOT: as{{.*}}" "-matpcs"
- 
-+// RUN: %clang %s -### -o %t.o -target arm-gnueabihf-freebsd10.0 -no-integrated-as 2>&1 \
-+// RUN:   | FileCheck --check-prefix=CHECK-ARM-EABIHF %s
-+// CHECK-ARM-EABIHF-NOT: clang{{.*}}" "-cc1"{{.*}}" "-fsjlj-exceptions"
-+// CHECK-ARM-EABIHF: as{{.*}}" "-mfpu=vfp" "-meabi=5"
-+// CHECK-ARM-EABIHF-NOT: as{{.*}}" "-mfpu=softvfp"
-+// CHECK-ARM-EABIHF-NOT: as{{.*}}" "-matpcs"
-+
- // RUN: %clang -target x86_64-pc-freebsd8 %s -### -flto -o %t.o 2>&1 \
- // RUN:   | FileCheck --check-prefix=CHECK-LTO %s
- // CHECK-LTO: ld{{.*}}" "-plugin{{.*}}LLVMgold.so
diff --git a/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff b/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff
new file mode 100644
index 0000000..ab6e21d
--- /dev/null
+++ b/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff
@@ -0,0 +1,20 @@
+This patch makes clang default to DWARF2 debug info format for FreeBSD.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/264345
+
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -2627,8 +2635,9 @@ void Clang::ConstructJob(Compilation &C, const Job
+       CmdArgs.push_back("-gdwarf-4");
+     else if (!A->getOption().matches(options::OPT_g0) &&
+              !A->getOption().matches(options::OPT_ggdb0)) {
+-      // Default is dwarf-2 for darwin.
+-      if (getToolChain().getTriple().isOSDarwin())
++      // Default is dwarf-2 for darwin and FreeBSD.
++      const llvm::Triple &Triple = getToolChain().getTriple();
++      if (Triple.isOSDarwin() || Triple.getOS() == llvm::Triple::FreeBSD)
+         CmdArgs.push_back("-gdwarf-2");
+       else
+         CmdArgs.push_back("-g");
diff --git a/contrib/llvm/patches/patch-r266674-clang-r209489-fix-xmmintrin.diff b/contrib/llvm/patches/patch-r266674-clang-r209489-fix-xmmintrin.diff
new file mode 100644
index 0000000..78473aa
--- /dev/null
+++ b/contrib/llvm/patches/patch-r266674-clang-r209489-fix-xmmintrin.diff
@@ -0,0 +1,49 @@
+Pull in r209489 from upstream clang trunk (by Akira Hatanaka):
+
+  Fix a bug in xmmintrin.h.
+
+  The last step of _mm_cvtps_pi16 should use _mm_packs_pi32, which is a function
+  that reads two __m64 values and packs four 32-bit values into four 16-bit
+  values.  
+
+  <rdar://problem/16873717>
+
+Pull in r209559 from upstream clang trunk (by Akira Hatanaka):
+
+  Recommit r209532 with -ffreestanding.
+
+  This is a test case for r209489.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/266674
+
+Index: tools/clang/lib/Headers/xmmintrin.h
+===================================================================
+--- tools/clang/lib/Headers/xmmintrin.h
++++ tools/clang/lib/Headers/xmmintrin.h
+@@ -903,7 +903,7 @@ _mm_cvtps_pi16(__m128 __a)
+   __a = _mm_movehl_ps(__a, __a);
+   __c = _mm_cvtps_pi32(__a);
+   
+-  return _mm_packs_pi16(__b, __c);
++  return _mm_packs_pi32(__b, __c);
+ }
+ 
+ static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
+Index: tools/clang/test/Headers/xmmintrin.c
+===================================================================
+--- tools/clang/test/Headers/xmmintrin.c
++++ tools/clang/test/Headers/xmmintrin.c
+@@ -0,0 +1,13 @@
++// RUN: %clang_cc1 %s -ffreestanding -triple x86_64-apple-macosx10.9.0 -emit-llvm -o - | FileCheck %s
++
++#include <xmmintrin.h>
++
++// Make sure the last step of _mm_cvtps_pi16 converts <4 x i32> to <4 x i16> by
++// checking that clang emits PACKSSDW instead of PACKSSWB.
++
++// CHECK: define i64 @test_mm_cvtps_pi16
++// CHECK: call x86_mmx @llvm.x86.mmx.packssdw
++
++__m64 test_mm_cvtps_pi16(__m128 a) {
++  return _mm_cvtps_pi16(a);
++}
diff --git a/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff b/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
index 40dd5bd..e5baca0 100644
--- a/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
+++ b/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
@@ -1,3 +1,14 @@
+Pull in r200383 from upstream llvm trunk (by David Majnemer):
+
+  MC: Reorganize macro MC test along dialect lines
+
+  This commit seeks to do two things:
+  - Run the surfeit of tests under the Darwin dialect.  This ends up
+    affecting tests which assumed that spaces could deliminate arguments.
+  - The GAS dialect tests should limit their surface area to things that
+    could plausibly work under GAS. For example, Darwin style arguments
+    have no business being in such a test.
+
 Pull in r201784 from upstream llvm trunk (by Benjamin Kramer):
 
   AsmParser: Disable Darwin-style macro argument expansion on non-darwin targets.
@@ -53,3 +64,208 @@ Index: test/MC/AsmParser/exprs.s
  
  .macro check_expr
    .if ($0) != ($1)
+Index: test/MC/AsmParser/macros.s (deleted)
+===================================================================
+Index: test/MC/AsmParser/macros-darwin.s
+===================================================================
+--- test/MC/AsmParser/macros-darwin.s
++++ test/MC/AsmParser/macros-darwin.s
+@@ -1,9 +1,97 @@
+-// RUN: llvm-mc -triple i386-apple-darwin10 %s | FileCheck %s
++// RUN: not llvm-mc -triple i386-apple-darwin10 %s 2> %t.err | FileCheck %s
++// RUN: FileCheck --check-prefix=CHECK-ERRORS %s < %t.err
+ 
+-.macro test1
++.macro .test0
++.macrobody0
++.endmacro
++.macro .test1
++.test0
++.endmacro
++
++.test1
++// CHECK-ERRORS: <instantiation>:1:1: error: unknown directive
++// CHECK-ERRORS-NEXT: macrobody0
++// CHECK-ERRORS-NEXT: ^
++// CHECK-ERRORS: <instantiation>:1:1: note: while in macro instantiation
++// CHECK-ERRORS-NEXT: .test0
++// CHECK-ERRORS-NEXT: ^
++// CHECK-ERRORS: 11:1: note: while in macro instantiation
++// CHECK-ERRORS-NEXT: .test1
++// CHECK-ERRORS-NEXT: ^
++
++.macro test2
++.byte $0
++.endmacro
++// CHECK: .byte 10
++test2 10
++
++.macro test3
+ .globl "$0 $1 $2 $$3 $n"
+ .endmacro
+ 
+ // CHECK: .globl "1 23  $3 2"
+-test1 1, 2 3
++test3 1, 2 3
+ 
++// CHECK: .globl	"1 (23)  $3 2"
++test3 1, (2 3)
++
++// CHECK: .globl "12  $3 1"
++test3 1 2
++
++.macro test4
++.globl "$0 -- $1"
++.endmacro
++
++// CHECK: .globl  "(ab)(,)) -- (cd)"
++test4 (a b)(,)),(cd)
++
++// CHECK: .globl  "(ab)(,)) -- (cd)"
++test4 (a b)(,)),(cd)
++
++.macro test5 _a
++.globl "\_a"
++.endm
++
++// CHECK: .globl zed1
++test5 zed1
++
++.macro test6 $a
++.globl "\$a"
++.endm
++
++// CHECK: .globl zed2
++test6 zed2
++
++.macro test7 .a
++.globl "\.a"
++.endm
++
++// CHECK: .globl zed3
++test7 zed3
++
++.macro test8 _a, _b, _c
++.globl "\_a,\_b,\_c"
++.endmacro
++
++.macro test9 _a _b _c
++.globl "\_a \_b \_c"
++.endmacro
++
++// CHECK: .globl  "a,b,c"
++test8 a, b, c
++// CHECK: .globl  "%1,%2,%3"
++test8 %1, %2, %3 #a comment
++// CHECK: .globl "x-y,z,1"
++test8 x - y, z, 1
++// CHECK: .globl  "1 2 3"
++test9 1, 2,3
++
++test8 1,2 3
++// CHECK-ERRORS: error: macro argument '_c' is missing
++// CHECK-ERRORS-NEXT: test8 1,2 3
++// CHECK-ERRORS-NEXT:           ^
++
++test8 1 2, 3
++// CHECK-ERRORS: error: macro argument '_c' is missing
++// CHECK-ERRORS-NEXT:test8 1 2, 3
++// CHECK-ERRORS-NEXT:           ^
+Index: test/MC/AsmParser/macros-gas.s
+===================================================================
+--- test/MC/AsmParser/macros-gas.s
++++ test/MC/AsmParser/macros-gas.s
+@@ -0,0 +1,93 @@
++// RUN: not llvm-mc -triple i386-linux-gnu %s 2> %t.err | FileCheck %s
++// RUN: FileCheck --check-prefix=CHECK-ERRORS %s < %t.err
++
++.macro .test0
++.macrobody0
++.endm
++.macro .test1
++.test0
++.endm
++
++.test1
++// CHECK-ERRORS: <instantiation>:1:1: error: unknown directive
++// CHECK-ERRORS-NEXT: macrobody0
++// CHECK-ERRORS-NEXT: ^
++// CHECK-ERRORS: <instantiation>:1:1: note: while in macro instantiation
++// CHECK-ERRORS-NEXT: .test0
++// CHECK-ERRORS-NEXT: ^
++// CHECK-ERRORS: 11:1: note: while in macro instantiation
++// CHECK-ERRORS-NEXT: .test1
++// CHECK-ERRORS-NEXT: ^
++
++.macro test2 _a
++.byte \_a
++.endm
++// CHECK: .byte 10
++test2 10
++
++.macro test3 _a _b _c
++.ascii "\_a \_b \_c \\_c"
++.endm
++
++// CHECK: .ascii "1 2 3 \003"
++test3 1, 2, 3
++
++// FIXME: test3 1, 2 3 should be treated like test 1, 2, 3
++
++// FIXME: remove the n argument from the remaining test3 examples
++// CHECK: .ascii "1 (23) n \n"
++test3 1, (2 3), n
++
++// CHECK: .ascii "1 (23) n \n"
++test3 1 (2 3) n
++
++// CHECK: .ascii "1 2 n \n"
++test3 1 2 n
++
++.macro test5 _a
++.globl \_a
++.endm
++
++// CHECK: .globl zed1
++test5 zed1
++
++.macro test6 $a
++.globl \$a
++.endm
++
++// CHECK: .globl zed2
++test6 zed2
++
++.macro test7 .a
++.globl \.a
++.endm
++
++// CHECK: .globl zed3
++test7 zed3
++
++.macro test8 _a, _b, _c
++.ascii "\_a,\_b,\_c"
++.endm
++
++.macro test9 _a _b _c
++.ascii "\_a \_b \_c"
++.endm
++
++// CHECK: .ascii "a,b,c"
++test8 a, b, c
++// CHECK: .ascii "%1,%2,%3"
++test8 %1 %2 %3 #a comment
++// CHECK: .ascii "x-y,z,1"
++test8 x - y z 1
++// CHECK: .ascii "1 2 3"
++test9 1, 2,3
++
++test8 1,2 3
++// CHECK-ERRORS: error: macro argument '_c' is missing
++// CHECK-ERRORS-NEXT: test8 1,2 3
++// CHECK-ERRORS-NEXT:           ^
++
++test8 1 2, 3
++// CHECK-ERRORS: error: expected ' ' for macro argument separator
++// CHECK-ERRORS-NEXT:test8 1 2, 3
++// CHECK-ERRORS-NEXT:         ^
diff --git a/contrib/llvm/patches/patch-r275633-llvm-r223171-fix-vectorizer.diff b/contrib/llvm/patches/patch-r275633-llvm-r223171-fix-vectorizer.diff
new file mode 100644
index 0000000..a0b4e1f
--- /dev/null
+++ b/contrib/llvm/patches/patch-r275633-llvm-r223171-fix-vectorizer.diff
@@ -0,0 +1,529 @@
+Pull in r223170 from upstream llvm trunk (by Michael Zolotukhin):
+
+  Apply loop-rotate to several vectorizer tests.
+
+  Such loops shouldn't be vectorized due to the loops form.
+  After applying loop-rotate (+simplifycfg) the tests again start to check
+  what they are intended to check.
+
+Pull in r223171 from upstream llvm trunk (by Michael Zolotukhin):
+
+  PR21302. Vectorize only bottom-tested loops.
+
+  rdar://problem/18886083
+
+This fixes a bug in the llvm vectorizer, which could sometimes cause
+vectorized loops to perform an additional iteration, leading to possible
+buffer overruns.  Symptoms of this, which are usually segfaults, were
+first noticed when building gcc ports, here:
+
+https://lists.freebsd.org/pipermail/freebsd-ports/2014-September/095466.html
+https://lists.freebsd.org/pipermail/freebsd-toolchain/2014-September/001211.html
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/275633
+
+Index: lib/Transforms/Vectorize/LoopVectorize.cpp
+===================================================================
+--- lib/Transforms/Vectorize/LoopVectorize.cpp
++++ lib/Transforms/Vectorize/LoopVectorize.cpp
+@@ -2864,6 +2864,14 @@ bool LoopVectorizationLegality::canVectorize() {
+   if (!TheLoop->getExitingBlock())
+     return false;
+ 
++  // We only handle bottom-tested loops, i.e. loop in which the condition is
++  // checked at the end of each iteration. With that we can assume that all
++  // instructions in the loop are executed the same number of times.
++  if (TheLoop->getExitingBlock() != TheLoop->getLoopLatch()) {
++    DEBUG(dbgs() << "LV: loop control flow is not understood by vectorizer\n");
++    return false;
++  }
++
+   // We need to have a loop header.
+   DEBUG(dbgs() << "LV: Found a loop: " <<
+         TheLoop->getHeader()->getName() << '\n');
+Index: test/Transforms/LoopVectorize/loop-form.ll
+===================================================================
+--- test/Transforms/LoopVectorize/loop-form.ll
++++ test/Transforms/LoopVectorize/loop-form.ll
+@@ -0,0 +1,31 @@
++; RUN: opt -S -loop-vectorize < %s | FileCheck %s
++target datalayout = "e-i64:64-f80:128-n8:16:32:64-S128"
++
++; Check that we vectorize only bottom-tested loops.
++; This is a reduced testcase from PR21302.
++;
++; rdar://problem/18886083
++
++%struct.X = type { i32, i16 }
++; CHECK-LABEL: @foo(
++; CHECK-NOT: vector.body
++
++define void @foo(i32 %n) {
++entry:
++  br label %for.cond
++
++for.cond:
++  %i = phi i32 [ 0, %entry ], [ %inc, %for.body ]
++  %cmp = icmp slt i32 %i, %n
++  br i1 %cmp, label %for.body, label %if.end
++
++for.body:
++  %iprom = sext i32 %i to i64
++  %b = getelementptr inbounds %struct.X* undef, i64 %iprom, i32 1
++  store i16 0, i16* %b, align 4
++  %inc = add nsw i32 %i, 1
++  br label %for.cond
++
++if.end:
++  ret void
++}
+Index: test/Transforms/LoopVectorize/runtime-check-address-space.ll
+===================================================================
+--- test/Transforms/LoopVectorize/runtime-check-address-space.ll
++++ test/Transforms/LoopVectorize/runtime-check-address-space.ll
+@@ -31,25 +31,23 @@ define void @foo(i32 addrspace(1)* %a, i32 addrspa
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %idxprom
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %idxprom1
+   store i32 %mul, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -60,25 +58,23 @@ define void @bar0(i32* %a, i32 addrspace(1)* %b, i
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %idxprom
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32* %a, i64 %idxprom1
+   store i32 %mul, i32* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -89,25 +85,23 @@ define void @bar1(i32 addrspace(1)* %a, i32* %b, i
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32* %b, i64 %idxprom
+   %0 = load i32* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %idxprom1
+   store i32 %mul, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -119,25 +113,23 @@ define void @bar2(i32* noalias %a, i32 addrspace(1
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %idxprom
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32* %a, i64 %idxprom1
+   store i32 %mul, i32* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -149,25 +141,23 @@ define void @arst0(i32* %b, i32 %n) #0 {
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32* %b, i64 %idxprom
+   %0 = load i32* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds [1024 x i32] addrspace(1)* @g_as1, i64 0, i64 %idxprom1
+   store i32 %mul, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -180,25 +170,23 @@ define void @arst1(i32* %b, i32 %n) #0 {
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds [1024 x i32] addrspace(1)* @g_as1, i64 0, i64 %idxprom
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32* %b, i64 %idxprom1
+   store i32 %mul, i32* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -210,25 +198,23 @@ define void @aoeu(i32 %n) #0 {
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds [1024 x i32] addrspace(2)* @q_as2, i64 0, i64 %idxprom
+   %0 = load i32 addrspace(2)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds [1024 x i32] addrspace(1)* @g_as1, i64 0, i64 %idxprom1
+   store i32 %mul, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+Index: test/Transforms/LoopVectorize/runtime-check-readonly-address-space.ll
+===================================================================
+--- test/Transforms/LoopVectorize/runtime-check-readonly-address-space.ll
++++ test/Transforms/LoopVectorize/runtime-check-readonly-address-space.ll
+@@ -8,26 +8,24 @@ define void @add_ints_1_1_1(i32 addrspace(1)* %a,
+ ; CHECK-LABEL: @add_ints_1_1_1(
+ ; CHECK: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.01
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32 addrspace(1)* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32 addrspace(1)* %c, i64 %i.01
+   %1 = load i32 addrspace(1)* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %i.01
+   store i32 %add, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+ 
+@@ -35,26 +33,24 @@ define void @add_ints_as_1_0_0(i32 addrspace(1)* %
+ ; CHECK-LABEL: @add_ints_as_1_0_0(
+ ; CHECK-NOT: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32* %b, i64 %i.01
+   %0 = load i32* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32* %c, i64 %i.01
+   %1 = load i32* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %i.01
+   store i32 %add, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+ 
+@@ -62,26 +58,24 @@ define void @add_ints_as_0_1_0(i32* %a, i32 addrsp
+ ; CHECK-LABEL: @add_ints_as_0_1_0(
+ ; CHECK-NOT: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.01
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32* %c, i64 %i.01
+   %1 = load i32* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.01
+   store i32 %add, i32* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+ 
+@@ -89,26 +83,24 @@ define void @add_ints_as_0_1_1(i32* %a, i32 addrsp
+ ; CHECK-LABEL: @add_ints_as_0_1_1(
+ ; CHECK-NOT: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.01
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32 addrspace(1)* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32 addrspace(1)* %c, i64 %i.01
+   %1 = load i32 addrspace(1)* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.01
+   store i32 %add, i32* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+ 
+@@ -116,26 +108,24 @@ define void @add_ints_as_0_1_2(i32* %a, i32 addrsp
+ ; CHECK-LABEL: @add_ints_as_0_1_2(
+ ; CHECK-NOT: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.01
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32 addrspace(2)* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32 addrspace(2)* %c, i64 %i.01
+   %1 = load i32 addrspace(2)* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.01
+   store i32 %add, i32* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+ 
diff --git a/contrib/llvm/patches/patch-r275759-clang-r221170-ppc-vaarg.diff b/contrib/llvm/patches/patch-r275759-clang-r221170-ppc-vaarg.diff
new file mode 100644
index 0000000..0562a68
--- /dev/null
+++ b/contrib/llvm/patches/patch-r275759-clang-r221170-ppc-vaarg.diff
@@ -0,0 +1,298 @@
+Pull in r221170 from upstream clang trunk (by Roman Divacky):
+
+  Implement vaarg lowering for ppc32. Lowering of scalars and
+  aggregates is supported. Complex numbers are not.
+
+Pull in r221174 from upstream clang trunk (by Roman Divacky):
+
+  Require asserts to unbreak the buildbots.
+
+Pull in r221284 from upstream clang trunk (by Roman Divacky):
+
+  Rewrite the test to not require asserts.
+
+Pull in r221285 from upstream clang trunk (by Roman Divacky):
+
+  Since the file has both ppc and ppc64 tests in it rename it.
+
+This adds va_args support for PowerPC (32 bit) to clang.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/275759
+
+Index: tools/clang/lib/CodeGen/TargetInfo.cpp
+===================================================================
+--- tools/clang/lib/CodeGen/TargetInfo.cpp
++++ tools/clang/lib/CodeGen/TargetInfo.cpp
+@@ -2733,12 +2733,20 @@ llvm::Value *NaClX86_64ABIInfo::EmitVAArg(llvm::Va
+ 
+ 
+ // PowerPC-32
+-
+ namespace {
+-class PPC32TargetCodeGenInfo : public DefaultTargetCodeGenInfo {
++/// PPC32_SVR4_ABIInfo - The 32-bit PowerPC ELF (SVR4) ABI information.
++class PPC32_SVR4_ABIInfo : public DefaultABIInfo {
+ public:
+-  PPC32TargetCodeGenInfo(CodeGenTypes &CGT) : DefaultTargetCodeGenInfo(CGT) {}
++  PPC32_SVR4_ABIInfo(CodeGen::CodeGenTypes &CGT) : DefaultABIInfo(CGT) {}
+ 
++  llvm::Value *EmitVAArg(llvm::Value *VAListAddr, QualType Ty,
++                         CodeGenFunction &CGF) const;
++};
++
++class PPC32TargetCodeGenInfo : public TargetCodeGenInfo {
++public:
++  PPC32TargetCodeGenInfo(CodeGenTypes &CGT) : TargetCodeGenInfo(new PPC32_SVR4_ABIInfo(CGT)) {}
++
+   int getDwarfEHStackPointer(CodeGen::CodeGenModule &M) const {
+     // This is recovered from gcc output.
+     return 1; // r1 is the dedicated stack pointer
+@@ -2750,6 +2758,96 @@ namespace {
+ 
+ }
+ 
++llvm::Value *PPC32_SVR4_ABIInfo::EmitVAArg(llvm::Value *VAListAddr,
++                                           QualType Ty,
++                                           CodeGenFunction &CGF) const {
++  if (const ComplexType *CTy = Ty->getAs<ComplexType>()) {
++    // TODO: Implement this. For now ignore.
++    (void)CTy;
++    return NULL;
++  }
++
++  bool isI64 = Ty->isIntegerType() && getContext().getTypeSize(Ty) == 64;
++  bool isInt = Ty->isIntegerType() || Ty->isPointerType() || Ty->isAggregateType();
++  llvm::Type *CharPtr = CGF.Int8PtrTy;
++  llvm::Type *CharPtrPtr = CGF.Int8PtrPtrTy;
++
++  CGBuilderTy &Builder = CGF.Builder;
++  llvm::Value *GPRPtr = Builder.CreateBitCast(VAListAddr, CharPtr, "gprptr");
++  llvm::Value *GPRPtrAsInt = Builder.CreatePtrToInt(GPRPtr, CGF.Int32Ty);
++  llvm::Value *FPRPtrAsInt = Builder.CreateAdd(GPRPtrAsInt, Builder.getInt32(1));
++  llvm::Value *FPRPtr = Builder.CreateIntToPtr(FPRPtrAsInt, CharPtr);
++  llvm::Value *OverflowAreaPtrAsInt = Builder.CreateAdd(FPRPtrAsInt, Builder.getInt32(3));
++  llvm::Value *OverflowAreaPtr = Builder.CreateIntToPtr(OverflowAreaPtrAsInt, CharPtrPtr);
++  llvm::Value *RegsaveAreaPtrAsInt = Builder.CreateAdd(OverflowAreaPtrAsInt, Builder.getInt32(4));
++  llvm::Value *RegsaveAreaPtr = Builder.CreateIntToPtr(RegsaveAreaPtrAsInt, CharPtrPtr);
++  llvm::Value *GPR = Builder.CreateLoad(GPRPtr, false, "gpr");
++  // Align GPR when TY is i64.
++  if (isI64) {
++    llvm::Value *GPRAnd = Builder.CreateAnd(GPR, Builder.getInt8(1));
++    llvm::Value *CC64 = Builder.CreateICmpEQ(GPRAnd, Builder.getInt8(1));
++    llvm::Value *GPRPlusOne = Builder.CreateAdd(GPR, Builder.getInt8(1));
++    GPR = Builder.CreateSelect(CC64, GPRPlusOne, GPR);
++  }
++  llvm::Value *FPR = Builder.CreateLoad(FPRPtr, false, "fpr");
++  llvm::Value *OverflowArea = Builder.CreateLoad(OverflowAreaPtr, false, "overflow_area");
++  llvm::Value *OverflowAreaAsInt = Builder.CreatePtrToInt(OverflowArea, CGF.Int32Ty);
++  llvm::Value *RegsaveArea = Builder.CreateLoad(RegsaveAreaPtr, false, "regsave_area");
++  llvm::Value *RegsaveAreaAsInt = Builder.CreatePtrToInt(RegsaveArea, CGF.Int32Ty);
++
++  llvm::Value *CC = Builder.CreateICmpULT(isInt ? GPR : FPR,
++                                          Builder.getInt8(8), "cond");
++
++  llvm::Value *RegConstant = Builder.CreateMul(isInt ? GPR : FPR,
++                                               Builder.getInt8(isInt ? 4 : 8));
++
++  llvm::Value *OurReg = Builder.CreateAdd(RegsaveAreaAsInt, Builder.CreateSExt(RegConstant, CGF.Int32Ty));
++
++  if (Ty->isFloatingType())
++    OurReg = Builder.CreateAdd(OurReg, Builder.getInt32(32));
++
++  llvm::BasicBlock *UsingRegs = CGF.createBasicBlock("using_regs");
++  llvm::BasicBlock *UsingOverflow = CGF.createBasicBlock("using_overflow");
++  llvm::BasicBlock *Cont = CGF.createBasicBlock("cont");
++
++  Builder.CreateCondBr(CC, UsingRegs, UsingOverflow);
++
++  CGF.EmitBlock(UsingRegs);
++
++  llvm::Type *PTy = llvm::PointerType::getUnqual(CGF.ConvertType(Ty));
++  llvm::Value *Result1 = Builder.CreateIntToPtr(OurReg, PTy);
++  // Increase the GPR/FPR indexes.
++  if (isInt) {
++    GPR = Builder.CreateAdd(GPR, Builder.getInt8(isI64 ? 2 : 1));
++    Builder.CreateStore(GPR, GPRPtr);
++  } else {
++    FPR = Builder.CreateAdd(FPR, Builder.getInt8(1));
++    Builder.CreateStore(FPR, FPRPtr);
++  }
++  CGF.EmitBranch(Cont);
++
++  CGF.EmitBlock(UsingOverflow);
++
++  // Increase the overflow area.
++  llvm::Value *Result2 = Builder.CreateIntToPtr(OverflowAreaAsInt, PTy);
++  OverflowAreaAsInt = Builder.CreateAdd(OverflowAreaAsInt, Builder.getInt32(isInt ? 4 : 8));
++  Builder.CreateStore(Builder.CreateIntToPtr(OverflowAreaAsInt, CharPtr), OverflowAreaPtr);
++  CGF.EmitBranch(Cont);
++
++  CGF.EmitBlock(Cont);
++
++  llvm::PHINode *Result = CGF.Builder.CreatePHI(PTy, 2, "vaarg.addr");
++  Result->addIncoming(Result1, UsingRegs);
++  Result->addIncoming(Result2, UsingOverflow);
++
++  if (Ty->isAggregateType()) {
++    llvm::Value *AGGPtr = Builder.CreateBitCast(Result, CharPtrPtr, "aggrptr")  ;
++    return Builder.CreateLoad(AGGPtr, false, "aggr");
++  }
++
++  return Result;
++}
++
+ bool
+ PPC32TargetCodeGenInfo::initDwarfEHRegSizeTable(CodeGen::CodeGenFunction &CGF,
+                                                 llvm::Value *Address) const {
+Index: tools/clang/test/CodeGen/ppc64-varargs-struct.c
+===================================================================
+--- tools/clang/test/CodeGen/ppc64-varargs-struct.c
++++ tools/clang/test/CodeGen/ppc64-varargs-struct.c
+@@ -1,30 +0,0 @@
+-// REQUIRES: ppc64-registered-target
+-// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu -emit-llvm -o - %s | FileCheck %s
+-
+-#include <stdarg.h>
+-
+-struct x {
+-  long a;
+-  double b;
+-};
+-
+-void testva (int n, ...)
+-{
+-  va_list ap;
+-
+-  struct x t = va_arg (ap, struct x);
+-// CHECK: bitcast i8* %{{[a-z.0-9]*}} to %struct.x*
+-// CHECK: bitcast %struct.x* %t to i8*
+-// CHECK: bitcast %struct.x* %{{[0-9]+}} to i8*
+-// CHECK: call void @llvm.memcpy
+-
+-  int v = va_arg (ap, int);
+-// CHECK: ptrtoint i8* %{{[a-z.0-9]*}} to i64
+-// CHECK: add i64 %{{[0-9]+}}, 4
+-// CHECK: inttoptr i64 %{{[0-9]+}} to i8*
+-// CHECK: bitcast i8* %{{[0-9]+}} to i32*
+-
+-  __int128_t u = va_arg (ap, __int128_t);
+-// CHECK: bitcast i8* %{{[a-z.0-9]+}} to i128*
+-// CHECK-NEXT: load i128* %{{[0-9]+}}
+-}
+Index: tools/clang/test/CodeGen/ppc-varargs-struct.c
+===================================================================
+--- tools/clang/test/CodeGen/ppc-varargs-struct.c
++++ tools/clang/test/CodeGen/ppc-varargs-struct.c
+@@ -0,0 +1,112 @@
++// REQUIRES: ppc64-registered-target
++// REQUIRES: asserts
++// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu -emit-llvm -o - %s | FileCheck %s
++// RUN: %clang_cc1 -triple powerpc-unknown-linux-gnu -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-PPC
++
++#include <stdarg.h>
++
++struct x {
++  long a;
++  double b;
++};
++
++void testva (int n, ...)
++{
++  va_list ap;
++
++  struct x t = va_arg (ap, struct x);
++// CHECK: bitcast i8* %{{[a-z.0-9]*}} to %struct.x*
++// CHECK: bitcast %struct.x* %t to i8*
++// CHECK: bitcast %struct.x* %{{[0-9]+}} to i8*
++// CHECK: call void @llvm.memcpy
++// CHECK-PPC:  [[ARRAYDECAY:%[a-z0-9]+]] = getelementptr inbounds [1 x %struct.__va_list_tag]* %ap, i32 0, i32 0
++// CHECK-PPC-NEXT:  [[GPRPTR:%[a-z0-9]+]] = bitcast %struct.__va_list_tag* [[ARRAYDECAY]] to i8*
++// CHECK-PPC-NEXT:  [[ZERO:%[0-9]+]] = ptrtoint i8* [[GPRPTR]] to i32
++// CHECK-PPC-NEXT:  [[ONE:%[0-9]+]] = add i32 [[ZERO]], 1
++// CHECK-PPC-NEXT:  [[TWO:%[0-9]+]] = inttoptr i32 [[ONE]] to i8*
++// CHECK-PPC-NEXT:  [[THREE:%[0-9]+]] = add i32 [[ONE]], 3
++// CHECK-PPC-NEXT:  [[FOUR:%[0-9]+]] = inttoptr i32 [[THREE]] to i8**
++// CHECK-PPC-NEXT:  [[FIVE:%[0-9]+]] = add i32 [[THREE]], 4
++// CHECK-PPC-NEXT:  [[SIX:%[0-9]+]] = inttoptr i32 [[FIVE]] to i8**
++// CHECK-PPC-NEXT:  [[GPR:%[a-z0-9]+]] = load i8* [[GPRPTR]]
++// CHECK-PPC-NEXT:  [[FPR:%[a-z0-9]+]] = load i8* [[TWO]] 
++// CHECK-PPC-NEXT:  [[OVERFLOW_AREA:%[a-z_0-9]+]] = load i8** [[FOUR]]
++// CHECK-PPC-NEXT:  [[SEVEN:%[0-9]+]] = ptrtoint i8* [[OVERFLOW_AREA]] to i32
++// CHECK-PPC-NEXT:  [[REGSAVE_AREA:%[a-z_0-9]+]] = load i8** [[SIX]]
++// CHECK-PPC-NEXT:  [[EIGHT:%[0-9]+]] = ptrtoint i8* [[REGSAVE_AREA]] to i32
++// CHECK-PPC-NEXT:  [[COND:%[a-z0-9]+]] = icmp ult i8 [[GPR]], 8
++// CHECK-PPC-NEXT:  [[NINE:%[0-9]+]] = mul i8 [[GPR]], 4
++// CHECK-PPC-NEXT:  [[TEN:%[0-9]+]] = sext i8 [[NINE]] to i32
++// CHECK-PPC-NEXT:  [[ELEVEN:%[0-9]+]] = add i32 [[EIGHT]], [[TEN]]
++// CHECK-PPC-NEXT:  br i1 [[COND]], label [[USING_REGS:%[a-z_0-9]+]], label [[USING_OVERFLOW:%[a-z_0-9]+]]
++//
++// CHECK-PPC1:[[USING_REGS]]
++// CHECK-PPC:  [[TWELVE:%[0-9]+]] = inttoptr i32 [[ELEVEN]] to %struct.x*
++// CHECK-PPC-NEXT:  [[THIRTEEN:%[0-9]+]] = add i8 [[GPR]], 1
++// CHECK-PPC-NEXT:  store i8 [[THIRTEEN]], i8* [[GPRPTR]]
++// CHECK-PPC-NEXT:  br label [[CONT:%[a-z0-9]+]]
++//
++// CHECK-PPC1:[[USING_OVERFLOW]]
++// CHECK-PPC:  [[FOURTEEN:%[0-9]+]] = inttoptr i32 [[SEVEN]] to %struct.x*
++// CHECK-PPC-NEXT:  [[FIFTEEN:%[0-9]+]] = add i32 [[SEVEN]], 4
++// CHECK-PPC-NEXT:  [[SIXTEEN:%[0-9]+]] = inttoptr i32 [[FIFTEEN]] to i8*
++// CHECK-PPC-NEXT:  store i8* [[SIXTEEN]], i8** [[FOUR]]
++// CHECK-PPC-NEXT:  br label [[CONT]]
++//
++// CHECK-PPC1:[[CONT]]
++// CHECK-PPC:  [[VAARG_ADDR:%[a-z.0-9]+]] = phi %struct.x* [ [[TWELVE]], [[USING_REGS]] ], [ [[FOURTEEN]], [[USING_OVERFLOW]] ]
++// CHECK-PPC-NEXT:  [[AGGRPTR:%[a-z0-9]+]] = bitcast %struct.x* [[VAARG_ADDR]] to i8**
++// CHECK-PPC-NEXT:  [[AGGR:%[a-z0-9]+]] = load i8** [[AGGRPTR]]
++// CHECK-PPC-NEXT:  [[SEVENTEEN:%[0-9]+]] = bitcast %struct.x* %t to i8*
++// CHECK-PPC-NEXT:  call void @llvm.memcpy.p0i8.p0i8.i32(i8* [[SEVENTEEN]], i8* [[AGGR]], i32 16, i32 8, i1 false)
++
++  int v = va_arg (ap, int);
++// CHECK: ptrtoint i8* %{{[a-z.0-9]*}} to i64
++// CHECK: add i64 %{{[0-9]+}}, 4
++// CHECK: inttoptr i64 %{{[0-9]+}} to i8*
++// CHECK: bitcast i8* %{{[0-9]+}} to i32*
++// CHECK-PPC:  [[ARRAYDECAY1:%[a-z0-9]+]] = getelementptr inbounds [1 x %struct.__va_list_tag]* %ap, i32 0, i32 0
++// CHECK-PPC-NEXT:  [[GPRPTR1:%[a-z0-9]+]] = bitcast %struct.__va_list_tag* [[ARRAYDECAY1]] to i8*
++// CHECK-PPC-NEXT:  [[EIGHTEEN:%[0-9]+]] = ptrtoint i8* [[GPRPTR1]] to i32
++// CHECK-PPC-NEXT:  [[NINETEEN:%[0-9]+]] = add i32 [[EIGHTEEN]], 1
++// CHECK-PPC-NEXT:  [[TWENTY:%[0-9]+]] = inttoptr i32 [[NINETEEN]] to i8*
++// CHECK-PPC-NEXT:  [[TWENTYONE:%[0-9]+]] = add i32 [[NINETEEN]], 3
++// CHECK-PPC-NEXT:  [[TWENTYTWO:%[0-9]+]] = inttoptr i32 [[TWENTYONE]] to i8**
++// CHECK-PPC-NEXT:  [[TWENTYTHREE:%[0-9]+]] = add i32 [[TWENTYONE]], 4
++// CHECK-PPC-NEXT:  [[TWENTYFOUR:%[0-9]+]] = inttoptr i32 [[TWENTYTHREE]] to i8**
++// CHECK-PPC-NEXT:  [[GPR1:%[a-z0-9]+]] = load i8* [[GPRPTR1]]
++// CHECK-PPC-NEXT:  [[FPR1:%[a-z0-9]+]] = load i8* [[TWENTY]]
++// CHECK-PPC-NEXT:  [[OVERFLOW_AREA1:%[a-z_0-9]+]] = load i8** [[TWENTYTWO]]
++// CHECK-PPC-NEXT:  [[TWENTYFIVE:%[0-9]+]] = ptrtoint i8* [[OVERFLOW_AREA1]] to i32
++// CHECK-PPC-NEXT:  [[REGSAVE_AREA1:%[a-z_0-9]+]] = load i8** [[TWENTYFOUR]]
++// CHECK-PPC-NEXT:  [[TWENTYSIX:%[0-9]+]] = ptrtoint i8* [[REGSAVE_AREA1]] to i32
++// CHECK-PPC-NEXT:  [[COND1:%[a-z0-9]+]] = icmp ult i8 [[GPR1]], 8
++// CHECK-PPC-NEXT:  [[TWENTYSEVEN:%[0-9]+]] = mul i8 [[GPR1]], 4
++// CHECK-PPC-NEXT:  [[TWENTYEIGHT:%[0-9]+]] = sext i8 [[TWENTYSEVEN]] to i32
++// CHECK-PPC-NEXT:  [[TWENTYNINE:%[0-9]+]] = add i32 [[TWENTYSIX]], [[TWENTYEIGHT]]
++// CHECK-PPC-NEXT:  br i1 [[COND1]], label [[USING_REGS1:%[a-z_0-9]+]], label [[USING_OVERFLOW1:%[a-z_0-9]+]]
++//
++// CHECK-PPC1:[[USING_REGS1]]:
++// CHECK-PPC:  [[THIRTY:%[0-9]+]] = inttoptr i32 [[TWENTYNINE]] to i32*
++// CHECK-PPC-NEXT:  [[THIRTYONE:%[0-9]+]] = add i8 [[GPR1]], 1
++// CHECK-PPC-NEXT:  store i8 [[THIRTYONE]], i8* [[GPRPTR1]]
++// CHECK-PPC-NEXT:  br label [[CONT1:%[a-z0-9]+]]
++//
++// CHECK-PPC1:[[USING_OVERFLOW1]]:
++// CHECK-PPC:  [[THIRTYTWO:%[0-9]+]] = inttoptr i32 [[TWENTYFIVE]] to i32*
++// CHECK-PPC-NEXT:  [[THIRTYTHREE:%[0-9]+]] = add i32 [[TWENTYFIVE]], 4
++// CHECK-PPC-NEXT:  [[THIRTYFOUR:%[0-9]+]] = inttoptr i32 [[THIRTYTHREE]] to i8*
++// CHECK-PPC-NEXT:  store i8* [[THIRTYFOUR]], i8** [[TWENTYTWO]]
++// CHECK-PPC-NEXT:  br label [[CONT1]]
++//
++// CHECK-PPC1:[[CONT1]]:
++// CHECK-PPC:  [[VAARG_ADDR1:%[a-z.0-9]+]] = phi i32* [ [[THIRTY]], [[USING_REGS1]] ], [ [[THIRTYTWO]], [[USING_OVERFLOW1]] ]
++// CHECK-PPC-NEXT:  [[THIRTYFIVE:%[0-9]+]] = load i32* [[VAARG_ADDR1]]
++// CHECK-PPC-NEXT:  store i32 [[THIRTYFIVE]], i32* %v, align 4
++
++#ifdef __powerpc64__
++  __int128_t u = va_arg (ap, __int128_t);
++#endif
++// CHECK: bitcast i8* %{{[a-z.0-9]+}} to i128*
++// CHECK-NEXT: load i128* %{{[0-9]+}}
++}
diff --git a/contrib/llvm/patches/patch-r279302-clang-r211785-add-fuse-ld.diff b/contrib/llvm/patches/patch-r279302-clang-r211785-add-fuse-ld.diff
new file mode 100644
index 0000000..4da75d6
--- /dev/null
+++ b/contrib/llvm/patches/patch-r279302-clang-r211785-add-fuse-ld.diff
@@ -0,0 +1,342 @@
+Pull in r211785 from upstream clang trunk (by Logan Chien):
+
+  Implement the -fuse-ld= option.
+
+  This commit implements the -fuse-ld= option, so that the user
+  can specify -fuse-ld=bfd to use ld.bfd.
+
+  This commit re-applies r194328 with some test case changes.
+  It seems that r194328 was breaking macosx or mingw build
+  because clang can't find ld.bfd or ld.gold in the given sysroot.
+  We should use -B to specify the executable search path instead.
+
+  Patch originally by David Chisnall.
+
+Pull in r211786 from upstream clang trunk (by Logan Chien):
+
+  Propset the executables for GetProgramPath().
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/279302
+
+Index: tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
+===================================================================
+--- tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
++++ tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
+@@ -20,6 +20,8 @@ def err_drv_unknown_stdin_type : Error<
+ def err_drv_unknown_language : Error<"language not recognized: '%0'">;
+ def err_drv_invalid_arch_name : Error<
+   "invalid arch name '%0'">;
++def err_drv_invalid_linker_name : Error<
++  "invalid linker name in argument '%0'">;
+ def err_drv_invalid_rtlib_name : Error<
+   "invalid runtime library name in argument '%0'">;
+ def err_drv_unsupported_rtlib_for_platform : Error<
+Index: tools/clang/include/clang/Driver/Options.td
+===================================================================
+--- tools/clang/include/clang/Driver/Options.td
++++ tools/clang/include/clang/Driver/Options.td
+@@ -1453,7 +1453,7 @@ def fprofile_dir : Joined<["-"], "fprofile-dir=">,
+ 
+ defm profile_use : BooleanFFlag<"profile-use">, Group<clang_ignored_f_Group>;
+ def fprofile_use_EQ : Joined<["-"], "fprofile-use=">, Group<clang_ignored_f_Group>;
+-def fuse_ld_EQ : Joined<["-"], "fuse-ld=">, Group<clang_ignored_f_Group>;
++def fuse_ld_EQ : Joined<["-"], "fuse-ld=">, Group<f_Group>;
+ 
+ defm align_functions : BooleanFFlag<"align-functions">, Group<clang_ignored_f_Group>;
+ def falign_functions_EQ : Joined<["-"], "falign-functions=">, Group<clang_ignored_f_Group>;
+Index: tools/clang/include/clang/Driver/ToolChain.h
+===================================================================
+--- tools/clang/include/clang/Driver/ToolChain.h
++++ tools/clang/include/clang/Driver/ToolChain.h
+@@ -150,6 +150,10 @@ class ToolChain {
+   std::string GetFilePath(const char *Name) const;
+   std::string GetProgramPath(const char *Name) const;
+ 
++  /// Returns the linker path, respecting the -fuse-ld= argument to determine
++  /// the linker suffix or name.
++  std::string GetLinkerPath() const;
++
+   /// \brief Dispatch to the specific toolchain for verbose printing.
+   ///
+   /// This is used when handling the verbose option to print detailed,
+Index: tools/clang/lib/Driver/ToolChain.cpp
+===================================================================
+--- tools/clang/lib/Driver/ToolChain.cpp
++++ tools/clang/lib/Driver/ToolChain.cpp
+@@ -15,6 +15,7 @@
+ #include "clang/Driver/Options.h"
+ #include "clang/Driver/SanitizerArgs.h"
+ #include "clang/Driver/ToolChain.h"
++#include "llvm/ADT/SmallString.h"
+ #include "llvm/ADT/StringSwitch.h"
+ #include "llvm/Option/Arg.h"
+ #include "llvm/Option/ArgList.h"
+@@ -146,6 +147,30 @@ std::string ToolChain::GetProgramPath(const char *
+   return D.GetProgramPath(Name, *this);
+ }
+ 
++std::string ToolChain::GetLinkerPath() const {
++  if (Arg *A = Args.getLastArg(options::OPT_fuse_ld_EQ)) {
++    StringRef Suffix = A->getValue();
++
++    // If we're passed -fuse-ld= with no argument, or with the argument ld,
++    // then use whatever the default system linker is.
++    if (Suffix.empty() || Suffix == "ld")
++      return GetProgramPath("ld");
++
++    llvm::SmallString<8> LinkerName("ld.");
++    LinkerName.append(Suffix);
++
++    std::string LinkerPath(GetProgramPath(LinkerName.c_str()));
++    if (llvm::sys::fs::exists(LinkerPath))
++      return LinkerPath;
++
++    getDriver().Diag(diag::err_drv_invalid_linker_name) << A->getAsString(Args);
++    return "";
++  }
++
++  return GetProgramPath("ld");
++}
++
++
+ types::ID ToolChain::LookupTypeForExtension(const char *Ext) const {
+   return types::lookupTypeForExtension(Ext);
+ }
+Index: tools/clang/lib/Driver/ToolChains.cpp
+===================================================================
+--- tools/clang/lib/Driver/ToolChains.cpp
++++ tools/clang/lib/Driver/ToolChains.cpp
+@@ -2420,7 +2420,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &
+   PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
+                          GCCInstallation.getTriple().str() + "/bin").str());
+ 
+-  Linker = GetProgramPath("ld");
++  Linker = GetLinkerPath();
+ 
+   Distro Distro = DetectDistro(Arch);
+ 
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -5088,7 +5088,7 @@ void darwin::Link::ConstructJob(Compilation &C, co
+   Args.AddAllArgs(CmdArgs, options::OPT_F);
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString(getToolChain().GetLinkerPath());
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5285,7 +5285,7 @@ void solaris::Link::ConstructJob(Compilation &C, c
+   addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString(getToolChain().GetLinkerPath());
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5397,7 +5397,7 @@ void auroraux::Link::ConstructJob(Compilation &C,
+   addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString(getToolChain().GetLinkerPath());
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5587,7 +5587,7 @@ void openbsd::Link::ConstructJob(Compilation &C, c
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString(getToolChain().GetLinkerPath());
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -5727,7 +5727,7 @@ void bitrig::Link::ConstructJob(Compilation &C, co
+   }
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString(getToolChain().GetLinkerPath());
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6016,7 +6016,7 @@ void freebsd::Link::ConstructJob(Compilation &C, c
+   addProfileRT(ToolChain, Args, CmdArgs, ToolChain.getTriple());
+ 
+   const char *Exec =
+-    Args.MakeArgString(ToolChain.GetProgramPath("ld"));
++    Args.MakeArgString(ToolChain.GetLinkerPath());
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6204,7 +6204,7 @@ void netbsd::Link::ConstructJob(Compilation &C, co
+ 
+   addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
+ 
+-  const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++  const char *Exec = Args.MakeArgString(getToolChain().GetLinkerPath());
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6749,7 +6749,7 @@ void minix::Link::ConstructJob(Compilation &C, con
+          Args.MakeArgString(getToolChain().GetFilePath("crtend.o")));
+   }
+ 
+-  const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++  const char *Exec = Args.MakeArgString(getToolChain().GetLinkerPath());
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+@@ -6933,7 +6933,7 @@ void dragonfly::Link::ConstructJob(Compilation &C,
+   addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
+ 
+   const char *Exec =
+-    Args.MakeArgString(getToolChain().GetProgramPath("ld"));
++    Args.MakeArgString(getToolChain().GetLinkerPath());
+   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
+ }
+ 
+Index: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld
+===================================================================
+
+Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld.bfd
+===================================================================
+
+Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld.bfd
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld.gold
+===================================================================
+
+Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld.gold
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld
+===================================================================
+
+Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.bfd
+===================================================================
+
+Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.bfd
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.gold
+===================================================================
+
+Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.gold
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: tools/clang/test/Driver/Inputs/basic_freebsd_tree/usr/bin/ld.bfd
+===================================================================
+
+Property changes on: tools/clang/test/Driver/Inputs/basic_freebsd_tree/usr/bin/ld.bfd
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: tools/clang/test/Driver/Inputs/basic_freebsd_tree/usr/bin/ld.gold
+===================================================================
+
+Property changes on: tools/clang/test/Driver/Inputs/basic_freebsd_tree/usr/bin/ld.gold
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: tools/clang/test/Driver/fuse-ld.c
+===================================================================
+--- tools/clang/test/Driver/fuse-ld.c
++++ tools/clang/test/Driver/fuse-ld.c
+@@ -0,0 +1,63 @@
++// RUN: %clang %s -### \
++// RUN:     -target x86_64-unknown-freebsd 2>&1 \
++// RUN:   | FileCheck %s --check-prefix=CHECK-FREEBSD-LD
++// CHECK-FREEBSD-LD: ld
++
++// RUN: %clang %s -### -fuse-ld=bfd \
++// RUN:     --sysroot=%S/Inputs/basic_freebsd_tree \
++// RUN:     -target x86_64-unknown-freebsd \
++// RUN:     -B%S/Inputs/basic_freebsd_tree/usr/bin 2>&1 \
++// RUN:   | FileCheck %s -check-prefix=CHECK-FREEBSD-BFD
++// CHECK-FREEBSD-BFD: Inputs/basic_freebsd_tree/usr/bin/ld.bfd
++
++// RUN: %clang %s -### -fuse-ld=gold \
++// RUN:     --sysroot=%S/Inputs/basic_freebsd_tree \
++// RUN:     -target x86_64-unknown-freebsd \
++// RUN:     -B%S/Inputs/basic_freebsd_tree/usr/bin 2>&1 \
++// RUN:   | FileCheck %s -check-prefix=CHECK-FREEBSD-GOLD
++// CHECK-FREEBSD-GOLD: Inputs/basic_freebsd_tree/usr/bin/ld.gold
++
++// RUN: %clang %s -### -fuse-ld=plib \
++// RUN:     --sysroot=%S/Inputs/basic_freebsd_tree \
++// RUN:     -target x86_64-unknown-freebsd \
++// RUN:     -B%S/Inputs/basic_freebsd_tree/usr/bin 2>&1 \
++// RUN:   | FileCheck %s -check-prefix=CHECK-FREEBSD-PLIB
++// CHECK-FREEBSD-PLIB: error: invalid linker name
++
++
++
++// RUN: %clang %s -### \
++// RUN:     -target arm-linux-androideabi \
++// RUN:     -B%S/Inputs/basic_android_tree/bin 2>&1 \
++// RUN:   | FileCheck %s --check-prefix=CHECK-ANDROID-ARM-LD
++// CHECK-ANDROID-ARM-LD: Inputs/basic_android_tree/bin/arm-linux-androideabi-ld
++
++// RUN: %clang %s -### -fuse-ld=bfd \
++// RUN:     -target arm-linux-androideabi \
++// RUN:     -B%S/Inputs/basic_android_tree/bin 2>&1 \
++// RUN:   | FileCheck %s -check-prefix=CHECK-ANDROID-ARM-BFD
++// CHECK-ANDROID-ARM-BFD: Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.bfd
++
++// RUN: %clang %s -### -fuse-ld=gold \
++// RUN:     -target arm-linux-androideabi \
++// RUN:     -B%S/Inputs/basic_android_tree/bin 2>&1 \
++// RUN:   | FileCheck %s -check-prefix=CHECK-ANDROID-ARM-GOLD
++// CHECK-ANDROID-ARM-GOLD: Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.gold
++
++// RUN: %clang %s -### \
++// RUN:     -target arm-linux-androideabi \
++// RUN:     -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
++// RUN:   | FileCheck %s --check-prefix=CHECK-ANDROID-ARM-LD-TC
++// CHECK-ANDROID-ARM-LD-TC: Inputs/basic_android_tree/lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld
++
++// RUN: %clang %s -### -fuse-ld=bfd \
++// RUN:     -target arm-linux-androideabi \
++// RUN:     -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
++// RUN:   | FileCheck %s -check-prefix=CHECK-ANDROID-ARM-BFD-TC
++// CHECK-ANDROID-ARM-BFD-TC: Inputs/basic_android_tree/lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld.bfd
++
++// RUN: %clang %s -### -fuse-ld=gold \
++// RUN:     -target arm-linux-androideabi \
++// RUN:     -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
++// RUN:   | FileCheck %s -check-prefix=CHECK-ANDROID-ARM-GOLD-TC
++// CHECK-ANDROID-ARM-GOLD-TC: Inputs/basic_android_tree/lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld.gold