From 840cec2b7e399cedd5103c4f7a117a6146d07355 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sat, 6 Mar 2021 16:10:27 +0100
Subject: [PATCH 01/15] =?UTF-8?q?Use=20`mov=20<reg>,=20offset=20<label>`?=
 =?UTF-8?q?=E2=80=AFinstead=20of=20`lea=20<label>`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stage_1.s | 4 ++--
 src/stage_2.s | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/stage_1.s b/src/stage_1.s
index 9107ff9c..9930cd43 100644
--- a/src/stage_1.s
+++ b/src/stage_1.s
@@ -78,7 +78,7 @@ check_int13h_extensions:
     jc no_int13h_extensions
 
 load_rest_of_bootloader_from_disk:
-    lea eax, _rest_of_bootloader_start_addr
+    mov eax, offset _rest_of_bootloader_start_addr
 
     # dap buffer segment
     mov ebx, eax
@@ -90,7 +90,7 @@ load_rest_of_bootloader_from_disk:
     sub eax, ebx
     mov [dap_buffer_addr], ax
 
-    lea eax, _rest_of_bootloader_start_addr
+    mov eax, offset _rest_of_bootloader_start_addr
 
     # number of disk blocks to load
     lea ebx, _rest_of_bootloader_end_addr
diff --git a/src/stage_2.s b/src/stage_2.s
index 5486439a..136c9dfb 100644
--- a/src/stage_2.s
+++ b/src/stage_2.s
@@ -40,8 +40,8 @@ load_kernel_from_disk:
     mov word ptr [dap_blocks], 1
 
     # number of start block
-    lea eax, _kernel_start_addr
-    lea ebx, _start
+    mov eax, offset _kernel_start_addr
+    mov ebx, offset _start
     sub eax, ebx
     shr eax, 9 # divide by 512 (block size)
     mov [dap_start_lba], eax

From cdbcb62219ea8702ca1a3ed867a2f2064ab6a43f Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sat, 6 Mar 2021 16:17:30 +0100
Subject: [PATCH 02/15] Use QEMU version 5.2.0-rc2 on Windows

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e019125e..91d1742e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
       if: runner.os == 'Windows'
       shell: pwsh
     - name: Install QEMU (Windows)
-      run: scoop install qemu
+      run: scoop install qemu@5.2.0-rc2
       if: runner.os == 'Windows'
       shell: pwsh
     - name: "Print QEMU Version"

From 0c16bfeddc9d6325aa2b1bfb5582c5839774e97f Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sat, 6 Mar 2021 16:17:48 +0100
Subject: [PATCH 03/15] More lea replacements

---
 src/stage_1.s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stage_1.s b/src/stage_1.s
index 9930cd43..80c8c077 100644
--- a/src/stage_1.s
+++ b/src/stage_1.s
@@ -93,7 +93,7 @@ load_rest_of_bootloader_from_disk:
     mov eax, offset _rest_of_bootloader_start_addr
 
     # number of disk blocks to load
-    lea ebx, _rest_of_bootloader_end_addr
+    mov ebx, offset _rest_of_bootloader_end_addr
     sub ebx, eax # end - start
     shr ebx, 9 # divide by 512 (block size)
     mov [dap_blocks], bx

From ec449ef9a84e12a4b48b8b3fe00243d08c727c56 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 12:46:10 +0100
Subject: [PATCH 04/15] Use QEMU version 5.1.0 on Windows

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91d1742e..798a2bb4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
       if: runner.os == 'Windows'
       shell: pwsh
     - name: Install QEMU (Windows)
-      run: scoop install qemu@5.2.0-rc2
+      run: scoop install qemu@5.1.0
       if: runner.os == 'Windows'
       shell: pwsh
     - name: "Print QEMU Version"

From fed13b5e308dd621175b4e1a01bc82bcf936bfa3 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 13:01:41 +0100
Subject: [PATCH 05/15] Revert "Use QEMU version 5.1.0 on Windows"

This reverts commit ec449ef9a84e12a4b48b8b3fe00243d08c727c56.
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 798a2bb4..91d1742e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
       if: runner.os == 'Windows'
       shell: pwsh
     - name: Install QEMU (Windows)
-      run: scoop install qemu@5.1.0
+      run: scoop install qemu@5.2.0-rc2
       if: runner.os == 'Windows'
       shell: pwsh
     - name: "Print QEMU Version"

From 422f058d75f3dd3320221160e2d9ecf888259b4c Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 13:04:41 +0100
Subject: [PATCH 06/15] =?UTF-8?q?=E2=80=AFTry=20choco=20for=20installing?=
 =?UTF-8?q?=20qemu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91d1742e..4e46262c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,14 +64,8 @@ jobs:
         HOMEBREW_NO_AUTO_UPDATE: 1
         HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1
         HOMEBREW_NO_INSTALL_CLEANUP: 1
-    - name: Install Scoop (Windows)
-      run: |
-        Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
-        echo "$HOME\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      if: runner.os == 'Windows'
-      shell: pwsh
     - name: Install QEMU (Windows)
-      run: scoop install qemu@5.2.0-rc2
+      run: choco install qemu
       if: runner.os == 'Windows'
       shell: pwsh
     - name: "Print QEMU Version"

From c3d7aab37c3d1de9e1d5dcd9f94841323dda8d12 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 13:20:21 +0100
Subject: [PATCH 07/15] Add QEMU to path

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4e46262c..7f5d4eba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,7 +65,9 @@ jobs:
         HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1
         HOMEBREW_NO_INSTALL_CLEANUP: 1
     - name: Install QEMU (Windows)
-      run: choco install qemu
+      run: |
+        choco install qemu
+        echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       if: runner.os == 'Windows'
       shell: pwsh
     - name: "Print QEMU Version"

From 0f45b9b539a9632a200b66a6314f09f04676c855 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 13:22:23 +0100
Subject: [PATCH 08/15] Limit choco output

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7f5d4eba..aa6f953a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,7 +66,7 @@ jobs:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
     - name: Install QEMU (Windows)
       run: |
-        choco install qemu
+        choco install qemu --limit-output
         echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       if: runner.os == 'Windows'
       shell: pwsh

From 1c465afcb0b81b9ddf1e624c80cb87cf470a74b2 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 13:30:31 +0100
Subject: [PATCH 09/15] Use --no-progress for choco

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aa6f953a..97e96b5e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,7 +66,7 @@ jobs:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
     - name: Install QEMU (Windows)
       run: |
-        choco install qemu --limit-output
+        choco install qemu --no-progress
         echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       if: runner.os == 'Windows'
       shell: pwsh

From 93cd7a87bf31b8d651b7b2bcb0696429d36c043b Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 13:36:09 +0100
Subject: [PATCH 10/15] Install earlier QEMU version

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 97e96b5e..0e990acc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,7 +66,7 @@ jobs:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
     - name: Install QEMU (Windows)
       run: |
-        choco install qemu --no-progress
+        choco install qemu --version=2021.02.03 -y --no-progress
         echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       if: runner.os == 'Windows'
       shell: pwsh

From 9bb63556c3dfce925e79f2b8d096daea83f0016f Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 13:47:54 +0100
Subject: [PATCH 11/15] Use an even earlier version

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0e990acc..6ab77b6b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,7 +66,7 @@ jobs:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
     - name: Install QEMU (Windows)
       run: |
-        choco install qemu --version=2021.02.03 -y --no-progress
+        choco install qemu --version=2020.11.20 -y --no-progress
         echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       if: runner.os == 'Windows'
       shell: pwsh

From 30f97ddf516f816fa935f4abe420dd66402f9acb Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 14:06:45 +0100
Subject: [PATCH 12/15] Use scoop again and try -L option

---
 .github/workflows/build.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ab77b6b..8305ee30 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,10 +64,14 @@ jobs:
         HOMEBREW_NO_AUTO_UPDATE: 1
         HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1
         HOMEBREW_NO_INSTALL_CLEANUP: 1
-    - name: Install QEMU (Windows)
+    - name: Install Scoop (Windows)
       run: |
-        choco install qemu --version=2020.11.20 -y --no-progress
-        echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+        echo "$HOME\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      if: runner.os == 'Windows'
+      shell: pwsh
+    - name: Install QEMU (Windows)
+      run: scoop install qemu
       if: runner.os == 'Windows'
       shell: pwsh
     - name: "Print QEMU Version"
@@ -78,7 +82,14 @@ jobs:
         qemu-system-x86_64 -drive format=raw,file=target/x86_64-bootloader/release/bootloader.bin -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none
         if [ $? -eq 123 ]; then (exit 0); else (exit 1); fi
       shell: 'bash {0}'
+      if: runner.os != 'Windows'
 
+    - name: 'Run Test Kernel with Bootloader (Windows)'
+      run: |
+        qemu-system-x86_64 -drive format=raw,file=target/x86_64-bootloader/release/bootloader.bin -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none -L "C:\Program Files\qemu"
+        if [ $? -eq 123 ]; then (exit 0); else (exit 1); fi
+      shell: 'bash {0}'
+      if: runner.os == 'Windows'
 
   build_example_kernel:
     name: "Build Example Kernel"

From 82c1377f242c39aecb6a95af949c3db22050a06d Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 14:08:44 +0100
Subject: [PATCH 13/15] Don't fail fast

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8305ee30..c84138a8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,6 +14,7 @@ jobs:
     name: "Test"
 
     strategy:
+      fail-fast: false
       matrix:
         platform: [
           ubuntu-latest,

From e84c7ccdfc8813aec1bfb5e33c2a44f6031aaff3 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 14:15:54 +0100
Subject: [PATCH 14/15] Let Windows build fail for now and hope for new QEMU
 version

---
 .github/workflows/build.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c84138a8..56fa6316 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,14 +83,6 @@ jobs:
         qemu-system-x86_64 -drive format=raw,file=target/x86_64-bootloader/release/bootloader.bin -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none
         if [ $? -eq 123 ]; then (exit 0); else (exit 1); fi
       shell: 'bash {0}'
-      if: runner.os != 'Windows'
-
-    - name: 'Run Test Kernel with Bootloader (Windows)'
-      run: |
-        qemu-system-x86_64 -drive format=raw,file=target/x86_64-bootloader/release/bootloader.bin -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none -L "C:\Program Files\qemu"
-        if [ $? -eq 123 ]; then (exit 0); else (exit 1); fi
-      shell: 'bash {0}'
-      if: runner.os == 'Windows'
 
   build_example_kernel:
     name: "Build Example Kernel"

From 973ff99c7308140c3ec546e461e76a241ed2ee12 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sun, 7 Mar 2021 14:33:29 +0100
Subject: [PATCH 15/15] Bump version to 0.9.15

---
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 Changelog.md | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc832359..31c60be4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,7 +22,7 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "bootloader"
-version = "0.9.14"
+version = "0.9.15"
 dependencies = [
  "bit_field 0.10.1",
  "fixedvec",
diff --git a/Cargo.toml b/Cargo.toml
index 6c8fbe0f..a1c5c566 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bootloader"
-version = "0.9.14"
+version = "0.9.15"
 authors = ["Philipp Oppermann <dev@phil-opp.com>"]
 license = "MIT/Apache-2.0"
 description = "An experimental pure-Rust x86 bootloader."
diff --git a/Changelog.md b/Changelog.md
index 728d8687..e200b338 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
 # Unreleased
 
+# 0.9.15 – 2021-03-07
+
+- Fix linker errors on latest nightlies ([#139](https://github.com/rust-osdev/bootloader/pull/139))
+
 # 0.9.14 – 2021-02-24
 
 - Fix "panic message is not a string literal" warning ([#138](https://github.com/rust-osdev/bootloader/pull/138))