kernel

@@ -1 +1 @@
-Subproject commit f873fc7e1a20ac9a5630ec031a086903d2917792
+Subproject commit 98af1405e606cc1ee7f4aec3df428c6c8a576471

mk/kernel.mk

@@ -16,21 +16,21 @@ build/libkernel_live.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src
 	cd kernel && \
 	cargo rustc --lib --target=$(ROOT)/kernel/targets/$(KTARGET).json --release --features live -Z build-std=core,alloc -- -C soft-float -C debuginfo=2 -C lto --emit link=../$@
 
-build/kernel: kernel/linkers/$(ARCH).ld mk/kernel_ld.sh build/libkernel.a
+build/kernel: kernel/linkers/$(ARCH).ld build/libkernel.a
 	export PATH="$(PREFIX_PATH):$$PATH" && \
-	$(ROOT)/mk/kernel_ld.sh $(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel.a && \
+	$(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel.a && \
 	$(OBJCOPY) --only-keep-debug $@ $@.sym && \
 	$(OBJCOPY) --strip-debug $@
 
-build/kernel_coreboot: kernel/linkers/$(ARCH).ld mk/kernel_ld.sh build/libkernel_coreboot.a build/live.o
+build/kernel_coreboot: kernel/linkers/$(ARCH).ld build/libkernel_coreboot.a build/live.o
 	export PATH="$(PREFIX_PATH):$$PATH" && \
-	$(ROOT)/mk/kernel_ld.sh $(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel_coreboot.a build/live.o && \
+	$(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel_coreboot.a build/live.o && \
 	$(OBJCOPY) --only-keep-debug $@ $@.sym && \
 	$(OBJCOPY) --strip-debug $@
 
-build/kernel_live: kernel/linkers/$(ARCH).ld mk/kernel_ld.sh build/libkernel_live.a build/live.o
+build/kernel_live: kernel/linkers/$(ARCH).ld build/libkernel_live.a build/live.o
 	export PATH="$(PREFIX_PATH):$$PATH" && \
-	$(ROOT)/mk/kernel_ld.sh $(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel_live.a build/live.o && \
+	$(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel_live.a build/live.o && \
 	$(OBJCOPY) --only-keep-debug $@ $@.sym && \
 	$(OBJCOPY) --strip-debug $@
 

mk/kernel_ld.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-LD="$1"
-shift
-
-if "${LD}" -z use-gs-for-tls 2>&1 |
-grep "warning: -z use-gs-for-tls ignored" &> /dev/null
-then
-	echo "Please update your prefix:" >&2
-	echo "  rm -rf prefix" >&2
-	echo "  make prefix" >&2
-	exit 1
-fi
-
-exec "${LD}" -z use-gs-for-tls "$@"