From ad4d619c342b7dad2bf02f3b1b02535140741b79 Mon Sep 17 00:00:00 2001 From: aqua Date: Sun, 17 Jul 2022 16:12:04 +0300 Subject: Remove duplicated linker.ld argument --- .gitignore | 2 ++ .hgignore | 3 --- README.md | 12 ++++++++++++ arch/i686/toolchain.ini | 2 +- meson.build | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .gitignore delete mode 100644 .hgignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..005bd7f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +lib/musl* +build* diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 9954522..0000000 --- a/.hgignore +++ /dev/null @@ -1,3 +0,0 @@ -syntax: glob -lib/musl* -build* diff --git a/README.md b/README.md index bff995e..e89c8c8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ +## A simple kernel written in C + +## features +- uart: 16550 (write) +- vga text mode +- pic: 8259 + + +## building +```sh +meson setup --cross-file=arch/i686/toolchain.ini build +``` # musl - arch/i686/include/sys/io.h diff --git a/arch/i686/toolchain.ini b/arch/i686/toolchain.ini index 6f6b5ef..bad3095 100644 --- a/arch/i686/toolchain.ini +++ b/arch/i686/toolchain.ini @@ -14,5 +14,5 @@ strip = 'i686-elf-strip' [built-in options] c_args = ['-fanalyzer', '-ffreestanding'] -c_link_args = [ '-static', '-nostdlib', '-T', 'arch/i686/linker.ld' ] +c_link_args = ['-nostdlib'] diff --git a/meson.build b/meson.build index d0f6819..8279212 100644 --- a/meson.build +++ b/meson.build @@ -9,7 +9,7 @@ kernel = executable('glitch.elf', 'src/isr.c', 'src/mem/vmm.c', 'lib/string/itoa.c', 'lib/stdio/printf.c'], link_language: 'c', - link_args: ['-ffreestanding', '-nostdlib', '-static', '-T', meson.current_source_dir()/'arch/i686/linker.ld'], + link_args: ['-ffreestanding', '-static', '-T', meson.current_source_dir()/'arch/i686/linker.ld'], install: true, native: false, include_directories: [ include_directories('grub/include', is_system: true), -- cgit v1.2.1