diff options
| author | aqua <aqua@iserlohn-fortress.net> | 2022-07-17 16:12:04 +0300 |
|---|---|---|
| committer | aqua <aqua@iserlohn-fortress.net> | 2022-08-12 10:13:59 +0300 |
| commit | ad4d619c342b7dad2bf02f3b1b02535140741b79 (patch) | |
| tree | 9e9d8209dfc9fd8094b44f9d4105651f9d42622d | |
| parent | printf: add %d, %u and %x (diff) | |
| download | kernel-ad4d619c342b7dad2bf02f3b1b02535140741b79.tar.xz | |
Remove duplicated linker.ld argument
| -rw-r--r-- | .gitignore (renamed from .hgignore) | 1 | ||||
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | arch/i686/toolchain.ini | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
4 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,2 @@ -syntax: glob lib/musl* build* @@ -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), |