From bcdf85f8bd3fccff5bc9507a589c4847d9b35405 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 17 Feb 2023 09:58:24 +0100 Subject: dashboard/config/linux: enable DWARF4 for all --- dashboard/config/linux/bits/base.yml | 7 +++++-- dashboard/config/linux/bits/clang.yml | 9 --------- 2 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 dashboard/config/linux/bits/clang.yml (limited to 'dashboard/config/linux/bits') diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml index e9bd940e2..1a6996a34 100644 --- a/dashboard/config/linux/bits/base.yml +++ b/dashboard/config/linux/bits/base.yml @@ -106,8 +106,11 @@ config: - DEBUG_KOBJECT: n - DEBUG_INFO - # One of DEBUG_INFO_DWARF_* is required to enable DEBUG_INFO in v5.18. - - DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT: [v5.18] + # Our containers currently include toolchains that don't support DWARF5, + # but some default kernel configs and compilers (namely, clang) try to + # use DWARF5 by default. So we enable DWARF4 explicitly and don't + # enable DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT. + - DEBUG_INFO_DWARF4 # CONFIG_DEBUG_INFO_BTF breaks the build since 5.14 merge window: # https://lkml.kernel.org/r/YOLzFecogWmdZ5Hc@infradead.org - DEBUG_INFO_BTF: [-v5.13] diff --git a/dashboard/config/linux/bits/clang.yml b/dashboard/config/linux/bits/clang.yml deleted file mode 100644 index 24c345335..000000000 --- a/dashboard/config/linux/bits/clang.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2023 syzkaller project authors. All rights reserved. -# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. - -config: - # Newer Clang versions generate DWARF5 by default, but old binutils choke on that. - # This results in syzbot being unable to symbolize reports. - # Stick to DWARF4 for now. - - DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT: [n, weak] - - DEBUG_INFO_DWARF4 -- cgit mrf-deployment