Index: lld/trunk/test/ELF/lto/defsym.ll =================================================================== --- lld/trunk/test/ELF/lto/defsym.ll +++ lld/trunk/test/ELF/lto/defsym.ll @@ -11,7 +11,7 @@ ; RUN: opt -module-summary %S/Inputs/defsym-bar.ll -o %t1.o ; RUN: ld.lld %t.o %t1.o -shared -o %t2.so -defsym=bar2=bar3 -save-temps ; RUN: llvm-readelf --symbols %t2.so1.lto.o | FileCheck --check-prefix=OBJ %s -; RUN: llvm-objdump -d %t2.so | FileCheck %s --check-prefix=THIN +; RUN: llvm-objdump -d %t2.so | FileCheck %s ; OBJ: UND bar2 @@ -19,17 +19,11 @@ ; Symbol bar3 should not be eliminated ; CHECK: foo: -; CHECK-NEXT: pushq %rax +; CHECK-NEXT: pushq %rax ; CHECK-NEXT: callq ; CHECK-NEXT: callq{{.*}} -; CHECK-NEXT: callq - -; THIN: foo -; THIN-NEXT: pushq %rax -; THIN-NEXT: callq -; THIN-NEXT: callq{{.*}} -; THIN-NEXT: popq %rax -; THIN-NEXT: jmp +; CHECK-NEXT: popq %rax +; CHECK-NEXT: jmp target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" Index: lld/trunk/test/ELF/lto/opt-remarks.ll =================================================================== --- lld/trunk/test/ELF/lto/opt-remarks.ll +++ lld/trunk/test/ELF/lto/opt-remarks.ll @@ -14,7 +14,7 @@ ; Check that @tinkywinky is inlined after optimizations. ; CHECK-LABEL: define i32 @main -; CHECK-NEXT: %a.i = call i32 @patatino() +; CHECK-NEXT: %a.i = {{.*}}call i32 @patatino() ; CHECK-NEXT: ret i32 %a.i ; CHECK-NEXT: } Index: lld/trunk/test/ELF/lto/wrap-2.ll =================================================================== --- lld/trunk/test/ELF/lto/wrap-2.ll +++ lld/trunk/test/ELF/lto/wrap-2.ll @@ -10,7 +10,7 @@ ; RUN: opt -module-summary %s -o %t.o ; RUN: opt -module-summary %S/Inputs/wrap-bar.ll -o %t1.o ; RUN: ld.lld %t.o %t1.o -shared -o %t.so -wrap=bar -; RUN: llvm-objdump -d %t.so | FileCheck %s -check-prefix=THIN +; RUN: llvm-objdump -d %t.so | FileCheck %s ; RUN: llvm-readobj -t %t.so | FileCheck -check-prefix=BIND %s ; Make sure that calls in foo() are not eliminated and that bar is @@ -19,13 +19,8 @@ ; CHECK: foo: ; CHECK-NEXT: pushq %rax ; CHECK-NEXT: callq{{.*}}<__wrap_bar> -; CHECK-NEXT: callq{{.*}} - -; THIN: foo: -; THIN-NEXT: pushq %rax -; THIN-NEXT: callq{{.*}}<__wrap_bar> -; THIN-NEXT: popq %rax -; THIN-NEXT: jmp{{.*}} +; CHECK-NEXT: popq %rax +; CHECK-NEXT: jmp{{.*}} ; Check that bar and __wrap_bar retain their original binding. ; BIND: Name: bar