toolchain: Fix GCC builds

menix-os · Jan 10, 2025 · 1830926 · 1830926
1 parent 7fea593
commit 1830926
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 193 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,19 +4,7 @@
 		{
 			"type": "lldb",
 			"request": "custom",
-			"name": "Debug x86_64",
-			"targetCreateCommands": [
-				"settings set target.source-map ${workspaceFolder}/../bootstrap/build/source/kernel ${workspaceFolder}",
-				"target create ${workspaceFolder}/../bootstrap/build/build/kernel/bin/menix"
-			],
-			"processCreateCommands": [
-				"gdb-remote localhost:1234"
-			]
-		},
-		{
-			"type": "lldb",
-			"request": "custom",
-			"name": "Debug riscv64",
+			"name": "Debug",
 			"targetCreateCommands": [
 				"settings set target.source-map ${workspaceFolder}/../bootstrap/build/source/kernel ${workspaceFolder}",
 				"target create ${workspaceFolder}/../bootstrap/build/build/kernel/bin/menix"

diff --git a/kernel/arch/riscv64/CMakeLists.txt b/kernel/arch/riscv64/CMakeLists.txt
@@ -3,7 +3,7 @@
 include(${MENIX_UTIL_PATH})
 add_architecture(riscv64
 	system/arch.c
-	system/arch.asm
+	system/arch.s
 	sch/core.c
 	sch/thread.c
 	memory/vm.c

diff --git a/kernel/arch/riscv64/system/arch.asm → kernel/arch/riscv64/system/arch.s b/kernel/arch/riscv64/system/arch.asm → kernel/arch/riscv64/system/arch.s
diff --git a/kernel/arch/x86_64/CMakeLists.txt b/kernel/arch/x86_64/CMakeLists.txt
@@ -6,7 +6,7 @@ add_architecture(x86_64
 	system/idt.c
 	system/tss.c
 	system/serial.c
-	system/arch.asm
+	system/arch.s
 	system/archctl.c
 	system/arch.c
 	system/apic.c

diff --git a/kernel/arch/x86_64/system/arch.asm → kernel/arch/x86_64/system/arch.s b/kernel/arch/x86_64/system/arch.asm → kernel/arch/x86_64/system/arch.s