From 062e3b40a37c4f04065b2e35cfb5046174027449 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Mon, 15 May 2023 13:32:26 -0700 Subject: [PATCH] Revert "ANDROID: gki_config: use DWARFv5 rather than DWARFv4" This reverts commit 509a7a32a5bca6bbb1042c3dc8a3bfaf5422f784. 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 e139d2c9d10f..62934c8243e9 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -688,7 +688,7 @@ CONFIG_DMA_CMA=y CONFIG_PRINTK_TIME=y CONFIG_PRINTK_CALLER=y CONFIG_DYNAMIC_DEBUG_CORE=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 ce0bfe83f95e..27fb3e66d1d5 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -633,7 +633,7 @@ CONFIG_XZ_DEC=y CONFIG_DMA_CMA=y CONFIG_PRINTK_TIME=y CONFIG_DYNAMIC_DEBUG_CORE=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