From f1903be823b26d7ab8d510aed2455471b670e858 Mon Sep 17 00:00:00 2001
From: Alexander Popov <alex.popov@linux.com>
Date: Wed, 14 Oct 2020 14:32:20 +0300
Subject: [PATCH] Use cross compiler to build defconfigs

---
 .../defconfigs/arm64_defconfig_5.9.config        | 16 ++++++++++++----
 .../defconfigs/arm_defconfig_5.9.config          |  7 +++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/kconfig_hardened_check/config_files/defconfigs/arm64_defconfig_5.9.config b/kconfig_hardened_check/config_files/defconfigs/arm64_defconfig_5.9.config
index d41fdb7..784338f 100644
--- a/kconfig_hardened_check/config_files/defconfigs/arm64_defconfig_5.9.config
+++ b/kconfig_hardened_check/config_files/defconfigs/arm64_defconfig_5.9.config
@@ -2,12 +2,11 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 5.9.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20200723 (Red Hat 10.2.1-1)"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 9.2.1 20190827 (Red Hat Cross 9.2.1-3)"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=90201
 CONFIG_LD_VERSION=234000000
 CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -266,7 +265,6 @@ CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_BROKEN_GAS_INST=y
 
 #
 # Platform selection
@@ -412,6 +410,7 @@ CONFIG_KUSER_HELPERS=y
 #
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
+CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM64_VHE=y
 # end of ARMv8.1 architectural features
@@ -428,6 +427,10 @@ CONFIG_ARM64_CNP=y
 #
 # ARMv8.3 architectural features
 #
+CONFIG_ARM64_PTR_AUTH=y
+CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
+CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
+CONFIG_AS_HAS_PAC=y
 CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
 # end of ARMv8.3 architectural features
 
@@ -435,12 +438,15 @@ CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
 # ARMv8.4 architectural features
 #
 CONFIG_ARM64_AMU_EXTN=y
+CONFIG_AS_HAS_ARMV8_4=y
+CONFIG_ARM64_TLB_RANGE=y
 # end of ARMv8.4 architectural features
 
 #
 # ARMv8.5 architectural features
 #
 CONFIG_ARM64_BTI=y
+CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARCH_RANDOM=y
 # end of ARMv8.5 architectural features
@@ -451,6 +457,8 @@ CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
+CONFIG_STACKPROTECTOR_PER_TASK=y
 # end of Kernel Features
 
 #
diff --git a/kconfig_hardened_check/config_files/defconfigs/arm_defconfig_5.9.config b/kconfig_hardened_check/config_files/defconfigs/arm_defconfig_5.9.config
index a795524..1c04ebb 100644
--- a/kconfig_hardened_check/config_files/defconfigs/arm_defconfig_5.9.config
+++ b/kconfig_hardened_check/config_files/defconfigs/arm_defconfig_5.9.config
@@ -2,11 +2,13 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 5.9.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20200723 (Red Hat 10.2.1-1)"
+CONFIG_CC_VERSION_TEXT="arm-linux-gnueabi-gcc (Ubuntu 9.3.0-10ubuntu1) 9.3.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
+CONFIG_GCC_VERSION=90300
 CONFIG_LD_VERSION=234000000
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -901,6 +903,7 @@ CONFIG_CRYPTO_CHACHA20_NEON=m
 # CONFIG_CRYPTO_POLY1305_ARM is not set
 # CONFIG_CRYPTO_NHPOLY1305_NEON is not set
 # CONFIG_CRYPTO_CURVE25519_NEON is not set
+CONFIG_AS_VFP_VMRS_FPINST=y
 
 #
 # General architecture-dependent options
-- 
2.31.1