From aee015eebc214ceffa3bcd9c4aebcfab60f1c817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= <thomasloven@gmail.com>
Date: Tue, 14 Nov 2017 21:26:36 +0100
Subject: [PATCH] Use new version of qemu to avoid problems when changing to
 long mode

---
 toolchain/Dockerfile         | 2 +-
 toolchain/build-toolchain.sh | 7 ++++---
 toolchain/gdb                | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/toolchain/Dockerfile b/toolchain/Dockerfile
index e1eb583..ce0afc7 100644
--- a/toolchain/Dockerfile
+++ b/toolchain/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine
+FROM alpine:3.6
 
 ADD build-toolchain.sh /opt/build-toolchain.sh
 
diff --git a/toolchain/build-toolchain.sh b/toolchain/build-toolchain.sh
index 324f602..6f9ab38 100755
--- a/toolchain/build-toolchain.sh
+++ b/toolchain/build-toolchain.sh
@@ -5,7 +5,8 @@ apk add gmp-dev mpfr-dev mpc1-dev
 
 apk add make
 apk add grub-bios xorriso
-apk add qemu-system-x86_64 gdb
+apk add gdb
+apk --update add qemu-system-x86_64 --repository http://dl-cdn.alpinelinux.org/alpine/v3.7/main
 
 rm -rf /var/cache/apk/*
 
@@ -24,7 +25,7 @@ mkdir binutils-build && cd binutils-build
   --disable-werror \
   --with-sysroot \
 
-make
+make -j 4
 make install
 
 cd /opt
@@ -37,7 +38,7 @@ mkdir gcc-build && cd gcc-build
   --enable-languages=c \
   --without-headers \
 
-make all-gcc all-target-libgcc
+make all-gcc all-target-libgcc -j 4
 make install-gcc install-target-libgcc
 
 apk del build-base
diff --git a/toolchain/gdb b/toolchain/gdb
index cc4fefe..bc1b3e3 100755
--- a/toolchain/gdb
+++ b/toolchain/gdb
@@ -2,4 +2,4 @@
 
 if [ -z ${MITTOS64+x} ]; then >&2 echo "Unsupported environment! See README"; exit 1; fi
 
-/usr/bin/gdb -q -x ${BUILDROOT}toolchain/gdbinit
+/usr/bin/gdb -q -x ${BUILDROOT}toolchain/gdbinit -se ${BUILDROOT}sysroot/kernel