From 9e8b2d8ee22a75be32360fda8e918c6ff149805e Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Mon, 15 May 2023 13:37:41 -0700 Subject: [PATCH] Revert "ANDROID: gki_config: use DWARFv5 rather than DWARFv4" This reverts commit ad2bd67e07124665f6841151733bf86052bb1c64. Qualcomm is reporting that internal debugging tools in addition to Lauterbach Trace32 (T32) debugger (vLT_20230509_159359) are having issues with DWARFv5. Since the change to the DWARF debug info format was made after the Android Feature Complete deadline, revert it from android14-* kernel branches. We'll leave DWARFv5 for android-mainline and try again next release in android15-*. Bug: 281863640 Reported-by: Satya Durga Srinivasu Prabhala Change-Id: I5a1657bdf6785d23f3492dc12e6f3df0954b8deb Signed-off-by: Nick Desaulniers --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index fb93ec5664cd..d21435fa2aca 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -697,7 +697,7 @@ CONFIG_PRINTK_TIME=y CONFIG_PRINTK_CALLER=y CONFIG_DYNAMIC_DEBUG_CORE=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_DWARF5=y +CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_BTF=y CONFIG_MODULE_ALLOW_BTF_MISMATCH=y CONFIG_HEADERS_INSTALL=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index f8ebe60f911b..7f4e78e3e374 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -643,7 +643,7 @@ CONFIG_STACK_HASH_ORDER=12 CONFIG_PRINTK_TIME=y CONFIG_DYNAMIC_DEBUG_CORE=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_DWARF5=y +CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_BTF=y CONFIG_MODULE_ALLOW_BTF_MISMATCH=y CONFIG_HEADERS_INSTALL=y