diff --git a/gem5/build b/gem5/build
index be84b01..b8501a9 100755
--- a/gem5/build
+++ b/gem5/build
@@ -37,7 +37,7 @@ if [ "$arch" = x86_64 ]; then
 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.
-  CC=gcc-6 CXX=g++-6 scons -j"$j" --ignore-style build/ARM/gem5.opt
+  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.
   make -C ./system/arm/simple_bootloader/ $cross_compile
diff --git a/gem5/gem5 b/gem5/gem5
index fbe6307..68af229 160000
--- a/gem5/gem5
+++ b/gem5/gem5
@@ -1 +1 @@
-Subproject commit fbe63074e3a8128bdbe1a5e8f6509c565a3abbd4
+Subproject commit 68af229490fc811aebddf68b3e2e09e63a5fa475