12 files changed, 34 insertions, 28 deletions
diff --git a/lld/test/pecoff/base-reloc.test b/lld/test/pecoff/base-reloc.test
index 5337dbbee9c..e9214f057e4 100644
--- a/lld/test/pecoff/base-reloc.test
+++ b/lld/test/pecoff/base-reloc.test
@@ -1,9 +1,11 @@
 # RUN: yaml2obj %p/Inputs/hello.obj.yaml > %t.obj
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force /opt:noref \
+# RUN:   -- %t.obj \
 # RUN:   && llvm-objdump -s %t1 | FileCheck %s --check-prefix=BASEREL-SECTION
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /force /fixed -- %t.obj \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force /fixed /opt:noref \
+# RUN:    -- %t.obj \
 # RUN:   && llvm-objdump -s %t1 | FileCheck %s --check-prefix=NOBASEREL-SECTION
 
 # Because llvm-objdump cannot pretty-print the contents of .reloc section, we
diff --git a/lld/test/pecoff/bss-section.test b/lld/test/pecoff/bss-section.test
index 3227b71de4f..f686e12d722 100644
--- a/lld/test/pecoff/bss-section.test
+++ b/lld/test/pecoff/bss-section.test
@@ -1,5 +1,5 @@
-# RUN: lld -flavor link /out:%t /subsystem:console /force -- %p/Inputs/bss.obj \
-# RUN:    && llvm-readobj -sections %t | FileCheck %s
+# RUN: lld -flavor link /out:%t /subsystem:console /force /opt:noref \
+# RUN:    -- %p/Inputs/bss.obj && llvm-readobj -sections %t | FileCheck %s
 
 CHECK:       Section {
 CHECK:         Number: 2
diff --git a/lld/test/pecoff/common-symbol.test b/lld/test/pecoff/common-symbol.test
index bd3c550662f..fb3d14793c9 100644
--- a/lld/test/pecoff/common-symbol.test
+++ b/lld/test/pecoff/common-symbol.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj %p/Inputs/common-symbol.obj.yaml > %t.obj
 #
-# RUN: lld -flavor link /out:%t /subsystem:console /force -- %t.obj %t.obj \
-# RUN:    && llvm-readobj -sections %t | FileCheck %s
+# RUN: lld -flavor link /out:%t /subsystem:console /force /opt:noref \
+# RUN:    -- %t.obj %t.obj && llvm-readobj -sections %t | FileCheck %s
 
 CHECK:       Section {
 CHECK:         Number: 2
diff --git a/lld/test/pecoff/grouped-sections.test b/lld/test/pecoff/grouped-sections.test
index d0b1ac9bee4..f45e496622c 100644
--- a/lld/test/pecoff/grouped-sections.test
+++ b/lld/test/pecoff/grouped-sections.test
@@ -1,7 +1,7 @@
 # RUN: yaml2obj %p/Inputs/grouped-sections.obj.yaml > %t.obj
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj \
-# RUN:   && llvm-objdump -s %t1 | FileCheck %s
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force /opt:noref \
+# RUN:   -- %t.obj && llvm-objdump -s %t1 | FileCheck %s
 #
 # The file "grouped-sections.obj" has three data sections in the following
 # order:
diff --git a/lld/test/pecoff/hello.test b/lld/test/pecoff/hello.test
index 9a7c2927bed..cc1e13215e2 100644
--- a/lld/test/pecoff/hello.test
+++ b/lld/test/pecoff/hello.test
@@ -1,13 +1,15 @@
 # RUN: yaml2obj %p/Inputs/hello.obj.yaml > %t.obj
 
-# RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force /opt:noref \
+# RUN:   -- %t.obj \
 # RUN:   && llvm-readobj -file-headers %t1 | FileCheck -check-prefix=FILE %s
 
 FILE: ImageOptionalHeader {
 FILE:   SizeOfInitializedData: 512
 FILE: }
 
-# RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force /opt:noref \
+# RUN:   -- %t.obj \
 # RUN:   && llvm-readobj -sections %t1 | FileCheck -check-prefix=SECTIONS %s
 
 SECTIONS: Format: COFF-i386
diff --git a/lld/test/pecoff/imagebase.test b/lld/test/pecoff/imagebase.test
index 82230ba4366..f691eb9a6e4 100644
--- a/lld/test/pecoff/imagebase.test
+++ b/lld/test/pecoff/imagebase.test
@@ -1,10 +1,11 @@
 # RUN: yaml2obj %p/Inputs/imagebase.obj.yaml > %t.obj
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:__start -- %t.obj \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:__start /opt:noref \
+# RUN:   -- %t.obj \
 # RUN:   && llvm-objdump -disassemble %t1 | FileCheck -check-prefix=CHECK1 %s
 #
 # RUN: lld -flavor link /out:%t1 /subsystem:console /entry:__start /base:65536 \
-# RUN:   -- %t.obj \
+# RUN:   /opt:noref -- %t.obj \
 # RUN:   && llvm-objdump -disassemble %t1 | FileCheck -check-prefix=CHECK2 %s
 
 CHECK1: a1 00 20 40 00    movl    4202496, %eax
diff --git a/lld/test/pecoff/importlib.test b/lld/test/pecoff/importlib.test
index 11ba4540490..9b00e6a828f 100644
--- a/lld/test/pecoff/importlib.test
+++ b/lld/test/pecoff/importlib.test
@@ -3,23 +3,24 @@
 #
 # RUN: yaml2obj %p/Inputs/vars-main.obj.yaml > %t.obj
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main -- %t.obj \
-# RUN:    %p/Inputs/vars.lib && llvm-objdump -d %t1 | FileCheck %s
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
+# RUN:    -- %t.obj %p/Inputs/vars.lib && llvm-objdump -d %t1 | FileCheck %s
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
 # RUN:    /libpath:%p/Inputs -- %t.obj vars.lib && llvm-objdump -d %t1 \
 # RUN:    | FileCheck %s
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
 # RUN:    /libpath:%p/Inputs /defaultlib:vars.lib -- %t.obj \
 # RUN:    && llvm-objdump -d %t1 | FileCheck %s
 #
 # RUN: env LIB=%p/Inputs lld -flavor link /out:%t1 /subsystem:console \
-# RUN:    /entry:_main -- %t.obj vars.lib && llvm-objdump -d %t1 | FileCheck %s
+# RUN:    /opt:noref /entry:_main -- %t.obj vars.lib \
+# RUN:    && llvm-objdump -d %t1 | FileCheck %s
 #
-# RUN: env LINK="/out:%t1 /subsystem:console /entry:_main -- %t.obj" \
-# RUN:    lld -flavor link %p/Inputs/vars.lib && llvm-objdump -d %t1 \
-# RUN:    | FileCheck %s
+# RUN: env LINK="/out:%t1 /subsystem:console /entry:_main /opt:noref \
+# RUN:    -- %t.obj" lld -flavor link %p/Inputs/vars.lib \
+# RUN:    && llvm-objdump -d %t1 | FileCheck %s
 
 CHECK: Disassembly of section .text:
 CHECK-NEXT: .text:
diff --git a/lld/test/pecoff/include.test b/lld/test/pecoff/include.test
index 93793377763..39c319c62bc 100644
--- a/lld/test/pecoff/include.test
+++ b/lld/test/pecoff/include.test
@@ -1,6 +1,6 @@
 # RUN: yaml2obj %p/Inputs/nop.obj.yaml > %t.obj
 #
-# RUN: not lld -flavor link /out:%t1 /subsystem:console \
+# RUN: not lld -flavor link /out:%t1 /subsystem:console /opt:noref \
 # RUN:   /include:sym1 /include:sym2 -- %t.obj 2> %t1
 # RUN: FileCheck %s < %t1
 
diff --git a/lld/test/pecoff/lib.test b/lld/test/pecoff/lib.test
index 94a7044b7a0..661e32ad15b 100644
--- a/lld/test/pecoff/lib.test
+++ b/lld/test/pecoff/lib.test
@@ -2,8 +2,8 @@
 #
 # RUN: yaml2obj %p/Inputs/main.obj.yaml > %t.obj
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main -- %t.obj \
-# RUN:   %p/Inputs/static.lib && llvm-objdump -d %t1 | FileCheck %s
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
+# RUN:   -- %t.obj %p/Inputs/static.lib && llvm-objdump -d %t1 | FileCheck %s
 
 CHECK: Disassembly of section .text:
 CHECK: .text:
diff --git a/lld/test/pecoff/multi.test b/lld/test/pecoff/multi.test
index 787de318722..8687678ecbc 100644
--- a/lld/test/pecoff/multi.test
+++ b/lld/test/pecoff/multi.test
@@ -4,7 +4,7 @@
 # RUN: yaml2obj %p/Inputs/static-data1.obj.yaml > %t2.obj
 # RUN: yaml2obj %p/Inputs/static-data2.obj.yaml > %t3.obj
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
 # RUN:   -- %t1.obj %t2.obj %t3.obj && llvm-objdump -d %t1 | FileCheck %s
 
 CHECK: Disassembly of section .text:
diff --git a/lld/test/pecoff/reloc.test b/lld/test/pecoff/reloc.test
index 8dd5c472cb4..bfef4600376 100644
--- a/lld/test/pecoff/reloc.test
+++ b/lld/test/pecoff/reloc.test
@@ -2,8 +2,8 @@
 #
 # RUN: llvm-objdump -d %t.obj | FileCheck -check-prefix=BEFORE %s
 #
-# RUN: lld -flavor link /out:%t1 /subsystem:console /force -- %t.obj \
-# RUN:   && llvm-objdump -d %t1 | FileCheck -check-prefix=AFTER %s
+# RUN: lld -flavor link /out:%t1 /subsystem:console /force /opt:noref \
+# RUN:   -- %t.obj && llvm-objdump -d %t1 | FileCheck -check-prefix=AFTER %s
 
 BEFORE: Disassembly of section .text:
 BEFORE: _main:
diff --git a/lld/test/pecoff/trivial.test b/lld/test/pecoff/trivial.test
index 536aea0943a..8b8100e3057 100644
--- a/lld/test/pecoff/trivial.test
+++ b/lld/test/pecoff/trivial.test
@@ -5,10 +5,10 @@
 # RUN: yaml2obj %p/Inputs/nop.obj.yaml > %t.obj
 #
 # RUN: lld -flavor link /out:%t1 /subsystem:console,3.11 /entry:_start \
-# RUN:   -- %t.obj && llvm-readobj -file-headers %t1 \
+# RUN:   /opt:noref -- %t.obj && llvm-readobj -file-headers %t1 \
 # RUN:   | FileCheck -check-prefix=FILE %s
 #
-# RUN: lld -flavor link /out:%t1 /entry:_start -- %t.obj \
+# RUN: lld -flavor link /out:%t1 /entry:_start /opt:noref -- %t.obj \
 # RUN:   && llvm-readobj -sections %t1 | FileCheck -check-prefix=SECTIONS %s
 
 FILE: Format: COFF-i386