From af476687e15ec99d0f136b2232221cdece3fa7fb Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Sat, 31 Mar 2018 07:38:37 +0100
Subject: [PATCH] gem5: x86_64 gcc 7 compilation was fixed after latest pull

So get rid of the specific gcc-6 and gcc-6 install.
---
 configure  | 2 --
 gem5/build | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/configure b/configure
index e6178ab..82ca9e3 100755
--- a/configure
+++ b/configure
@@ -57,8 +57,6 @@ coreutils \
 "
 if "$gem5"; then
   pkgs="$pkgs \
-g++-6 \
-gcc-6 \
 gcc-aarch64-linux-gnu \
 gcc-arm-linux-gnueabi \
 libgoogle-perftools-dev \
diff --git a/gem5/build b/gem5/build
index 04c0db8..747fd8d 100755
--- a/gem5/build
+++ b/gem5/build
@@ -27,7 +27,7 @@ disks_dir="${system_dir}/disks"
 mkdir -p "$binaries_dir" "$disks_dir"
 cd "${top}/gem5"
 if [ "$arch" = x86_64 ]; then
-  CC=gcc-6 CXX=g++-6 scons -j "$j" --ignore-style build/X86/gem5.opt
+  scons -j "$j" --ignore-style build/X86/gem5.opt
   f="${disks_dir}/linux-bigswap2.img"
   dd if=/dev/zero of="$f" bs=1024 count=65536
   mkswap "$f"
@@ -35,8 +35,6 @@ if [ "$arch" = x86_64 ]; then
   # I'm not even joking. No one has ever built x86 gem5 without the magic dist dir present.
   touch "${binaries_dir}/x86_64-vmlinux-2.6.22.9"
 elif [ "$arch" = arm ] || [ "$arch" = aarch64 ]; then
-  # Compilation fails with gcc 7 on that commit.
-  # There were some recent portability patches, so it will likely get there soon.
   scons -j "$j" --ignore-style build/ARM/gem5.opt
   make -C ./system/arm/dt/
   # TODO use the buildroot cross compiler here, and remove the dependencies from configure.