:: commit 21ec72f1b7f9272d4b1b9c81c2863543dfe5f1ca

diff --git a/Makefile b/Makefile
index aaa48ee7..b875edfd 100644
--- a/Makefile
+++ b/Makefile
@@ -110,8 +110,8 @@ toolchain:
 
 gnu-efi:
 	git clone https://git.code.sf.net/p/gnu-efi/code --branch=3.0.13 --depth=1 $@
-	$(MAKE) -C gnu-efi/gnuefi CC="$(TOOLCHAIN_CC) -m64" AR="$(TOOLCHAIN_AR)"
-	$(MAKE) -C gnu-efi/lib CC="$(TOOLCHAIN_CC) -m64" ARCH=x86_64 x86_64/efi_stub.o
+	$(MAKE) -C gnu-efi/gnuefi CC="$(TOOLCHAIN_CC) -m64 -march=x86-64" AR="$(TOOLCHAIN_AR)"
+	$(MAKE) -C gnu-efi/lib CC="$(TOOLCHAIN_CC) -m64 -march=x86-64" ARCH=x86_64 x86_64/efi_stub.o
 
 ovmf:
 	mkdir -p ovmf
diff --git a/stage23/Makefile b/stage23/Makefile
index 7586f51d..cf02b43f 100644
--- a/stage23/Makefile
+++ b/stage23/Makefile
@@ -109,9 +109,8 @@ ifeq ($(TARGET), uefi)
 		-m64 \
 		-march=x86-64 \
 		-Wl,-melf_x86_64 \
-		-static-pie \
-		-Wl,-Bsymbolic \
 		-Wl,--noinhibit-exec \
+		-static-pie \
 		-pie \
 		-fpie
 endif