From 2c606e3e1a7258ceaae705fe46a605b02b6ba601 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Mon, 12 Mar 2018 12:00:00 +0000
Subject: [PATCH] gem5: undo attempt to use the TARGET_CROSS...

---
 gem5/build       | 5 +----
 gem5/external.mk | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gem5/build b/gem5/build
index 35d015c..be84b01 100755
--- a/gem5/build
+++ b/gem5/build
@@ -20,15 +20,12 @@ shift "$(($OPTIND - 1))"
 if [ -z "$j" ]; then
   j="$(nproc)"
 fi
-top="$(dirname "$0")"
+top="$(cd $(dirname "$0") && pwd)"
 system_dir="${top}/system"
 binaries_dir="${system_dir}/binaries"
 disks_dir="${system_dir}/disks"
 mkdir -p "$binaries_dir" "$disks_dir"
 cd "${top}/gem5"
-
-TARGET_CROSS=
-
 if [ "$arch" = x86_64 ]; then
   CC=gcc-6 CXX=g++-6 scons -j"$j" --ignore-style build/X86/gem5.opt
   f="${disks_dir}/linux-bigswap2.img"
diff --git a/gem5/external.mk b/gem5/external.mk
index 20b519a..8168d2b 100644
--- a/gem5/external.mk
+++ b/gem5/external.mk
@@ -15,7 +15,8 @@ ARCH_MAKE = $(ARCH)
 endif
 
 define GEM5_BUILD_CMDS
-	cd '$(@D)' && ./build -a '$(ARCH)' -c '$(TARGET_CROSS)' -j '$(BR2_JLEVEL)'
+	# Cannot pass "-c '$(TARGET_CROSS)'" here because the ARM build uses aarch64 for the bootloader...
+	cd '$(@D)' && ./build -a '$(ARCH)' -j '$(BR2_JLEVEL)'
 	cd '$(@D)/gem5/util/m5' && $(MAKE) -f 'Makefile.$(ARCH_MAKE)' CC='$(TARGET_CC)' LD='$(TARGET_LD)'
 endef