aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorIan Moffett <ian@osmora.org>2024-03-03 20:17:22 -0500
committerIan Moffett <ian@osmora.org>2024-03-03 20:17:22 -0500
commite7dd2f1e547f895a5e3e0c9507b846984971d544 (patch)
treec7be99cc5ea0a69da5407384c272377929630262 /Makefile.in
parentf1a10f336b93f657bb4065d2ba3b18fe3dcd3f94 (diff)
build: Use Hyra specific toolchain
Created patches for binutils and GCC tailored to Hyra Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index df99dc0..8b098c6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,14 +33,19 @@ override KERNEL_DEFINES = -DHYRA_VERSION="\"$(HYRA_VERSION)\""\
$(SPECTRE_FLAGS)\
$(SERIAL_DEBUG_FLAGS)
override KERNEL_CFLAGS = @KERNEL_CFLAGS@ $(KERNEL_DEFINES)
-override KERNEL_LDFLAGS = -nostdlib -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld
+override KERNEL_LDFLAGS = -nostdlib -znoexecstack -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld
override QEMU_FLAGS = @QEMU_FLAGS@
######################
# Binutils stuff
######################
-override CC = $(shell pwd)/cross/bin/$(ARCH)-elf-gcc
-override LD = $(shell pwd)/cross/bin/$(ARCH)-elf-ld
+ifeq ($(ARCH), amd64)
+ override CC = $(shell pwd)/cross/bin/x86_64-hyra-gcc
+ override LD = $(shell pwd)/cross/bin/x86_64-hyra-ld
+else
+ override CC = $(shell pwd)/cross/bin/$(ARCH)-hyra-gcc
+ override LD = $(shell pwd)/cross/bin/$(ARCH)-hyra-ld
+endif
override AS = $(CC)
##########################