From 061c2ef1aa5b69d94d1e7c2589c7b88f7fb3899b Mon Sep 17 00:00:00 2001
From: Alex <enderice2@users.noreply.github.com>
Date: Fri, 7 Apr 2023 05:29:28 +0300
Subject: [PATCH] Update submodules

---
 Fennix Kernel.code-workspace    |  1 +
 Fennix Userspace.code-workspace |  5 ++++-
 Kernel                          |  2 +-
 Makefile                        | 21 ++++++++++++++++++---
 Userspace                       |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Fennix Kernel.code-workspace b/Fennix Kernel.code-workspace
index 293244b9..bad136df 100644
--- a/Fennix Kernel.code-workspace	
+++ b/Fennix Kernel.code-workspace	
@@ -242,6 +242,7 @@
 			"PLTGOT",
 			"PLTREL",
 			"PLTRELSZ",
+			"POPCNT",
 			"powerline",
 			"Prefetchable",
 			"PREINIT",
diff --git a/Fennix Userspace.code-workspace b/Fennix Userspace.code-workspace
index 427254b3..632ca774 100644
--- a/Fennix Userspace.code-workspace	
+++ b/Fennix Userspace.code-workspace	
@@ -22,16 +22,19 @@
 			"inttypes.h": "c",
 			"doomkeys.h": "c",
 			"doomgeneric.h": "c",
-			"elf.h": "c"
+			"elf.h": "c",
+			"init.h": "c"
 		},
 		"cSpell.words": [
 			"auxv",
 			"cmpq",
 			"FENNIX",
+			"JMPREL",
 			"Krnl",
 			"liballoc",
 			"libinit",
 			"preinit",
+			"Shdr",
 			"vfctprintf"
 		]
 	}
diff --git a/Kernel b/Kernel
index 212121a4..25aa9ff6 160000
--- a/Kernel
+++ b/Kernel
@@ -1 +1 @@
-Subproject commit 212121a40b38d9d249676cfb3ed895f01264aabd
+Subproject commit 25aa9ff6a6ea2ecd27c410e791f5c4a6c88a6ffc
diff --git a/Makefile b/Makefile
index 06096a89..f87e4a14 100644
--- a/Makefile
+++ b/Makefile
@@ -168,17 +168,32 @@ endif
 # QEMU_UEFI_BIOS = -bios -bios /usr/share/AAVMF/AAVMF_CODE.fd
 # endif
 
+ifeq ($(OSARCH), amd64)
+QEMU_SMP_DBG = -smp $(shell echo $(shell nproc)/4 | bc)
+QEMU_SMP = -smp $(shell nproc)
+endif
+
+ifeq ($(OSARCH), i386)
+QEMU_SMP_DBG = -smp $(shell echo $(shell nproc)/4 | bc)
+QEMU_SMP = -smp $(shell nproc)
+endif
+
+ifeq ($(OSARCH), aarch64)
+QEMU_SMP_DBG = -smp 4
+QEMU_SMP = -smp 4
+endif
+
 vscode_debug: build_kernel build_userspace build_drivers build_image
 	rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp
-	$(QEMU) -S -gdb tcp::1234 -d int -no-reboot -no-shutdown $(QEMU_UEFI_BIOS) -m 1G $(QEMUFLAGS) -smp $(shell echo $(shell nproc)/4 | bc)
+	$(QEMU) -S -gdb tcp::1234 -d int -no-reboot -no-shutdown $(QEMU_UEFI_BIOS) -m 1G $(QEMUFLAGS) $(QEMU_SMP_DBG)
 
 qemu: qemu_vdisk
 	rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp
-	$(QEMU) $(QEMU_UEFI_BIOS) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) -smp $(shell nproc)
+	$(QEMU) $(QEMU_UEFI_BIOS) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) $(QEMU_SMP)
 
 qemubios: qemu_vdisk
 	rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp
-	$(QEMU) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) -smp $(shell nproc)
+	$(QEMU) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) $(QEMU_SMP)
 
 run: build qemu
 
diff --git a/Userspace b/Userspace
index fc97b09d..c20aae95 160000
--- a/Userspace
+++ b/Userspace
@@ -1 +1 @@
-Subproject commit fc97b09d6ed2540fc53592a8ae0fa905beac3f28
+Subproject commit c20aae950434d96598034f9974a8cc6f00ec8546