diff mbox series

[SRU,K/raspi,3/3] UBUNTU: [Config] raspi: updateconfigs for gcc-12 for armhf

Message ID 20221108104632.12140-4-juerg.haefliger@canonical.com
State New
Headers show
Series armhf kernels are compiled with gcc-11 (LP: #1995853) | expand

Commit Message

Juerg Haefliger Nov. 8, 2022, 10:46 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1995853

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 debian.raspi/config/arm64/config.common.arm64 | 1 -
 debian.raspi/config/armhf/config.common.armhf | 3 +--
 debian.raspi/config/config.common.ubuntu      | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/debian.raspi/config/arm64/config.common.arm64 b/debian.raspi/config/arm64/config.common.arm64
index d7a53849e123..181771d19ed8 100644
--- a/debian.raspi/config/arm64/config.common.arm64
+++ b/debian.raspi/config/arm64/config.common.arm64
@@ -6,7 +6,6 @@  CONFIG_ARCH_MMAP_RND_BITS_MAX=33
 CONFIG_ARCH_MMAP_RND_BITS_MIN=18
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0"
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-CONFIG_GCC_VERSION=120200
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_IOMMU_IOVA=y
 CONFIG_IRQ_BYPASS_MANAGER=y
diff --git a/debian.raspi/config/armhf/config.common.armhf b/debian.raspi/config/armhf/config.common.armhf
index df34eb896ad5..003803d14c2f 100644
--- a/debian.raspi/config/armhf/config.common.armhf
+++ b/debian.raspi/config/armhf/config.common.armhf
@@ -3,9 +3,8 @@ 
 #
 CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc-11 (Ubuntu 11.3.0-6ubuntu1) 11.3.0"
+CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0"
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
-CONFIG_GCC_VERSION=110300
 CONFIG_I2C_EMEV2=m
 CONFIG_IOMMU_IOVA=m
 CONFIG_IRQ_BYPASS_MANAGER=m
diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
index 01964bebd973..b775af10c904 100644
--- a/debian.raspi/config/config.common.ubuntu
+++ b/debian.raspi/config/config.common.ubuntu
@@ -1216,6 +1216,7 @@  CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
+CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_CC_IS_GCC=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
@@ -2844,6 +2845,7 @@  CONFIG_GAMEPORT_NS558=m
 CONFIG_GARP=m
 CONFIG_GCC12_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_GCC_VERSION=120200
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_GDB_SCRIPTS=y
 # CONFIG_GEMINI_ETHERNET is not set