From 518ce3818cf00db6ecbdad87a9bd1c23170454b7 Mon Sep 17 00:00:00 2001
From: liric <i@liric.cn>
Date: Thu, 15 Sep 2022 21:19:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9D=E7=84=B6=E6=98=AF=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=92=88=E5=AF=B9Mac=E7=BC=96=E8=AF=91=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9A=84=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                | 1 +
 kernel/Makefile           | 4 ++--
 kernel/exception/Makefile | 4 ++--
 kernel/process/Makefile   | 4 ++--
 kernel/smp/Makefile       | 4 ++--
 run.sh                    | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13b1f785..03f6b7ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 DragonOS.iso
 .idea/
 kernel/kernel
+.DS_Store
 
 *.o
 *.s
diff --git a/kernel/Makefile b/kernel/Makefile
index 8bdb98d7..a9db8fc3 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -22,8 +22,8 @@ kernel_subdirs := common driver process debug filesystem time arch exception mm
 
 
 head.o: head.S
-	gcc -E head.S > head.s # 预处理
-	as $(ASFLAGS) -o head.o head.s
+	gcc -E head.S > _head.s # 预处理
+	as $(ASFLAGS) -o head.o _head.s
 
 
 main.o: main.c 
diff --git a/kernel/exception/Makefile b/kernel/exception/Makefile
index 033c0e70..e3e0f72b 100644
--- a/kernel/exception/Makefile
+++ b/kernel/exception/Makefile
@@ -5,8 +5,8 @@ CFLAGS += -I .
 all: entry.o irq.o softirq.o trap.o
 
 entry.o: entry.S
-	gcc -E entry.S > entry.s
-	as $(ASFLAGS) -o entry.o entry.s
+	gcc -E entry.S > _entry.s
+	as $(ASFLAGS) -o entry.o _entry.s
 
 trap.o: trap.c
 	gcc $(CFLAGS) -c trap.c -o trap.o
diff --git a/kernel/process/Makefile b/kernel/process/Makefile
index e7fb7ce7..ba4385e3 100644
--- a/kernel/process/Makefile
+++ b/kernel/process/Makefile
@@ -6,8 +6,8 @@ CFLAGS += -I .
 
 
 procs.o: proc.S
-	gcc -E proc.S > proc.s
-	as $(ASFLAGS) -o procs.o proc.s
+	gcc -E proc.S > _proc.s
+	as $(ASFLAGS) -o procs.o _proc.s
 
 process.o: process.c
 	gcc $(CFLAGS) -c process.c -o process.o
diff --git a/kernel/smp/Makefile b/kernel/smp/Makefile
index 5379b54c..7f7ab081 100644
--- a/kernel/smp/Makefile
+++ b/kernel/smp/Makefile
@@ -6,8 +6,8 @@ all: apu_boot.o smp.o
 
 
 apu_boot.o: apu_boot.S
-	gcc -E apu_boot.S > apu_boot.s # 预处理
-	as $(ASFLAGS) -o apu_boot.o apu_boot.s
+	gcc -E apu_boot.S > _apu_boot.s # 预处理
+	as $(ASFLAGS) -o apu_boot.o _apu_boot.s
 
 smp.o: smp.c
 	gcc $(CFLAGS) -c smp.c -o smp.o
\ No newline at end of file
diff --git a/run.sh b/run.sh
index 92ecc581..da640b37 100755
--- a/run.sh
+++ b/run.sh
@@ -159,7 +159,7 @@ qemu_trace_usb=trace:usb_xhci_reset,trace:usb_xhci_run,trace:usb_xhci_stop,trace
 
 
 qemu_accel=kvm
-if [ "${OS}" == "Darwin" ]; then
+if [ $(uname) == Darwin ]; then
     qemu_accel=hvf
 fi