Index: llvm/trunk/test/tools/gold/PowerPC/mtriple.ll
===================================================================
--- llvm/trunk/test/tools/gold/PowerPC/mtriple.ll
+++ llvm/trunk/test/tools/gold/PowerPC/mtriple.ll
@@ -1,7 +1,7 @@
 ; REQUIRES: ld_emu_elf32ppc
 
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so -m elf32ppc \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -m elf32ppc \
 ; RUN:    -plugin-opt=mtriple=powerpc-linux-gnu \
 ; RUN:    -plugin-opt=obj-path=%t3.o \
 ; RUN:    -shared %t.o -o %t2
Index: llvm/trunk/test/tools/gold/X86/alias.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/alias.ll
+++ llvm/trunk/test/tools/gold/X86/alias.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/alias-1.ll -o %t2.o
-; RUN: %gold -shared -o %t3.o -plugin %llvmshlibdir/LLVMgold.so %t2.o %t.o \
+; RUN: %gold -shared -o %t3.o -plugin %llvmshlibdir/LLVMgold%shlibext %t2.o %t.o \
 ; RUN:  -plugin-opt=emit-llvm
 ; RUN: llvm-dis < %t3.o -o - | FileCheck %s
 
Index: llvm/trunk/test/tools/gold/X86/alias2.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/alias2.ll
+++ llvm/trunk/test/tools/gold/X86/alias2.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -shared -o %t2.bc -plugin %llvmshlibdir/LLVMgold.so %t.o -plugin-opt=emit-llvm
+; RUN: %gold -shared -o %t2.bc -plugin %llvmshlibdir/LLVMgold%shlibext %t.o -plugin-opt=emit-llvm
 ; RUN: llvm-dis %t2.bc -o - | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
Index: llvm/trunk/test/tools/gold/X86/asm_undefined.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/asm_undefined.ll
+++ llvm/trunk/test/tools/gold/X86/asm_undefined.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -shared -m elf_x86_64 -o %t2 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -shared -m elf_x86_64 -o %t2 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN: %t.o --plugin-opt=save-temps
 ; RUN: llvm-nm %t2 | FileCheck %s --check-prefix=OUTPUT
 
Index: llvm/trunk/test/tools/gold/X86/asm_undefined2.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/asm_undefined2.ll
+++ llvm/trunk/test/tools/gold/X86/asm_undefined2.ll
@@ -1,12 +1,12 @@
 ; RegularLTO testcase
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -shared -m elf_x86_64 -o %t2 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -shared -m elf_x86_64 -o %t2 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN: %t.o --plugin-opt=save-temps -upatatino
 ; RUN: llvm-dis < %t2.0.5.precodegen.bc | FileCheck %s
 
 ; ThinLTO testcase
 ; RUN: opt -module-summary %s -o %t.o
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=save-temps \
 ; RUN:     --plugin-opt=thinlto -o %t2 %t.o
 ; RUN: llvm-dis < %t.o.5.precodegen.bc | FileCheck --check-prefix=CHECKTHIN %s
Index: llvm/trunk/test/tools/gold/X86/available-externally.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/available-externally.ll
+++ llvm/trunk/test/tools/gold/X86/available-externally.ll
@@ -1,12 +1,12 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/available-externally.ll -o %t2.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o %t2.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t2.o %t.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/bad-alias.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/bad-alias.ll
+++ llvm/trunk/test/tools/gold/X86/bad-alias.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 
-; RUN: not %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: not %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o -o %t2.o 2>&1 | FileCheck %s
 
Index: llvm/trunk/test/tools/gold/X86/bcsection.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/bcsection.ll
+++ llvm/trunk/test/tools/gold/X86/bcsection.ll
@@ -3,7 +3,7 @@
 
 ; RUN: llvm-mc -I=%t -filetype=obj -triple=x86_64-unknown-unknown -o %t/bcsection.bco %p/Inputs/bcsection.s
 ; RUN: llvm-nm -no-llvm-bc %t/bcsection.bco | count 0
-; RUN: %gold -r -o %t/bcsection.o -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so %t/bcsection.bco
+; RUN: %gold -r -o %t/bcsection.o -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext %t/bcsection.bco
 ; RUN: llvm-nm -no-llvm-bc %t/bcsection.o | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
Index: llvm/trunk/test/tools/gold/X86/cache.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/cache.ll
+++ llvm/trunk/test/tools/gold/X86/cache.ll
@@ -3,7 +3,7 @@
 ; RUN: opt -module-summary %p/Inputs/cache.ll -o %t2.o
 
 ; RUN: rm -Rf %t.cache
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=cache-dir=%t.cache \
 ; RUN:     -o %t3.o %t2.o %t.o
@@ -17,7 +17,7 @@
 ; RUN: opt -module-hash -module-summary %p/Inputs/cache.ll -o %t2.o
 
 ; RUN: rm -Rf %t.cache
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=cache-dir=%t.cache \
 ; RUN:     -o %t3.o %t2.o %t.o
@@ -29,7 +29,7 @@
 ; We should only remove files matching the pattern "llvmcache-*".
 
 ; RUN: touch -t 197001011200 %t.cache/llvmcache-foo %t.cache/foo
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=cache-dir=%t.cache \
 ; RUN:     --plugin-opt=cache-policy=prune_after=1h:prune_interval=0s \
@@ -43,7 +43,7 @@
 ; RUN: %python -c "print(' ' * 65536)" > %t.cache/llvmcache-foo
 
 ; This should leave the file in place.
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=cache-dir=%t.cache \
 ; RUN:     --plugin-opt=cache-policy=cache_size_bytes=128k:prune_interval=0s \
@@ -52,7 +52,7 @@
 
 
 ; This should remove it.
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=cache-dir=%t.cache \
 ; RUN:     --plugin-opt=cache-policy=cache_size_bytes=32k:prune_interval=0s \
Index: llvm/trunk/test/tools/gold/X86/coff.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/coff.ll
+++ llvm/trunk/test/tools/gold/X86/coff.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so -plugin-opt=emit-llvm \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o -o - | FileCheck %s
 
Index: llvm/trunk/test/tools/gold/X86/comdat.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/comdat.ll
+++ llvm/trunk/test/tools/gold/X86/comdat.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: llvm-as %p/Inputs/comdat.ll -o %t2.o
-; RUN: %gold -shared -o %t3.o -plugin %llvmshlibdir/LLVMgold.so %t1.o %t2.o \
+; RUN: %gold -shared -o %t3.o -plugin %llvmshlibdir/LLVMgold%shlibext %t1.o %t2.o \
 ; RUN:  -m elf_x86_64 \
 ; RUN:  -plugin-opt=save-temps
 ; RUN: FileCheck --check-prefix=RES %s < %t3.o.resolution.txt
Index: llvm/trunk/test/tools/gold/X86/comdat2.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/comdat2.ll
+++ llvm/trunk/test/tools/gold/X86/comdat2.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.bc
 ; RUN: llvm-as %p/Inputs/comdat2.ll -o %t2.bc
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.bc %t2.bc -o %t3.bc
 ; RUN: llvm-dis %t3.bc -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/common.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/common.ll
+++ llvm/trunk/test/tools/gold/X86/common.ll
@@ -7,7 +7,7 @@
 
 @a = common global i16 0, align 8
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t1.o %t2.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s --check-prefix=A
@@ -15,7 +15,7 @@
 ; Shared library case, we merge @a as common and keep it for the symbol table.
 ; A: @a = common global [4 x i8] zeroinitializer, align 8
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t1.o %t2b.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s --check-prefix=B
@@ -23,7 +23,7 @@
 ; (i16 align 8) + (i8 align 16) = i16 align 16
 ; B: @a = common global i16 0, align 16
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t1.o %t2c.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s --check-prefix=C
@@ -31,7 +31,7 @@
 ; (i16 align 8) + (i8 align 1) = i16 align 8.
 ; C: @a = common global i16 0, align 8
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    %t1.o %t2.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck --check-prefix=EXEC %s
@@ -40,7 +40,7 @@
 ; EXEC: @a = internal global [4 x i8] zeroinitializer, align 8
 
 ; RUN: llc %p/Inputs/common.ll -o %t2native.o -filetype=obj
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    %t1.o %t2native.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck --check-prefix=MIXED %s
Index: llvm/trunk/test/tools/gold/X86/common_thinlto.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/common_thinlto.ll
+++ llvm/trunk/test/tools/gold/X86/common_thinlto.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -module-summary %s -o %t1.o
 ; RUN: opt -module-summary %p/Inputs/common_thinlto.ll -o %t2.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    -m elf_x86_64 \
Index: llvm/trunk/test/tools/gold/X86/ctors.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/ctors.ll
+++ llvm/trunk/test/tools/gold/X86/ctors.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/ctors2.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/ctors2.ll
+++ llvm/trunk/test/tools/gold/X86/ctors2.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/ctors2.ll -o %t2.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o %t2.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/disable-verify.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/disable-verify.ll
+++ llvm/trunk/test/tools/gold/X86/disable-verify.ll
@@ -1,12 +1,12 @@
 ; RUN: llvm-as %s -o %t.o
 ; REQUIRES: asserts
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=disable-verify \
 ; RUN:    --plugin-opt=-debug-pass=Arguments \
 ; RUN:    -shared %t.o -o %t2.o 2>&1 | FileCheck %s
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=-debug-pass=Arguments \
 ; RUN:    -shared %t.o -o %t2.o 2>&1 | FileCheck %s -check-prefix=VERIFY
 
Index: llvm/trunk/test/tools/gold/X86/drop-debug.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/drop-debug.ll
+++ llvm/trunk/test/tools/gold/X86/drop-debug.ll
@@ -1,4 +1,4 @@
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm -shared %p/Inputs/drop-debug.bc \
 ; RUN:    -o t2.bc 2>&1 | FileCheck %s
 
Index: llvm/trunk/test/tools/gold/X86/drop-linkage.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/drop-linkage.ll
+++ llvm/trunk/test/tools/gold/X86/drop-linkage.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-mc %t.s -o %t.o -filetype=obj
 ; RUN: llvm-as %p/Inputs/drop-linkage.ll -o %t2.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o %t2.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/emit-llvm.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/emit-llvm.ll
+++ llvm/trunk/test/tools/gold/X86/emit-llvm.ll
@@ -1,11 +1,11 @@
 ; RUN: llvm-as %s -o %t.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o -o - | FileCheck %s
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     -m elf_x86_64 --plugin-opt=save-temps \
 ; RUN:    -shared %t.o -o %t3.o
 ; RUN: FileCheck --check-prefix=RES %s < %t3.o.resolution.txt
@@ -15,7 +15,7 @@
 ; RUN: llvm-nm %t3.o.o | FileCheck --check-prefix=NM %s
 
 ; RUN: rm -f %t4.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     -m elf_x86_64 --plugin-opt=disable-output \
 ; RUN:    -shared %t.o -o %t4.o
 ; RUN: not test -a %t4.o
Index: llvm/trunk/test/tools/gold/X86/error-unopenable.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/error-unopenable.ll
+++ llvm/trunk/test/tools/gold/X86/error-unopenable.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as -o %t %s
-; RUN: not %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: not %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=obj-path=%t/nonexistent-dir/foo.o \
 ; RUN:    %t -o %t2 2>&1 | FileCheck %s
 
Index: llvm/trunk/test/tools/gold/X86/global_with_section.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/global_with_section.ll
+++ llvm/trunk/test/tools/gold/X86/global_with_section.ll
@@ -7,7 +7,7 @@
 ; RUN: opt %s -o %t.o
 ; RUN: llvm-lto2 dump-symtab %t.o | FileCheck %s --check-prefix=SYMTAB
 ; RUN: opt %p/Inputs/global_with_section.ll -o %t2.o
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=save-temps \
 ; RUN:     -o %t3.o %t.o %t2.o
 ; Check results of internalization
@@ -17,7 +17,7 @@
 ; RUN: opt -module-summary %s -o %t.o
 ; RUN: llvm-lto2 dump-symtab %t.o | FileCheck %s --check-prefix=SYMTAB
 ; RUN: opt -module-summary %p/Inputs/global_with_section.ll -o %t2.o
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=save-temps \
 ; RUN:     -o %t3.o %t.o %t2.o
Index: llvm/trunk/test/tools/gold/X86/invalid.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/invalid.ll
+++ llvm/trunk/test/tools/gold/X86/invalid.ll
@@ -1,4 +1,4 @@
-; RUN: not %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: not %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    %p/Inputs/invalid.bc -o %t2 2>&1 | FileCheck %s
 
 ; test that only one error gets printed
Index: llvm/trunk/test/tools/gold/X86/irmover-error.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/irmover-error.ll
+++ llvm/trunk/test/tools/gold/X86/irmover-error.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as -o %t1.bc %s
 ; RUN: llvm-as -o %t2.bc %S/Inputs/irmover-error.ll
-; RUN: not %gold -plugin %llvmshlibdir/LLVMgold.so -o %t %t1.bc %t2.bc 2>&1 | FileCheck %s
+; RUN: not %gold -plugin %llvmshlibdir/LLVMgold%shlibext -o %t %t1.bc %t2.bc 2>&1 | FileCheck %s
 
 ; CHECK: fatal error: Failed to link module {{.*}}2.bc: linking module flags 'foo': IDs have conflicting values
 
Index: llvm/trunk/test/tools/gold/X86/linker-script.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/linker-script.ll
+++ llvm/trunk/test/tools/gold/X86/linker-script.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o -o %t2.o \
 ; RUN:    -version-script=%p/Inputs/linker-script.export
Index: llvm/trunk/test/tools/gold/X86/linkonce-weak.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/linkonce-weak.ll
+++ llvm/trunk/test/tools/gold/X86/linkonce-weak.ll
@@ -1,12 +1,12 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/linkonce-weak.ll -o %t2.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o %t2.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t2.o %t.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/mixed_lto.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/mixed_lto.ll
+++ llvm/trunk/test/tools/gold/X86/mixed_lto.ll
@@ -2,7 +2,7 @@
 ; RUN: opt %s -o %t.o
 ; RUN: opt -module-summary %p/Inputs/mixed_lto.ll -o %t2.o
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     -shared \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=-import-instr-limit=0 \
Index: llvm/trunk/test/tools/gold/X86/module_asm.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/module_asm.ll
+++ llvm/trunk/test/tools/gold/X86/module_asm.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -shared -m elf_x86_64 -o %t2 -plugin %llvmshlibdir/LLVMgold.so %t.o
+; RUN: %gold -shared -m elf_x86_64 -o %t2 -plugin %llvmshlibdir/LLVMgold%shlibext %t.o
 ; RUN: llvm-nm %t2 | FileCheck %s
 ; CHECK: PrepareAndDispatch
 
Index: llvm/trunk/test/tools/gold/X86/multiple-data.s
===================================================================
--- llvm/trunk/test/tools/gold/X86/multiple-data.s
+++ llvm/trunk/test/tools/gold/X86/multiple-data.s
@@ -4,7 +4,7 @@
 
 # RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-unknown-linux-gnu
 # RUN: llvm-as %p/Inputs/multiple-data.ll -o %t2.o
-# RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+# RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 # RUN:     -m elf_x86_64 -o %t.exe %t2.o %t.o  \
 # RUN:     --section-ordering-file=%t_order_lto.txt
 # RUN: llvm-readobj -elf-output-style=GNU -t %t.exe | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/multiple-sections.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/multiple-sections.ll
+++ llvm/trunk/test/tools/gold/X86/multiple-sections.ll
@@ -2,7 +2,7 @@
 ; RUN: echo ".text._start" >> %t_order_lto.txt
 ; RUN: echo ".text.pat" >> %t_order_lto.txt
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     -m elf_x86_64 -o %t.exe %t.o \
 ; RUN:     --section-ordering-file=%t_order_lto.txt
 ; RUN: llvm-readobj -elf-output-style=GNU -t %t.exe | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/no-map-whole-file.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/no-map-whole-file.ll
+++ llvm/trunk/test/tools/gold/X86/no-map-whole-file.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as -o %t.bc %s
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so -plugin-opt=emit-llvm \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=emit-llvm \
 ; RUN:    --no-map-whole-files -r -o %t2.bc %t.bc
 ; RUN: llvm-dis < %t2.bc -o - | FileCheck %s
 
Index: llvm/trunk/test/tools/gold/X86/opt-level.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/opt-level.ll
+++ llvm/trunk/test/tools/gold/X86/opt-level.ll
@@ -1,13 +1,13 @@
 ; RUN: llvm-as -o %t.bc %s
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so -plugin-opt=save-temps \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=save-temps \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    -plugin-opt=O0 -r -o %t.o %t.bc
 ; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O0 %s
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so -plugin-opt=save-temps \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=save-temps \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    -plugin-opt=O1 -r -o %t.o %t.bc
 ; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O1 %s
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so -plugin-opt=save-temps \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext -plugin-opt=save-temps \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    -plugin-opt=O2 -r -o %t.o %t.bc
 ; RUN: llvm-dis < %t.o.0.4.opt.bc -o - | FileCheck --check-prefix=CHECK-O2 %s
Index: llvm/trunk/test/tools/gold/X86/parallel.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/parallel.ll
+++ llvm/trunk/test/tools/gold/X86/parallel.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as -o %t.bc %s
 ; RUN: rm -f %t.0.5.precodegen.bc %t.1.5.precodegen.bc %t.o %t.o1
-; RUN: env LD_PRELOAD=%llvmshlibdir/LLVMgold.so %gold -plugin %llvmshlibdir/LLVMgold.so -u foo -u bar -plugin-opt lto-partitions=2 -plugin-opt save-temps -m elf_x86_64 -o %t %t.bc
+; RUN: env LD_PRELOAD=%llvmshlibdir/LLVMgold%shlibext %gold -plugin %llvmshlibdir/LLVMgold%shlibext -u foo -u bar -plugin-opt lto-partitions=2 -plugin-opt save-temps -m elf_x86_64 -o %t %t.bc
 ; RUN: llvm-dis %t.0.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC0 %s
 ; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s
 ; RUN: llvm-nm %t.o | FileCheck --check-prefix=CHECK0 %s
Index: llvm/trunk/test/tools/gold/X86/pr19901.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/pr19901.ll
+++ llvm/trunk/test/tools/gold/X86/pr19901.ll
@@ -1,6 +1,6 @@
 ; RUN: llc %s -o %t.o -filetype=obj -relocation-model=pic
 ; RUN: llvm-as %p/Inputs/pr19901-1.ll -o %t2.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     -shared -m elf_x86_64 -o %t.so %t2.o %t.o
 ; RUN: llvm-readobj -t %t.so | FileCheck %s
 
Index: llvm/trunk/test/tools/gold/X86/pr19901_thinlto.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/pr19901_thinlto.ll
+++ llvm/trunk/test/tools/gold/X86/pr19901_thinlto.ll
@@ -1,6 +1,6 @@
 ; RUN: llc %s -o %t.o -filetype=obj -relocation-model=pic
 ; RUN: opt -module-summary %p/Inputs/pr19901-1.ll -o %t2.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     -shared -m elf_x86_64 -o %t.so %t2.o %t.o
 ; RUN: llvm-readobj -t %t.so | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/pr25907.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/pr25907.ll
+++ llvm/trunk/test/tools/gold/X86/pr25907.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    -shared %t.o -o %t2
 ; RUN: llvm-nm %t2 | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/pr25915.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/pr25915.ll
+++ llvm/trunk/test/tools/gold/X86/pr25915.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o -o %t2
 ; RUN: llvm-dis %t2 -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/relax-relocs.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/relax-relocs.ll
+++ llvm/trunk/test/tools/gold/X86/relax-relocs.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    -shared %t.o -o %t.so
 ; RUN: llvm-readobj -r %t.so.o | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/relocatable.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/relocatable.ll
+++ llvm/trunk/test/tools/gold/X86/relocatable.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t1.o
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -r %t1.o -o %t
 ; RUN: llvm-readobj -symbols %t | FileCheck %s
 
Index: llvm/trunk/test/tools/gold/X86/relocation-model-pic.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/relocation-model-pic.ll
+++ llvm/trunk/test/tools/gold/X86/relocation-model-pic.ll
@@ -7,44 +7,44 @@
 
 ;; Non-PIC source.
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --shared \
 ; RUN:    --plugin-opt=save-temps %t.o -o %t-out
 ; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --export-dynamic --noinhibit-exec -pie \
 ; RUN:    --plugin-opt=save-temps %t.o -o %t-out
 ; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --export-dynamic --noinhibit-exec \
 ; RUN:    --plugin-opt=save-temps %t.o -o %t-out
 ; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=STATIC
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -r \
 ; RUN:    --plugin-opt=save-temps %t.o -o %t-out
 ; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=STATIC
 
 ;; PIC source.
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --shared \
 ; RUN:    --plugin-opt=save-temps %t.pic.o -o %t-out
 ; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --export-dynamic --noinhibit-exec -pie \
 ; RUN:    --plugin-opt=save-temps %t.pic.o -o %t-out
 ; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --export-dynamic --noinhibit-exec \
 ; RUN:    --plugin-opt=save-temps %t.pic.o -o %t-out
 ; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=STATIC
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -r \
 ; RUN:    --plugin-opt=save-temps %t.pic.o -o %t-out
 ; RUN: llvm-readobj -r %t-out.o | FileCheck %s --check-prefix=PIC
Index: llvm/trunk/test/tools/gold/X86/remarks.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/remarks.ll
+++ llvm/trunk/test/tools/gold/X86/remarks.ll
@@ -1,9 +1,9 @@
 ; RUN: llvm-as %s -o %t.o
 
-; RUN: not %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: not %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -plugin-opt=-pass-remarks=inline %t.o -o %t2.o 2>&1 | FileCheck %s
 
-; RUN: not %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: not %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:   %t.o -o %t2.o 2>&1 | FileCheck -allow-empty --check-prefix=NO-REMARK %s
 
 
Index: llvm/trunk/test/tools/gold/X86/resolve-to-alias.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/resolve-to-alias.ll
+++ llvm/trunk/test/tools/gold/X86/resolve-to-alias.ll
@@ -1,14 +1,14 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/resolve-to-alias.ll -o %t2.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o %t2.o -o %t.bc
 ; RUN: llvm-dis %t.bc -o %t.ll
 ; RUN: FileCheck --check-prefix=PASS1 %s < %t.ll
 ; RUN: FileCheck --check-prefix=PASS2 %s < %t.ll
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t2.o %t.o -o %t.bc
 ; RUN: llvm-dis %t.bc -o %t.ll
Index: llvm/trunk/test/tools/gold/X86/slp-vectorize.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/slp-vectorize.ll
+++ llvm/trunk/test/tools/gold/X86/slp-vectorize.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o.0.4.opt.bc -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/start-lib-common.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/start-lib-common.ll
+++ llvm/trunk/test/tools/gold/X86/start-lib-common.ll
@@ -4,7 +4,7 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: llvm-as %p/Inputs/start-lib-common.ll -o %t2.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t1.o --start-lib %t2.o --end-lib -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/stats.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/stats.ll
+++ llvm/trunk/test/tools/gold/X86/stats.ll
@@ -1,12 +1,12 @@
 ; REQUIRES: asserts
 
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so  -shared \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext  -shared \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    -plugin-opt=-stats %t.o -o %t2 2>&1 | FileCheck %s
 
 ; RUN: llvm-as %s -o %t.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so  -shared \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext  -shared \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    -plugin-opt=thinlto \
 ; RUN:    -plugin-opt=thinlto-index-only \
Index: llvm/trunk/test/tools/gold/X86/strip_names.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/strip_names.ll
+++ llvm/trunk/test/tools/gold/X86/strip_names.ll
@@ -1,12 +1,12 @@
 ; RUN: llvm-as %s -o %t.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o.0.2.internalize.bc -o - | FileCheck %s
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o -o %t2.o
Index: llvm/trunk/test/tools/gold/X86/thinlto.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto.ll
@@ -2,13 +2,13 @@
 ; bitcode without summary sections gracefully.
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/thinlto.ll -o %t2.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=thinlto-index-only \
 ; RUN:    -shared %t.o %t2.o -o %t3
 ; RUN: not test -e %t3
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    -shared %t.o %t2.o -o %t4
@@ -19,7 +19,7 @@
 ; RUN: opt -module-summary %p/Inputs/thinlto.ll -o %t2.o
 
 ; Ensure gold generates an index and not a binary if requested.
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=thinlto-index-only \
@@ -30,7 +30,7 @@
 
 ; Ensure gold generates an index as well as a binary with save-temps in ThinLTO mode.
 ; First force single-threaded mode
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    --plugin-opt=thinlto \
@@ -40,7 +40,7 @@
 ; RUN: llvm-nm %t4 | FileCheck %s --check-prefix=NM
 
 ; Check with --no-map-whole-files
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    --plugin-opt=thinlto \
@@ -51,7 +51,7 @@
 ; RUN: llvm-nm %t4 | FileCheck %s --check-prefix=NM
 
 ; Next force multi-threaded mode
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    --plugin-opt=thinlto \
@@ -62,7 +62,7 @@
 
 ; Test --plugin-opt=obj-path to ensure unique object files generated.
 ; RUN: rm -f %t5.o %t5.o1
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=jobs=2 \
Index: llvm/trunk/test/tools/gold/X86/thinlto_afdo.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_afdo.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_afdo.ll
@@ -3,7 +3,7 @@
 ; RUN: opt -module-summary %p/Inputs/thinlto.ll -o %t2.o
 
 ; RUN: rm -f %t1.o.4.opt.bc
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=save-temps \
Index: llvm/trunk/test/tools/gold/X86/thinlto_alias.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_alias.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_alias.ll
@@ -9,7 +9,7 @@
 ; Note that gold picks the first copy of weakfunc() as the prevailing one,
 ; so listing %t2.o first is sufficient to ensure that this copy is
 ; preempted.
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=save-temps \
 ; RUN:     -o %t3.o %t2.o %t.o
Index: llvm/trunk/test/tools/gold/X86/thinlto_archive.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_archive.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_archive.ll
@@ -8,7 +8,7 @@
 
 ; Test importing from archive library via gold, using jobs=1 to ensure
 ; output messages are not interleaved.
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=-print-imports \
Index: llvm/trunk/test/tools/gold/X86/thinlto_emit_imports.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_emit_imports.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_emit_imports.ll
@@ -7,7 +7,7 @@
 
 ; Ensure gold generates imports files if requested for distributed backends.
 ; RUN: rm -f %t3.o.imports %t3.o.thinlto.bc
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=thinlto-index-only \
 ; RUN:    --plugin-opt=thinlto-emit-imports-files \
Index: llvm/trunk/test/tools/gold/X86/thinlto_emit_linked_objects.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_emit_linked_objects.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_emit_linked_objects.ll
@@ -10,7 +10,7 @@
 ; a library that had no strongly referenced symbols, that file would not
 ; be included in the link and listed in the emitted file. However, this
 ; requires gold version 1.12.
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=thinlto-index-only=%t3 \
 ; RUN:    -o %t5 \
Index: llvm/trunk/test/tools/gold/X86/thinlto_funcimport.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_funcimport.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_funcimport.ll
@@ -2,7 +2,7 @@
 ; RUN: opt -module-summary %s -o %t1.bc
 ; RUN: opt -module-summary %p/Inputs/thinlto_funcimport.ll -o %t2.bc
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    -shared %t1.bc %t2.bc -o %t
@@ -11,7 +11,7 @@
 
 ; We shouldn't do any importing at -O0
 ; rm -f %t2.bc.3.import.bc
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=O0 \
Index: llvm/trunk/test/tools/gold/X86/thinlto_internalize.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_internalize.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_internalize.ll
@@ -1,7 +1,7 @@
 ; RUN: opt -module-summary %s -o %t.o
 ; RUN: opt -module-summary %p/Inputs/thinlto_internalize.ll -o %t2.o
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=-import-instr-limit=0 \
 ; RUN:     --plugin-opt=save-temps \
Index: llvm/trunk/test/tools/gold/X86/thinlto_linkonceresolution.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_linkonceresolution.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_linkonceresolution.ll
@@ -7,7 +7,7 @@
 ; so listing %t2.o first is sufficient to ensure that this copy is
 ; preempted. Also, set the import-instr-limit to 0 to prevent f() from
 ; being imported from %t2.o which hides the problem.
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=-import-instr-limit=0 \
 ; RUN:     --plugin-opt=save-temps \
Index: llvm/trunk/test/tools/gold/X86/thinlto_object_suffix_replace.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_object_suffix_replace.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_object_suffix_replace.ll
@@ -7,7 +7,7 @@
 
 ; First perform the thin link on the normal bitcode file, and save the
 ; resulting index.
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=thinlto-index-only \
@@ -19,7 +19,7 @@
 ; RUN: rm -f %t1.o.thinlto.bc
 ; Make sure it isn't inadvertently using the regular bitcode file.
 ; RUN: rm -f %t1.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=thinlto-index-only \
Index: llvm/trunk/test/tools/gold/X86/thinlto_prefix_replace.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_prefix_replace.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_prefix_replace.ll
@@ -4,7 +4,7 @@
 ; Ensure that there is no existing file at the new path, so we properly
 ; test the creation of the new file there.
 ; RUN: rm -f %t/newpath/thinlto_prefix_replace.o.thinlto.bc
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=thinlto-index-only \
 ; RUN:    --plugin-opt=thinlto-prefix-replace="%t/oldpath/;%t/newpath/" \
Index: llvm/trunk/test/tools/gold/X86/thinlto_weak_library.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_weak_library.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_weak_library.ll
@@ -12,7 +12,7 @@
 ; %t.o. It later selects %t2.o based on the strong ref from %t3.o.
 ; Therefore, %t3.o's copy of @f is prevailing, and we need to link
 ; %t3.o before %t2.o in the final native link.
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    -m elf_x86_64 \
Index: llvm/trunk/test/tools/gold/X86/thinlto_weak_resolution.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/thinlto_weak_resolution.ll
+++ llvm/trunk/test/tools/gold/X86/thinlto_weak_resolution.ll
@@ -4,7 +4,7 @@
 ; Verify that prevailing weak for linker symbol is kept.
 ; Note that gold picks the first copy of a function as the prevailing one,
 ; so listing %t.o first is sufficient to ensure that its copies are prevailing.
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:     --plugin-opt=thinlto \
 ; RUN:     --plugin-opt=save-temps \
 ; RUN:     -shared \
Index: llvm/trunk/test/tools/gold/X86/type-merge.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/type-merge.ll
+++ llvm/trunk/test/tools/gold/X86/type-merge.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/type-merge.ll -o %t2.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o %t2.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/type-merge2.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/type-merge2.ll
+++ llvm/trunk/test/tools/gold/X86/type-merge2.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/type-merge2.ll -o %t2.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    -shared %t.o %t2.o -o %t3.o
Index: llvm/trunk/test/tools/gold/X86/unnamed-addr.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/unnamed-addr.ll
+++ llvm/trunk/test/tools/gold/X86/unnamed-addr.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/v1.12/start-lib-common.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/v1.12/start-lib-common.ll
+++ llvm/trunk/test/tools/gold/X86/v1.12/start-lib-common.ll
@@ -4,7 +4,7 @@
 ; RUN: llvm-as %s -o %t1.o
 ; RUN: llvm-as %p/Inputs/start-lib-common.ll -o %t2.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t1.o --start-lib %t2.o --end-lib -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/v1.12/thinlto_emit_linked_objects.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/v1.12/thinlto_emit_linked_objects.ll
+++ llvm/trunk/test/tools/gold/X86/v1.12/thinlto_emit_linked_objects.ll
@@ -13,7 +13,7 @@
 ; RUN: rm -f %t2.o.thinlto.bc
 ; RUN: rm -f %t.o.imports
 ; RUN: rm -f %t2.o.imports
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=thinlto \
 ; RUN:    --plugin-opt=thinlto-index-only=%t3 \
 ; RUN:    --plugin-opt=thinlto-emit-imports-files \
Index: llvm/trunk/test/tools/gold/X86/vectorize.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/vectorize.ll
+++ llvm/trunk/test/tools/gold/X86/vectorize.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as %s -o %t.o
 
-; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    -shared %t.o -o %t2.o
 ; RUN: llvm-dis %t2.o.0.4.opt.bc -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/X86/visibility.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/visibility.ll
+++ llvm/trunk/test/tools/gold/X86/visibility.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/visibility.ll -o %t2.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    -m elf_x86_64 \
 ; RUN:    --plugin-opt=save-temps \
 ; RUN:    -shared %t.o %t2.o -o %t.so
Index: llvm/trunk/test/tools/gold/X86/weak.ll
===================================================================
--- llvm/trunk/test/tools/gold/X86/weak.ll
+++ llvm/trunk/test/tools/gold/X86/weak.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o %t.o
 ; RUN: llvm-as %p/Inputs/weak.ll -o %t2.o
 
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \
+; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
 ; RUN:    --plugin-opt=emit-llvm \
 ; RUN:    -shared %t.o %t2.o -o %t3.o
 ; RUN: llvm-dis %t3.o -o - | FileCheck %s
Index: llvm/trunk/test/tools/gold/invalid-dir.ll
===================================================================
--- llvm/trunk/test/tools/gold/invalid-dir.ll
+++ llvm/trunk/test/tools/gold/invalid-dir.ll
@@ -1,7 +1,7 @@
 ; RUN: rm -rf %t.output
 ; RUN: mkdir %t.output
 ; RUN: llvm-as %s -o %t.o
-; RUN: not %gold -plugin %llvmshlibdir/LLVMgold.so  -shared \
+; RUN: not %gold -plugin %llvmshlibdir/LLVMgold%shlibext  -shared \
 ; RUN:    %t.o -o %t.output 2>&1 | FileCheck %s -check-prefix=OUTDIR
 
 ; OUTDIR: fatal error: