summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am20
-rw-r--r--Makefrag.am194
-rw-r--r--arch/x86/Makefrag.am76
-rw-r--r--doc/Makefrag.am4
-rwxr-xr-xtools/qemu.sh2
5 files changed, 148 insertions, 148 deletions
diff --git a/Makefile.am b/Makefile.am
index 0d2dec9d..f7f0b091 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,24 +13,24 @@ AM_CPPFLAGS += -nostdinc
AM_CPPFLAGS += -isystem $(shell $(CC) -print-file-name=include)
AM_CPPFLAGS += \
- -I$(top_srcdir) \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/arch/$(arch)
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/arch/$(arch)
AM_CFLAGS += -ffreestanding
AM_CFLAGS += -std=gnu11
AM_CFLAGS += \
- -Wall \
- -Wextra \
- -Wshadow \
- -Wmissing-prototypes \
- -Wstrict-prototypes
+ -Wall \
+ -Wextra \
+ -Wshadow \
+ -Wmissing-prototypes \
+ -Wstrict-prototypes
AM_CFLAGS += \
- -fsigned-char \
- -fno-common
+ -fsigned-char \
+ -fno-common
# TODO Add stack protector support
AM_CFLAGS += -fno-stack-protector
diff --git a/Makefrag.am b/Makefrag.am
index 8a17c18e..90c146b8 100644
--- a/Makefrag.am
+++ b/Makefrag.am
@@ -4,109 +4,109 @@ include doc/Makefrag.am
EXTRA_DIST += tools/qemu.sh
x15_SOURCES += \
- include/stdio.h \
- include/string.h
+ include/stdio.h \
+ include/string.h
x15_SOURCES += \
- kern/assert.h \
- kern/atomic.h \
- kern/bitmap.c \
- kern/bitmap.h \
- kern/bitmap_i.h \
- kern/condition.c \
- kern/condition.h \
- kern/condition_types.h \
- kern/config.h \
- kern/cpumap.c \
- kern/cpumap.h \
- kern/error.c \
- kern/error.h \
- kern/init.h \
- kern/kernel.c \
- kern/kernel.h \
- kern/kmem.c \
- kern/kmem.h \
- kern/kmem_i.h \
- kern/limits.h \
- kern/list.h \
- kern/list_types.h \
- kern/llsync.c \
- kern/llsync.h \
- kern/llsync_i.h \
- kern/log2.h \
- kern/macros.h \
- kern/mutex.c \
- kern/mutex.h \
- kern/mutex_i.h \
- kern/mutex_types.h \
- kern/panic.c \
- kern/panic.h \
- kern/param.h \
- kern/percpu.c \
- kern/percpu.h \
- kern/plist.c \
- kern/plist.h \
- kern/plist_types.h \
- kern/printf.c \
- kern/printf.h \
- kern/rbtree.c \
- kern/rbtree.h \
- kern/rbtree_i.h \
- kern/rdxtree.c \
- kern/rdxtree.h \
- kern/rdxtree_i.h \
- kern/rtmutex.c \
- kern/rtmutex.h \
- kern/rtmutex_i.h \
- kern/rtmutex_types.h \
- kern/semaphore.c \
- kern/semaphore.h \
- kern/semaphore_i.h \
- kern/sleepq.c \
- kern/sleepq.h \
- kern/spinlock.c \
- kern/spinlock.h \
- kern/spinlock_i.h \
- kern/spinlock_types.h \
- kern/sprintf.c \
- kern/sprintf.h \
- kern/sref.c \
- kern/sref.h \
- kern/sref_i.h \
- kern/string.c \
- kern/string.h \
- kern/syscnt.c \
- kern/syscnt.h \
- kern/syscnt_types.h \
- kern/task.c \
- kern/task.h \
- kern/thread.c \
- kern/thread.h \
- kern/thread_i.h \
- kern/turnstile.c \
- kern/turnstile.h \
- kern/turnstile_types.h \
- kern/types.h \
- kern/work.c \
- kern/work.h \
- kern/xcall.c \
- kern/xcall.h
+ kern/assert.h \
+ kern/atomic.h \
+ kern/bitmap.c \
+ kern/bitmap.h \
+ kern/bitmap_i.h \
+ kern/condition.c \
+ kern/condition.h \
+ kern/condition_types.h \
+ kern/config.h \
+ kern/cpumap.c \
+ kern/cpumap.h \
+ kern/error.c \
+ kern/error.h \
+ kern/init.h \
+ kern/kernel.c \
+ kern/kernel.h \
+ kern/kmem.c \
+ kern/kmem.h \
+ kern/kmem_i.h \
+ kern/limits.h \
+ kern/list.h \
+ kern/list_types.h \
+ kern/llsync.c \
+ kern/llsync.h \
+ kern/llsync_i.h \
+ kern/log2.h \
+ kern/macros.h \
+ kern/mutex.c \
+ kern/mutex.h \
+ kern/mutex_i.h \
+ kern/mutex_types.h \
+ kern/panic.c \
+ kern/panic.h \
+ kern/param.h \
+ kern/percpu.c \
+ kern/percpu.h \
+ kern/plist.c \
+ kern/plist.h \
+ kern/plist_types.h \
+ kern/printf.c \
+ kern/printf.h \
+ kern/rbtree.c \
+ kern/rbtree.h \
+ kern/rbtree_i.h \
+ kern/rdxtree.c \
+ kern/rdxtree.h \
+ kern/rdxtree_i.h \
+ kern/rtmutex.c \
+ kern/rtmutex.h \
+ kern/rtmutex_i.h \
+ kern/rtmutex_types.h \
+ kern/semaphore.c \
+ kern/semaphore.h \
+ kern/semaphore_i.h \
+ kern/sleepq.c \
+ kern/sleepq.h \
+ kern/spinlock.c \
+ kern/spinlock.h \
+ kern/spinlock_i.h \
+ kern/spinlock_types.h \
+ kern/sprintf.c \
+ kern/sprintf.h \
+ kern/sref.c \
+ kern/sref.h \
+ kern/sref_i.h \
+ kern/string.c \
+ kern/string.h \
+ kern/syscnt.c \
+ kern/syscnt.h \
+ kern/syscnt_types.h \
+ kern/task.c \
+ kern/task.h \
+ kern/thread.c \
+ kern/thread.h \
+ kern/thread_i.h \
+ kern/turnstile.c \
+ kern/turnstile.h \
+ kern/turnstile_types.h \
+ kern/types.h \
+ kern/work.c \
+ kern/work.h \
+ kern/xcall.c \
+ kern/xcall.h
x15_SOURCES += \
- vm/vm_adv.h \
- vm/vm_inherit.h \
- vm/vm_kmem.c \
- vm/vm_kmem.h \
- vm/vm_map.c \
- vm/vm_map.h \
- vm/vm_page.c \
- vm/vm_page.h \
- vm/vm_prot.h \
- vm/vm_setup.c \
- vm/vm_setup.h
+ vm/vm_adv.h \
+ vm/vm_inherit.h \
+ vm/vm_kmem.c \
+ vm/vm_kmem.h \
+ vm/vm_map.c \
+ vm/vm_map.h \
+ vm/vm_page.c \
+ vm/vm_page.h \
+ vm/vm_prot.h \
+ vm/vm_setup.c \
+ vm/vm_setup.h
x15_SOURCES += \
- test/test.h
+ test/test.h
if TEST_LLSYNC_DEFER
x15_SOURCES += test/test_llsync_defer.c
diff --git a/arch/x86/Makefrag.am b/arch/x86/Makefrag.am
index 224ca59b..5bedee07 100644
--- a/arch/x86/Makefrag.am
+++ b/arch/x86/Makefrag.am
@@ -24,43 +24,43 @@ x15_LDFLAGS += -m64
endif AMD64
x15_SOURCES += \
- arch/x86/machine/acpimp.c \
- arch/x86/machine/acpimp.h \
- arch/x86/machine/asm.h \
- arch/x86/machine/atomic.h \
- arch/x86/machine/biosmem.c \
- arch/x86/machine/biosmem.h \
- arch/x86/machine/boot_asm.S \
- arch/x86/machine/boot.c \
- arch/x86/machine/boot.h \
- arch/x86/machine/config.h \
- arch/x86/machine/cga.c \
- arch/x86/machine/cga.h \
- arch/x86/machine/cpu_asm.S \
- arch/x86/machine/cpu.c \
- arch/x86/machine/cpu.h \
- arch/x86/machine/elf.h \
- arch/x86/machine/io.h \
- arch/x86/machine/lapic.c \
- arch/x86/machine/lapic.h \
- arch/x86/machine/mb.h \
- arch/x86/machine/multiboot.h \
- arch/x86/machine/param.h \
- arch/x86/machine/pic.c \
- arch/x86/machine/pic.h \
- arch/x86/machine/pit.c \
- arch/x86/machine/pit.h \
- arch/x86/machine/pmap.c \
- arch/x86/machine/pmap.h \
- arch/x86/machine/strace.c \
- arch/x86/machine/strace.h \
- arch/x86/machine/string.c \
- arch/x86/machine/tcb_asm.S \
- arch/x86/machine/tcb.c \
- arch/x86/machine/tcb.h \
- arch/x86/machine/trap_asm.S \
- arch/x86/machine/trap.c \
- arch/x86/machine/trap.h \
- arch/x86/machine/types.h
+ arch/x86/machine/acpimp.c \
+ arch/x86/machine/acpimp.h \
+ arch/x86/machine/asm.h \
+ arch/x86/machine/atomic.h \
+ arch/x86/machine/biosmem.c \
+ arch/x86/machine/biosmem.h \
+ arch/x86/machine/boot_asm.S \
+ arch/x86/machine/boot.c \
+ arch/x86/machine/boot.h \
+ arch/x86/machine/config.h \
+ arch/x86/machine/cga.c \
+ arch/x86/machine/cga.h \
+ arch/x86/machine/cpu_asm.S \
+ arch/x86/machine/cpu.c \
+ arch/x86/machine/cpu.h \
+ arch/x86/machine/elf.h \
+ arch/x86/machine/io.h \
+ arch/x86/machine/lapic.c \
+ arch/x86/machine/lapic.h \
+ arch/x86/machine/mb.h \
+ arch/x86/machine/multiboot.h \
+ arch/x86/machine/param.h \
+ arch/x86/machine/pic.c \
+ arch/x86/machine/pic.h \
+ arch/x86/machine/pit.c \
+ arch/x86/machine/pit.h \
+ arch/x86/machine/pmap.c \
+ arch/x86/machine/pmap.h \
+ arch/x86/machine/strace.c \
+ arch/x86/machine/strace.h \
+ arch/x86/machine/string.c \
+ arch/x86/machine/tcb_asm.S \
+ arch/x86/machine/tcb.c \
+ arch/x86/machine/tcb.h \
+ arch/x86/machine/trap_asm.S \
+ arch/x86/machine/trap.c \
+ arch/x86/machine/trap.h \
+ arch/x86/machine/types.h
endif X86
diff --git a/doc/Makefrag.am b/doc/Makefrag.am
index 8d8b3e02..0869fdfb 100644
--- a/doc/Makefrag.am
+++ b/doc/Makefrag.am
@@ -1,8 +1,8 @@
EXTRA_DIST += doc/asciidoc.conf
x15_DOCS = \
- doc/intro.9.txt \
- doc/style.9.txt
+ doc/intro.9.txt \
+ doc/style.9.txt
x15_SOURCES += $(x15_DOCS)
diff --git a/tools/qemu.sh b/tools/qemu.sh
index 8de129a1..1e1990ba 100755
--- a/tools/qemu.sh
+++ b/tools/qemu.sh
@@ -30,7 +30,7 @@ cat > $CDROOT/boot/grub/grub.cfg << EOF
set timeout=1
menuentry "X15" --class os {
- multiboot (hd96)/boot/x15 root=device:hd1s8
+ multiboot (hd96)/boot/x15 root=device:hd1s8
}
EOF
grub-mkrescue -o $TMPDIR/grub.iso $CDROOT
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-04 23:17:05 +0000