Index: test/lit.cfg.py
===================================================================
--- test/lit.cfg.py
+++ test/lit.cfg.py
@@ -239,7 +239,7 @@
 
 
 def have_ld_plugin_support():
-    if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')):
+    if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold' + config.llvm_shlib_ext)):
         return False
 
     ld_cmd = subprocess.Popen(
Index: test/tools/gold/X86/Inputs/common.ll
===================================================================
--- test/tools/gold/X86/Inputs/common.ll
+++ test/tools/gold/X86/Inputs/common.ll
@@ -1,3 +1,4 @@
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
 
 @a = common global i32 0, align 4
Index: test/tools/gold/X86/Inputs/common2.ll
===================================================================
--- test/tools/gold/X86/Inputs/common2.ll
+++ test/tools/gold/X86/Inputs/common2.ll
@@ -1,3 +1,4 @@
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
 
 @a = common global i8 0, align 16
Index: test/tools/gold/X86/Inputs/common3.ll
===================================================================
--- test/tools/gold/X86/Inputs/common3.ll
+++ test/tools/gold/X86/Inputs/common3.ll
@@ -1,3 +1,4 @@
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
 
 @a = common global i8 0, align 1
Index: test/tools/gold/X86/Inputs/drop-linkage.ll
===================================================================
--- test/tools/gold/X86/Inputs/drop-linkage.ll
+++ test/tools/gold/X86/Inputs/drop-linkage.ll
@@ -1,4 +1,5 @@
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
 
 $foo = comdat any
 define linkonce void @foo() comdat {
Index: test/tools/gold/X86/common.ll
===================================================================
--- test/tools/gold/X86/common.ll
+++ test/tools/gold/X86/common.ll
@@ -4,6 +4,7 @@
 ; RUN: llvm-as %p/Inputs/common3.ll -o %t2c.o
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
 
 @a = common global i16 0, align 8
 
Index: test/tools/gold/X86/drop-linkage.ll
===================================================================
--- test/tools/gold/X86/drop-linkage.ll
+++ test/tools/gold/X86/drop-linkage.ll
@@ -1,5 +1,5 @@
 ; RUN: llc %s -o %t.s
-; RUN: llvm-mc %t.s -o %t.o -filetype=obj
+; RUN: llvm-mc %t.s -o %t.o -filetype=obj -triple=x86_64-unknown-linux-gnu
 ; RUN: llvm-as %p/Inputs/drop-linkage.ll -o %t2.o
 
 ; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
@@ -8,6 +8,7 @@
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
 
 define void @foo() {
   ret void
Index: test/tools/gold/X86/thinlto_archive.ll
===================================================================
--- test/tools/gold/X86/thinlto_archive.ll
+++ test/tools/gold/X86/thinlto_archive.ll
@@ -4,7 +4,7 @@
 ; RUN: opt -module-summary %p/Inputs/thinlto_archive2.ll -o %t3.o
 
 ; Generate the static library
-; RUN: llvm-ar r %t.a %t2.o %t3.o
+; RUN: llvm-ar -format=gnu r %t.a %t2.o %t3.o
 
 ; Test importing from archive library via gold, using jobs=1 to ensure
 ; output messages are not interleaved.