UBUNTU: [Config] Disble stack protector for powerpc-smp

Fixes FTBFS:

 arch/powerpc/platforms/built-in.o: In function `bootx_add_display_props':
 /<<PKGBUILDDIR>>/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':
 /<<PKGBUILDDIR>>/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':
 /<<PKGBUILDDIR>>/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 <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index d314ddfab291599cdae953ca434543b2d75bfedf..c75824d47d5b81445fabe02c0a6f4ebe9df731ad 100644 (file)
--- 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 50a849171266074800a23c0dc61741d8cce51d04..7ff94f0361e72cee0dc7ab286e5dd50049f79b69 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8525,11 +8525,11 @@ CONFIG_RCU_EXPERT                               flag<REVIEW>
 # 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<ENFORCED>
+CONFIG_CC_STACKPROTECTOR_STRONG                        mark<ENFORCED> note<FTBFS on powerpc-smp in 4.10-rc2>
 
 # 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 595e6acfb5931656f824c5a7e794890c26e05a23..d0eeec6789419e0e5f6f7b8a59f01acdb99f1124 100644 (file)
--- 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 22499d613c602e066263ff9480834c7a62b7132e..c36c93a61346e1cf0d2099484094ec40685d5f24 100644 (file)
--- 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 f61e0e873798e5b298a444fb314eb2866dc1edaa..862813cc01d87386ad0362e6d4ef2a88546e3ed2 100644 (file)
--- 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 8cb93fa0e0032f8aa75d4f2bf60864ce06d34594..adc78e895979e4aeca71b4a825b502dbf8a09b2c 100644 (file)
--- 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 0ebe392b03b6391f8c5404b50800cc49d0f92d1f..461785e0e884f612582118bd2212422b37751b7d 100644 (file)
--- 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 47e89311b52f0e8c3952cbfd67e18f5b22863c48..c74a137848ded263b5f9dd093c36c1772062f4fb 100644 (file)
--- 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 9a706652c841cf944ce69962cddd78cecd31c86c..fb34000154be760723857d7b92e837c4a2d10c45 100644 (file)
--- 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 c37e0b6f6e80f4db167be9683626ad231b723c8b..990dc462d49e5b4d02454f209d2efecb098339e3 100644 (file)
--- 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 dd54f7d1d188d37f660375e745813416b95f6d27..69d28be16ff0e992c2df81955e7b29ddf0c8b622 100644 (file)
--- 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 355be39c6f321b77d4e0e6281a7a104f377332fe..7d32091d0bf284ae42ec52a254b6761d23dbec3c 100644 (file)
--- 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