From abb69b43cd8c75b0660e8479f7e86252ae845f65 Mon Sep 17 00:00:00 2001 From: Tudor Ambarus Date: Wed, 3 May 2023 09:38:12 +0000 Subject: Revert "dashboard: bump CONFIG_FRAME_WARN for Android kernels" This reverts commit d341bdbd6837aa0214ee9dfd1c3ddfc58c2a0c9c. The bump of CONFIG_FRAME_WARN was done for Android 5.10 with the hope to get rid of the -Wframe-larger-than errors that were hit when KASAN_STACK && CC_IS_CLANG were set. Unfortunately this didn't fix the build as the stack instrumentation when using clang is broken and the errors were hit again as we can't predict the increase of the stack. The fix is to disable CONFIG_WERROR which now is done because we just bumped the Android 5.10 kernel config (which contains CONFIG_WERROR=y) and the kernel config tweak that disables CONFIG_WERROR now does its job (see dashboard/config/linux/bits/base.yml). Signed-off-by: Tudor Ambarus --- dashboard/config/linux/android-5.10.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dashboard/config/linux/android-5.10.config') diff --git a/dashboard/config/linux/android-5.10.config b/dashboard/config/linux/android-5.10.config index 3f35ae88d..31adc4f94 100644 --- a/dashboard/config/linux/android-5.10.config +++ b/dashboard/config/linux/android-5.10.config @@ -7151,7 +7151,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_BTF=y # CONFIG_GDB_SCRIPTS is not set # CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=4096 +CONFIG_FRAME_WARN=2048 # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_READABLE_ASM is not set CONFIG_HEADERS_INSTALL=y -- cgit mrf-deployment