From 5c238be04bf64484712e9a99c4eaf796cb4a2daa Mon Sep 17 00:00:00 2001 From: Amir Ayupov Date: Wed, 26 Jan 2022 17:08:13 -0800 Subject: [PATCH] [BOLT][TEST] Adjust tests for BOLT_CLANG_EXE=clang-{6..9} Fix tests to pass with clang-6..9 on Ubuntu 20.04. Reviewed By: yota9 Differential Revision: https://reviews.llvm.org/D118282 --- bolt/test/X86/asm-func-debug.test | 2 +- bolt/test/X86/symtab-secondary-entries.test | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bolt/test/X86/asm-func-debug.test b/bolt/test/X86/asm-func-debug.test index 959070196971..99a61a333762 100644 --- a/bolt/test/X86/asm-func-debug.test +++ b/bolt/test/X86/asm-func-debug.test @@ -14,7 +14,7 @@ CHECK-NEXT: DW_AT_low_pc (0x0000000000000000) CHECK-NEXT: DW_AT_ranges CHECK-NEXT: [0x0000000000[[#%x,ADDR:]], CHECK-SAME: 0x0000000000[[#ADDR+1]])) -CHECK-NEXT: DW_AT_name ("{{.*}}/asm_foo.s") +CHECK-NEXT: DW_AT_name ("{{.*}}asm_foo.s") # Check .debug_aranges was updated for asm module CHECK: .debug_aranges contents: diff --git a/bolt/test/X86/symtab-secondary-entries.test b/bolt/test/X86/symtab-secondary-entries.test index bdf1bff10aa4..4e4ea85eb156 100644 --- a/bolt/test/X86/symtab-secondary-entries.test +++ b/bolt/test/X86/symtab-secondary-entries.test @@ -1,6 +1,8 @@ # Check that secondary entry points are updated correctly in the ELF symtab -RUN: %clang %p/Inputs/user-order.S -Wl,-q -o %t.exe -nostdlib +RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown \ +RUN: %p/Inputs/user-order.S -o %t.o +RUN: ld.lld %t.o --emit-relocs --nostdlib -o %t.exe RUN: llvm-bolt %t.exe -o %t -reorder-functions=user \ RUN: -function-order=%p/Inputs/order.txt