From 83b8a9a70d52f3879afa3981b71ca00a45f02ea6 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Fri, 6 Jan 2017 11:18:41 -0600 Subject: [PATCH] UBUNTU: [Config] Disble stack protector for powerpc-smp Fixes FTBFS: arch/powerpc/platforms/built-in.o: In function `bootx_add_display_props': /<>/arch/powerpc/platforms/powermac/bootx_init.c:211: undefined reference to `__stack_chk_fail_local' arch/powerpc/platforms/built-in.o: In function `bootx_scan_dt_build_struct': /<>/arch/powerpc/platforms/powermac/bootx_init.c:350: undefined reference to `__stack_chk_fail_local' arch/powerpc/platforms/built-in.o: In function `bootx_init': /<>/arch/powerpc/platforms/powermac/bootx_init.c:596: undefined reference to `__stack_chk_fail_local' ld: .tmp_vmlinux1: hidden symbol `__stack_chk_fail_local' isn't defined ld: final link failed: Bad value Signed-off-by: Seth Forshee --- debian.master/config/amd64/config.common.amd64 | 2 ++ debian.master/config/annotations | 6 +++--- debian.master/config/arm64/config.common.arm64 | 2 ++ debian.master/config/armhf/config.common.armhf | 2 ++ debian.master/config/config.common.ubuntu | 2 -- debian.master/config/i386/config.common.i386 | 2 ++ debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/powerpc/config.flavour.generic | 3 +++ debian.master/config/powerpc/config.flavour.powerpc-e500mc | 3 +++ debian.master/config/powerpc/config.flavour.powerpc-smp | 3 +++ debian.master/config/powerpc/config.flavour.powerpc64-emb | 3 +++ debian.master/config/ppc64el/config.common.ppc64el | 2 ++ 12 files changed, 25 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index d314ddfab291..c75824d47d5b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -72,6 +72,8 @@ CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE_PARTITION=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 50a849171266..7ff94f0361e7 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8525,11 +8525,11 @@ CONFIG_RCU_EXPERT flag # Menu: General setup >> RCU Subsystem >> Make expert-level adjustments to RCU configuration >> Build-forced no-CBs CPUs # Menu: General setup >> Stack Protector buffer overflow detection -CONFIG_CC_STACKPROTECTOR_NONE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}> +CONFIG_CC_STACKPROTECTOR_NONE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc-generic': 'n', 'powerpc-powerpc64-emb': 'n', 'powerpc-powerpc-e500mc': 'n', 'powerpc-powerpc-smp': 'y', 'ppc64el': 'n'}> CONFIG_CC_STACKPROTECTOR_REGULAR policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}> -CONFIG_CC_STACKPROTECTOR_STRONG policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}> +CONFIG_CC_STACKPROTECTOR_STRONG policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc-generic': 'y', 'powerpc-powerpc64-emb': 'y', 'powerpc-powerpc-e500mc': 'y', 'powerpc-powerpc-smp': 'n', 'ppc64el': 'y'}> # -CONFIG_CC_STACKPROTECTOR_STRONG mark +CONFIG_CC_STACKPROTECTOR_STRONG mark note # Menu: General setup >> Stack Protector buffer overflow detection >> Architecture: arm diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 595e6acfb593..d0eeec678941 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -78,6 +78,8 @@ CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE="console=ttyAMA0" diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 22499d613c60..c36c93a61346 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -72,6 +72,8 @@ CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE="" diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f61e0e873798..862813cc01d8 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1198,9 +1198,7 @@ CONFIG_CCWGROUP=m CONFIG_CCW_CONSOLE=y CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -# CONFIG_CC_STACKPROTECTOR_NONE is not set # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set # CONFIG_CELL_CPU is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 8cb93fa0e003..adc78e895979 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -69,6 +69,8 @@ CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE_PARTITION=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 0ebe392b03b6..461785e0e884 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -56,7 +56,6 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m -CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE_PARTITION=y diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic index 47e89311b52f..c74a137848de 100644 --- a/debian.master/config/powerpc/config.flavour.generic +++ b/debian.master/config/powerpc/config.flavour.generic @@ -12,6 +12,9 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_RANDOM=y CONFIG_ATA_NONSTANDARD=y # CONFIG_BATMAN_ADV_BATMAN_V is not set +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CRASH_DUMP=y # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set CONFIG_CXL_AFU_DRIVER_OPS=y diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc index 9a706652c841..fb34000154be 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc +++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc @@ -12,6 +12,9 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y # CONFIG_ARCH_RANDOM is not set # CONFIG_ATA_NONSTANDARD is not set CONFIG_BATMAN_ADV_BATMAN_V=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y # CONFIG_CRASH_DUMP is not set CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m # CONFIG_CXL_AFU_DRIVER_OPS is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp index c37e0b6f6e80..990dc462d49e 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc-smp @@ -12,6 +12,9 @@ # CONFIG_ARCH_RANDOM is not set # CONFIG_ATA_NONSTANDARD is not set # CONFIG_BATMAN_ADV_BATMAN_V is not set +# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR_NONE=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set # CONFIG_CRASH_DUMP is not set # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set # CONFIG_CXL_AFU_DRIVER_OPS is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb index dd54f7d1d188..69d28be16ff0 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc64-emb +++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb @@ -12,6 +12,9 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y # CONFIG_ARCH_RANDOM is not set # CONFIG_ATA_NONSTANDARD is not set CONFIG_BATMAN_ADV_BATMAN_V=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CRASH_DUMP=y CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m # CONFIG_CXL_AFU_DRIVER_OPS is not set diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 355be39c6f32..7d32091d0bf2 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -67,6 +67,8 @@ CONFIG_CAIF=m CONFIG_CAN=m CONFIG_CB710_CORE=m CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CDROM_PKTCDVD=m CONFIG_CMA=y CONFIG_CMDLINE_PARTITION=y -- 2.39.2