dashboard/config/linux: enable DWARF4 for all

23 files changed, 43 insertions, 50 deletions

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
diff --git a/dashboard/config/linux/chromeos-5.15-base.config b/dashboard/config/linux/chromeos-5.15-base.config
index 00caf2933..c6e5c62af 100644
--- a/dashboard/config/linux/chromeos-5.15-base.config
+++ b/dashboard/config/linux/chromeos-5.15-base.config
@@ -7233,8 +7233,8 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
diff --git a/dashboard/config/linux/chromeos-5.15.config b/dashboard/config/linux/chromeos-5.15.config
index 786d423b5..f4b061401 100644
--- a/dashboard/config/linux/chromeos-5.15.config
+++ b/dashboard/config/linux/chromeos-5.15.config
@@ -7312,8 +7312,8 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
diff --git a/dashboard/config/linux/main.yml b/dashboard/config/linux/main.yml
index 67914561f..6acff00e3 100644
--- a/dashboard/config/linux/main.yml
+++ b/dashboard/config/linux/main.yml
@@ -64,7 +64,6 @@ includes:
  - kcsan.yml: [kcsan]
  - kmsan.yml: [kmsan]
  - kfence.yml: [kfence]
- - clang.yml: [clang]
  - linux-upstream.yml: [upstream]
  - linux-next.yml: [linux-next]
  - stable-5.4.yml: [stable-5.4]
diff --git a/dashboard/config/linux/stable-5.4-kasan-base.config b/dashboard/config/linux/stable-5.4-kasan-base.config
index 23077b225..692e82842 100644
--- a/dashboard/config/linux/stable-5.4-kasan-base.config
+++ b/dashboard/config/linux/stable-5.4-kasan-base.config
@@ -4759,7 +4759,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
diff --git a/dashboard/config/linux/stable-5.4-kasan.config b/dashboard/config/linux/stable-5.4-kasan.config
index 30080c727..8717624c2 100644
--- a/dashboard/config/linux/stable-5.4-kasan.config
+++ b/dashboard/config/linux/stable-5.4-kasan.config
@@ -7943,7 +7943,7 @@ CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
diff --git a/dashboard/config/linux/upstream-apparmor-kasan-base.config b/dashboard/config/linux/upstream-apparmor-kasan-base.config
index 03fc36846..22469cbd4 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan-base.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan-base.config
@@ -5120,8 +5120,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config
index 154ced52f..b377d3d39 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan.config
@@ -8875,8 +8875,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-arm-full-base.config b/dashboard/config/linux/upstream-arm-full-base.config
index 3cef32229..145185560 100644
--- a/dashboard/config/linux/upstream-arm-full-base.config
+++ b/dashboard/config/linux/upstream-arm-full-base.config
@@ -4363,8 +4363,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-arm-full.config b/dashboard/config/linux/upstream-arm-full.config
index c02d63e75..c66428b27 100644
--- a/dashboard/config/linux/upstream-arm-full.config
+++ b/dashboard/config/linux/upstream-arm-full.config
@@ -8418,8 +8418,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-arm-kasan-base.config b/dashboard/config/linux/upstream-arm-kasan-base.config
index 8a9bb25d7..05d3bebbb 100644
--- a/dashboard/config/linux/upstream-arm-kasan-base.config
+++ b/dashboard/config/linux/upstream-arm-kasan-base.config
@@ -4306,8 +4306,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-arm-kasan.config b/dashboard/config/linux/upstream-arm-kasan.config
index f7e5c4462..0beae4158 100644
--- a/dashboard/config/linux/upstream-arm-kasan.config
+++ b/dashboard/config/linux/upstream-arm-kasan.config
@@ -7052,8 +7052,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-leak-base.config b/dashboard/config/linux/upstream-leak-base.config
index 957414d0c..bae27f904 100644
--- a/dashboard/config/linux/upstream-leak-base.config
+++ b/dashboard/config/linux/upstream-leak-base.config
@@ -5094,8 +5094,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-leak.config b/dashboard/config/linux/upstream-leak.config
index ce4f9902f..08903fcf7 100644
--- a/dashboard/config/linux/upstream-leak.config
+++ b/dashboard/config/linux/upstream-leak.config
@@ -8838,8 +8838,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-riscv64-kasan-base.config b/dashboard/config/linux/upstream-riscv64-kasan-base.config
index 352a85dee..9309669b3 100644
--- a/dashboard/config/linux/upstream-riscv64-kasan-base.config
+++ b/dashboard/config/linux/upstream-riscv64-kasan-base.config
@@ -4247,8 +4247,8 @@ CONFIG_DEBUG_MISC=y
 #
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-riscv64-kasan.config b/dashboard/config/linux/upstream-riscv64-kasan.config
index 528473256..ee952138b 100644
--- a/dashboard/config/linux/upstream-riscv64-kasan.config
+++ b/dashboard/config/linux/upstream-riscv64-kasan.config
@@ -6645,8 +6645,8 @@ CONFIG_DEBUG_MISC=y
 #
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-s390-kasan-base.config b/dashboard/config/linux/upstream-s390-kasan-base.config
index a9d105fd3..550300080 100644
--- a/dashboard/config/linux/upstream-s390-kasan-base.config
+++ b/dashboard/config/linux/upstream-s390-kasan-base.config
@@ -3174,8 +3174,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-s390-kasan.config b/dashboard/config/linux/upstream-s390-kasan.config
index a7ca1747b..f91b9548d 100644
--- a/dashboard/config/linux/upstream-s390-kasan.config
+++ b/dashboard/config/linux/upstream-s390-kasan.config
@@ -6382,8 +6382,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-selinux-kasan-base.config b/dashboard/config/linux/upstream-selinux-kasan-base.config
index d0df77df9..cf9779216 100644
--- a/dashboard/config/linux/upstream-selinux-kasan-base.config
+++ b/dashboard/config/linux/upstream-selinux-kasan-base.config
@@ -5116,8 +5116,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config
index b0cd64762..d254a73d7 100644
--- a/dashboard/config/linux/upstream-selinux-kasan.config
+++ b/dashboard/config/linux/upstream-selinux-kasan.config
@@ -8868,8 +8868,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-usb-base.config b/dashboard/config/linux/upstream-usb-base.config
index fc63a5331..90f18915f 100644
--- a/dashboard/config/linux/upstream-usb-base.config
+++ b/dashboard/config/linux/upstream-usb-base.config
@@ -5159,8 +5159,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
diff --git a/dashboard/config/linux/upstream-usb.config b/dashboard/config/linux/upstream-usb.config
index 4c19a6e88..1d4589ee5 100644
--- a/dashboard/config/linux/upstream-usb.config
+++ b/dashboard/config/linux/upstream-usb.config
@@ -7756,8 +7756,8 @@ CONFIG_DEBUG_MISC=y
 CONFIG_DEBUG_INFO=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y