From 9b3484be794fbe7db25ddba85bc8d23cb95af56b Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 19 Jul 2014 19:02:51 +0000 Subject: [PATCH] [powerpc/powerpc64] Re-enable JUMP_LABEL CONFIG_JUMP_LABEL only has an effect if the compiler properly supports "asm goto". That broke for powerpc 64-bit code in some version of gcc-4.8, and when it was fixed that changed ABI so we had to disable the config symbol temporarily. Make sure we get the fixed gcc-4.8 by using a versioned build-dep. svn path=/dists/sid/linux/; revision=21570 --- debian/config/powerpc/config.powerpc64 | 3 --- debian/config/powerpc/defines | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 debian/config/powerpc/config.powerpc64 diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64 deleted file mode 100644 index 2fb296363..000000000 --- a/debian/config/powerpc/config.powerpc64 +++ /dev/null @@ -1,3 +0,0 @@ -#. Temporary hack to maintain ABI as 3.14.2-1 was built with a compiler -#. version that had broken asm goto... though only with -m64! -# CONFIG_JUMP_LABEL is not set diff --git a/debian/config/powerpc/defines b/debian/config/powerpc/defines index 8c64080b3..3519e43f0 100644 --- a/debian/config/powerpc/defines +++ b/debian/config/powerpc/defines @@ -17,6 +17,10 @@ configs: suggests: mkvmlinuz install-stem: vmlinux +[relations] +# This ensures we get asm goto support and avoid an ABI change +gcc-4.8: gcc-4.8 (>= 4.8.2-21) + [powerpc_description] hardware: uniprocessor 32-bit PowerPC @@ -30,4 +34,4 @@ configs: powerpc/config.powerpc powerpc/config.powerpc-smp hardware: 64-bit PowerPC [powerpc64_image] -configs: kernelarch-powerpc/config-arch-64 powerpc/config.powerpc64 kernelarch-powerpc/config-arch-64-be +configs: kernelarch-powerpc/config-arch-64 kernelarch-powerpc/config-arch-64-be