From 6159bcf6938b3ba211223e5069df460cb31c1347 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 3 Nov 2016 13:32:27 -0600
Subject: [PATCH] Revert "Revert "Compile with gcc-6 on all architectures" and
 "Properly update to gcc-6""

This reverts commit 6f85def7cab738d63a5d9a648e2181f0bf2ca539.  It
should be OK to use gcc-6 now that we pass the -fno-PIE option where
necessary.
---
 debian/changelog                  |  1 +
 debian/config/defines             |  4 ++--
 debian/templates/control.extra.in | 18 +++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 07c985986..f6102d561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ linux (4.9~rc3-1~exp1) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * [rt] Disable until it is updated for 4.9 or later
   * kbuild: add -fno-PIE (Closes: #841368)
+  * Compile with gcc-6 on all architectures
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 29 Oct 2016 00:08:55 +0100
 
diff --git a/debian/config/defines b/debian/config/defines
index 5b35a8d11..3c0de1445 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -36,7 +36,7 @@ arches:
  sparc64
  tilegx
  x32
-compiler: gcc-5
+compiler: gcc-6
 featuresets:
  none
  rt
@@ -60,7 +60,7 @@ initramfs-generators: initramfs-tools initramfs-fallback
 
 [relations]
 # compilers
-gcc-5: gcc-5 <!stage1 !cross>, gcc-5-@gnu-type-package@:native <!stage1 cross>
+gcc-6: gcc-6 <!stage1 !cross>, gcc-6-@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 da3142977..b0f3e8625 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,26 +1,26 @@
-Package: linux-compiler-gcc-5-arm
+Package: linux-compiler-gcc-6-arm
 Build-Profiles: <!stage1>
-Depends: gcc-5, ${misc:Depends}
+Depends: gcc-6, ${misc:Depends}
 Architecture: armel armhf
 Multi-Arch: foreign
 Description: Compiler for Linux on ARM (meta-package)
- This package depends on gcc 5 of the appropriate architecture for
+ This package depends on gcc 6 of the appropriate architecture for
  Linux on armel and armhf.
 
-Package: linux-compiler-gcc-5-s390
+Package: linux-compiler-gcc-6-s390
 Build-Profiles: <!stage1>
-Depends: gcc-5, ${misc:Depends}
+Depends: gcc-6, ${misc:Depends}
 Architecture: s390 s390x
 Multi-Arch: foreign
 Description: Compiler for Linux on IBM zSeries (meta-package)
- This package depends on gcc 5 of the appropriate architecture for
+ This package depends on gcc 6 of the appropriate architecture for
  Linux on s390 and s390x.
 
-Package: linux-compiler-gcc-5-x86
+Package: linux-compiler-gcc-6-x86
 Build-Profiles: <!stage1>
-Depends: gcc-5, ${misc:Depends}
+Depends: gcc-6, ${misc:Depends}
 Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Description: Compiler for Linux on x86 (meta-package)
- This package depends on gcc 5 of the appropriate architecture for
+ This package depends on gcc 6 of the appropriate architecture for
  Linux on amd64, i386 and x32.