Skip to content

Commit 5cf5943

Browse files
committed
wip
Signed-off-by: squeakbug <[email protected]>
1 parent fa6447f commit 5cf5943

File tree

4 files changed

+6
-17
lines changed

4 files changed

+6
-17
lines changed

Makefile

+1-16
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,11 @@ TARGET_PATH := ./target/$(TARGET)/$(TYPE)
2222
KERNEL_LIBS := $(TARGET_PATH)
2323
KERNEL_LIB_OUT := $(KERNEL_LIBS)/libkernel.a
2424
KERNEL_LIB_ASM := kernel_lib.S
25-
RUSTFLAGS := -C soft-float -C panic=abort
25+
RUSTFLAGS = -C soft-float -C panic=abort
2626

2727
LDSCRIPT := $(KERNEL_SRC)/linker/kernel.ld
2828
LDFLAGS = -z max-page-size=0x1000 --gc-sections -Map map.txt
2929

30-
CFLAGS = -Wall -Werror -O -fno-omit-frame-pointer -ggdb -gdwarf-2
31-
CFLAGS += -MD
32-
CFLAGS += -Wl,--gc-sections -mcmodel=medany -march=rv64gc
33-
CFLAGS += -Wl,--no-warn-rwx-segments
34-
CFLAGS += -ffreestanding -nostartfiles -nostdlib -nodefaultlibs -fno-common -mno-relax
35-
CFLAGS += -I.
36-
CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
37-
38-
ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
39-
CFLAGS += -fno-pie -no-pie
40-
endif
41-
ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]nopie'),)
42-
CFLAGS += -fno-pie -nopie
43-
endif
44-
4530
# ---------------
4631
# Kernel building (TODO: move to build.rs structure)
4732
#

crates/kernel/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#![no_main]
22
#![no_std]
33

4+
mod task;
5+
46
use core::panic::PanicInfo;
57

68
use dev::uart16550::{putchar, UART_BASE};

crates/kernel/src/proc.rs

-1
This file was deleted.

crates/kernel/src/task.rs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
pub struct Task {
2+
3+
}

0 commit comments

Comments
 (0)