From da9ea44cdbae8e797043eb6a5f0c7e7d5cb5ec8d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 25 Jul 2021 15:45:19 +0200 Subject: [PATCH] Config.in: add BR2_PIC_PIE_ARCH_SUPPORTS hidden option The nios2 architecture is already excluded from PIC/PIE due to issues, and we're going to also exclude Microblaze, so let's introduce a BR2_PIC_PIE_ARCH_SUPPORTS hidden boolean to facilitate adding this new architecture exclusion. Signed-off-by: Thomas Petazzoni (cherry picked from commit 70dd4bd156bac2bde07751dc3c4d5da9b14d7d7c) Signed-off-by: Peter Korsgaard --- Config.in | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Config.in b/Config.in index 18a90b3f62..d0be8ada88 100644 --- a/Config.in +++ b/Config.in @@ -713,10 +713,15 @@ endmenu comment "Security Hardening Options" -config BR2_PIC_PIE - bool "Build code with PIC/PIE" +config BR2_PIC_PIE_ARCH_SUPPORTS + bool + default y # Nios2 toolchains produce non working binaries with -fPIC depends on !BR2_nios2 + +config BR2_PIC_PIE + bool "Build code with PIC/PIE" + depends on BR2_PIC_PIE_ARCH_SUPPORTS depends on BR2_SHARED_LIBS depends on BR2_TOOLCHAIN_SUPPORTS_PIE help @@ -724,7 +729,7 @@ config BR2_PIC_PIE Position-Independent Executables (PIE). comment "PIC/PIE needs a toolchain w/ PIE" - depends on !BR2_nios2 + depends on BR2_PIC_PIE_ARCH_SUPPORTS depends on BR2_SHARED_LIBS depends on !BR2_TOOLCHAIN_SUPPORTS_PIE @@ -811,7 +816,7 @@ config BR2_RELRO_PARTIAL config BR2_RELRO_FULL bool "Full" - depends on !BR2_nios2 # BR2_PIC_PIE + depends on BR2_PIC_PIE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_PIE select BR2_PIC_PIE help @@ -820,7 +825,7 @@ config BR2_RELRO_FULL program loading, i.e every time an executable is started. comment "RELRO Full needs a toolchain w/ PIE" - depends on !BR2_nios2 + depends on BR2_PIC_PIE_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_SUPPORTS_PIE endchoice