diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 4 | ||||
| -rw-r--r-- | apps/idle.c | 7 | ||||
| -rw-r--r-- | apps/init.c | 6 | ||||
| -rw-r--r-- | apps/link.ld | 5 |
4 files changed, 12 insertions, 10 deletions
diff --git a/apps/Makefile b/apps/Makefile index 9ad268e..66f8e42 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -4,6 +4,7 @@ COBJS = init.o idle.o wm.o test.o window.o #mandelbrot.o window.o exec.o files.o CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld OC = ccache ../cross/opt/bin/i686-elf-objcopy +ST = ccache ../cross/opt/bin/i686-elf-strip CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -Duserspace @@ -12,8 +13,9 @@ all: $(COBJS) %.o: %.c @mkdir -p ../build/apps/ @$(CC) -c $(CFLAGS) $< -o $@ - @$(LD) -o $(@:.o=.elf) -L../build/ $@ -lgui -ltxt -lc + @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ -static $@ -lgui -ltxt -lc @cp $(@:.o=.elf) ../build/apps/$(@:.o=) +#@$(ST) --strip-all ../build/apps/$(@:.o=) # %.o: %.c # @mkdir -p ../build/apps/ diff --git a/apps/idle.c b/apps/idle.c index 3f10c3e..15ffc68 100644 --- a/apps/idle.c +++ b/apps/idle.c @@ -1,7 +1,12 @@ // MIT License, Copyright (c) 2021 Marvin Borner -int main(void) +#include <def.h> + +int main(int argc, char **argv) { + UNUSED(argc); + UNUSED(argv); while (1) ; + return 0; } diff --git a/apps/init.c b/apps/init.c index c26e3ad..221708e 100644 --- a/apps/init.c +++ b/apps/init.c @@ -9,11 +9,9 @@ int main(int argc, char **argv) UNUSED(argc); UNUSED(argv); log("Arrived!\n"); - while (1) - ; - assert(exec("/bin/wm", "wm", NULL) == 0); - assert(exec("/bin/window", "test", NULL) == 0); + /* assert(exec("/bin/wm", "wm", NULL) == 0); */ + /* assert(exec("/bin/window", "test", NULL) == 0); */ return 0; } diff --git a/apps/link.ld b/apps/link.ld index 781e38d..e28bb34 100644 --- a/apps/link.ld +++ b/apps/link.ld @@ -1,11 +1,10 @@ OUTPUT_FORMAT("elf32-i386") OUTPUT_ARCH(i386) -STARTUP(libc.a) /* HUH */ ENTRY(_start) SECTIONS { - . = 0x00000000; + . = 0x40000000; .text : { code = .; @@ -26,7 +25,5 @@ SECTIONS . = ALIGN(4096); } - _GLOBAL_OFFSET_TABLE_ = .; - . = ALIGN(4096); } |