From c21eb10e86fce358b37634c8c6b746daa0ecad1d Mon Sep 17 00:00:00 2001 From: Amelia Coutard Date: Wed, 4 May 2022 13:12:16 +0200 Subject: [PATCH] Updated Makefile Made qemu allow 1GiB pages, and changed the compile args to use c++20. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 645c32d..d88f6b4 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,11 @@ DEPS_DIR ?= deps/ CXX := x86_64-elf-g++ CXXFLAGS ?= -O2 -CXXFLAGS := $(CXXFLAGS) -Wall -Wextra -Werror \ +CXXFLAGS := $(CXXFLAGS) -Wall -Wextra -Werror -std=c++20 \ -ffreestanding -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -mno-sse2 -fno-exceptions -fno-rtti LDFLAGS ?= -O2 -LDFLAGS := $(LDFLAGS) -Wall -Wextra -Werror \ +LDFLAGS := $(LDFLAGS) -Wall -Wextra -Werror -std=c++20 \ -ffreestanding -T linker.ld -z max-page-size=0x1000 LDLIBS := $(LDLIBS) -nostdlib -lgcc @@ -20,7 +20,7 @@ OBJECTS := $(CPPOBJS) $(ASMOBJS) build: $(OUT_DIR)amycros.iso qemu: build - qemu-system-x86_64 -cdrom $(OUT_DIR)amycros.iso -monitor stdio $(QEMUFLAGS) + qemu-system-x86_64 -cdrom $(OUT_DIR)amycros.iso -monitor stdio -cpu qemu64,pdpe1gb $(QEMUFLAGS) $(OUT_DIR)amycros.iso: $(OUT_DIR)kernel.elf64 grub.cfg mkdir -p isodir/boot/grub -- 2.47.0