From 6f85def7cab738d63a5d9a648e2181f0bf2ca539 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 23 Oct 2016 04:34:09 +0100
Subject: [PATCH] Revert "Compile with gcc-6 on all architectures" and
 "Properly update to gcc-6"

This reverts commits d7eadea70231590242300c3a751385eecc1f162a and
5dbd80758cabf5e217f2f92ef317bfca370fbc31.  gcc-6 currently can't
compile the kernel on amd64 due to conflicts the way it enables PIE by
default.
---
 debian/changelog                  |  1 -
 debian/config/defines             |  4 ++--
 debian/templates/control.extra.in | 18 +++++++++---------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 995c950c6..8f5ff8ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,6 @@ linux (4.8.1-1~exp1) UNRELEASED; urgency=medium
   * [amd64] Enable RANDOMIZE_MEMORY
   * [powerpc*/*64*] Enable OPAL_PRD, MTD, MTD_POWERNV_FLASH as modules
     (Closes: #838604, #838605)
-  * Compile with gcc-6 on all architectures
   * security,printk: Enable SECURITY_DMESG_RESTRICT, preventing non-root users
     reading the kernel log by default (sysctl: kernel.dmesg_restrict)
   * bug script: Optionally use sudo to read a restricted kernel log, and fall
diff --git a/debian/config/defines b/debian/config/defines
index da2967d35..95a6185f5 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -36,7 +36,7 @@ arches:
  sparc64
  tilegx
  x32
-compiler: gcc-6
+compiler: gcc-5
 featuresets:
  none
  rt
@@ -60,7 +60,7 @@ initramfs-generators: initramfs-tools initramfs-fallback
 
 [relations]
 # compilers
-gcc-6: gcc-6 <!stage1 !cross>, gcc-6-@gnu-type-package@:native <!stage1 cross>
+gcc-5: gcc-5 <!stage1 !cross>, gcc-5-@gnu-type-package@:native <!stage1 cross>
 
 # initramfs-generators
 initramfs-fallback: linux-initramfs-tool
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index b0f3e8625..da3142977 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,26 +1,26 @@
-Package: linux-compiler-gcc-6-arm
+Package: linux-compiler-gcc-5-arm
 Build-Profiles: <!stage1>
-Depends: gcc-6, ${misc:Depends}
+Depends: gcc-5, ${misc:Depends}
 Architecture: armel armhf
 Multi-Arch: foreign
 Description: Compiler for Linux on ARM (meta-package)
- This package depends on gcc 6 of the appropriate architecture for
+ This package depends on gcc 5 of the appropriate architecture for
  Linux on armel and armhf.
 
-Package: linux-compiler-gcc-6-s390
+Package: linux-compiler-gcc-5-s390
 Build-Profiles: <!stage1>
-Depends: gcc-6, ${misc:Depends}
+Depends: gcc-5, ${misc:Depends}
 Architecture: s390 s390x
 Multi-Arch: foreign
 Description: Compiler for Linux on IBM zSeries (meta-package)
- This package depends on gcc 6 of the appropriate architecture for
+ This package depends on gcc 5 of the appropriate architecture for
  Linux on s390 and s390x.
 
-Package: linux-compiler-gcc-6-x86
+Package: linux-compiler-gcc-5-x86
 Build-Profiles: <!stage1>
-Depends: gcc-6, ${misc:Depends}
+Depends: gcc-5, ${misc:Depends}
 Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Description: Compiler for Linux on x86 (meta-package)
- This package depends on gcc 6 of the appropriate architecture for
+ This package depends on gcc 5 of the appropriate architecture for
  Linux on amd64, i386 and x32.