Compile with gcc-5 on all architectures

10 files changed, 12 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 38f4977e5628..34da3da5de1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux (4.5~rc4-1~exp1) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * [rt] Disable until it is updated for 4.5 or later
   * aufs: Update support patches to aufs4.x-rcN-20160215
+  * Compile with gcc-5 on all architectures
 
  -- Roger Shimizu <rogershimizu@gmail.com>  Sun, 14 Feb 2016 00:32:40 +0900
 
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 649a067b57e1..9a3ed7f30534 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -1,5 +1,4 @@
 [base]
-compiler: gcc-5
 featuresets:
  none
  rt
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index cae0f9eb68af..70798d5faecf 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -15,7 +15,7 @@ configs:
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-4.9: linux-compiler-gcc-4.9-arm
+headers%gcc-5: linux-compiler-gcc-5-arm
 
 [marvell_description]
 hardware: Marvell Kirkwood/Orion
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 8f7551f049fd..d8b1fa92957b 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -15,7 +15,7 @@ configs:
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-4.9: linux-compiler-gcc-4.9-arm
+headers%gcc-5: linux-compiler-gcc-5-arm
 
 [armmp_description]
 hardware: ARMv7 multiplatform compatible SoCs
diff --git a/debian/config/defines b/debian/config/defines
index ec784fd74dfc..a2fe96cf46ee 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -26,7 +26,7 @@ arches:
  sparc
  sparc64
  x32
-compiler: gcc-4.9
+compiler: gcc-5
 featuresets:
  none
  rt
@@ -45,8 +45,6 @@ initramfs-generators: initramfs-tools initramfs-fallback
 
 [relations]
 # compilers
-gcc-4.8: gcc-4.8 <!stage1>
-gcc-4.9: gcc-4.9 <!stage1>
 gcc-5: gcc-5 <!stage1>
 
 # initramfs-generators
diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines
index b8572021c12c..aa79a1af95b5 100644
--- a/debian/config/hppa/defines
+++ b/debian/config/hppa/defines
@@ -22,5 +22,5 @@ hardware: multiprocessor 64-bit PA-RISC
 hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM
 
 [relations]
-gcc-4.9: gcc-4.9 <!stage1>, binutils-hppa64 <!stage1>, gcc-4.9-hppa64 <!stage1>
+gcc-5: gcc-5 <!stage1>, binutils-hppa64 <!stage1>, gcc-5-hppa64-linux-gnu <!stage1>
 
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 14f3b86ab948..b988c322a92d 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -1,5 +1,4 @@
 [base]
-compiler: gcc-5
 featuresets:
  none
  rt
diff --git a/debian/config/m68k/defines b/debian/config/m68k/defines
index 28a85e012b64..d5cddc958fce 100644
--- a/debian/config/m68k/defines
+++ b/debian/config/m68k/defines
@@ -1,5 +1,4 @@
 [base]
-compiler: gcc-4.8
 cflags: -ffreestanding
 flavours:
  m68k
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 30d86c99ff10..517ed75d1b7d 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -13,7 +13,7 @@ configs:
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-4.9: linux-compiler-gcc-4.9-s390
+headers%gcc-5: linux-compiler-gcc-5-s390
 
 [s390x_build]
 debug-info: true
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index c48546ffc79f..da3142977f2f 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,19 +1,19 @@
-Package: linux-compiler-gcc-4.9-arm
+Package: linux-compiler-gcc-5-arm
 Build-Profiles: <!stage1>
-Depends: gcc-4.9, ${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 4.9 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-4.9-s390
+Package: linux-compiler-gcc-5-s390
 Build-Profiles: <!stage1>
-Depends: gcc-4.9, ${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 4.9 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-5-x86