From 4a58eb9e4e5282df95deff243f4141b35909710c Mon Sep 17 00:00:00 2001 From: Amir Ayupov Date: Wed, 11 May 2022 03:37:09 -0700 Subject: [PATCH] [BOLT][TEST] Remove -gdwarf-4 override from %cflags As BOLT support for monolithic and split DWARF5 is added, remove DWARF version override for BOLT tests. Reviewed By: ayermolo Differential Revision: https://reviews.llvm.org/D125366 --- bolt/test/AArch64/asm-func-debug.test | 2 +- bolt/test/X86/asm-func-debug.test | 2 +- bolt/test/lit.cfg.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bolt/test/AArch64/asm-func-debug.test b/bolt/test/AArch64/asm-func-debug.test index 2bbe668..7c679ed 100644 --- a/bolt/test/AArch64/asm-func-debug.test +++ b/bolt/test/AArch64/asm-func-debug.test @@ -3,7 +3,7 @@ # # The input test case foo() contains nops that we remove. -RUN: %clang %cflags -no-pie -g %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe +RUN: %clang %cflags -no-pie -gdwarf-4 %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe RUN: llvm-bolt %t.exe -o %t -update-debug-sections RUN: llvm-dwarfdump -all %t | FileCheck %s diff --git a/bolt/test/X86/asm-func-debug.test b/bolt/test/X86/asm-func-debug.test index 4883d68..a8bad6e 100644 --- a/bolt/test/X86/asm-func-debug.test +++ b/bolt/test/X86/asm-func-debug.test @@ -3,7 +3,7 @@ # # The input test case foo() contains nops that we remove. -RUN: %clang -g %cflags -no-pie %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe +RUN: %clang -gdwarf-4 %cflags -no-pie %p/../Inputs/asm_foo.s %p/../Inputs/asm_main.c -o %t.exe RUN: llvm-bolt %t.exe -o %t -update-debug-sections RUN: llvm-dwarfdump -all %t | FileCheck %s diff --git a/bolt/test/lit.cfg.py b/bolt/test/lit.cfg.py index 3442d1f..7807792 100644 --- a/bolt/test/lit.cfg.py +++ b/bolt/test/lit.cfg.py @@ -66,8 +66,8 @@ ld_lld = llvm_config.use_llvm_tool('ld.lld', required=True, search_env='LD_LLD') llvm_config.config.available_features.add('ld.lld') llvm_config.add_tool_substitutions([ToolSubst(r'ld\.lld', command=ld_lld)]) -config.substitutions.append(('%cflags', '-gdwarf-4')) -config.substitutions.append(('%cxxflags', '-gdwarf-4')) +config.substitutions.append(('%cflags', '')) +config.substitutions.append(('%cxxflags', '')) link_fdata_cmd = os.path.join(config.test_source_root, 'link_fdata.py') -- 2.7.4