diff options
| author | Marvin Borner | 2021-03-20 19:55:51 +0100 |
|---|---|---|
| committer | GitHub | 2021-03-20 19:55:51 +0100 |
| commit | 5132bac014d63331acf61bb60b9254023f76b869 (patch) | |
| tree | 8e2946b7a6630da13ee403c787f77270aeb6185d /apps | |
| parent | 435231378798819304eef427bad8e77dffea85df (diff) | |
| parent | b96c27bba0b242fc860fc9a2fcb63f121312fa7e (diff) | |
Merged ELF loading
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 9 | ||||
| -rw-r--r-- | apps/idle.c | 7 | ||||
| -rw-r--r-- | apps/link.ld | 32 | ||||
| -rw-r--r-- | apps/window.c | 3 |
4 files changed, 12 insertions, 39 deletions
diff --git a/apps/Makefile b/apps/Makefile index 1a7aff3..d43104a 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -4,17 +4,18 @@ 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/ -fPIE -Duserspace +CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -Duserspace all: $(COBJS) %.o: %.c @mkdir -p ../build/apps/ @$(CC) -c $(CFLAGS) $< -o $@ - @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lgui -ltxt -lc - @$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=) - @cp $(@:.o=.elf) ../build/apps/$(@:.o=.elf) + @$(LD) -o $(@:.o=.elf) --section-start=.text=0x42000000 -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/link.ld b/apps/link.ld deleted file mode 100644 index 781e38d..0000000 --- a/apps/link.ld +++ /dev/null @@ -1,32 +0,0 @@ -OUTPUT_FORMAT("elf32-i386") -OUTPUT_ARCH(i386) -STARTUP(libc.a) /* HUH */ -ENTRY(_start) - -SECTIONS -{ - . = 0x00000000; - - .text : { - code = .; - *(.text) - *(.rodata) - . = ALIGN(4096); - } - - .data : { - data = .; - *(.data) - . = ALIGN(4096); - } - - .bss : { - bss = .; - *(.bss) - . = ALIGN(4096); - } - - _GLOBAL_OFFSET_TABLE_ = .; - - . = ALIGN(4096); -} diff --git a/apps/window.c b/apps/window.c index 90a414c..0f9e7d1 100644 --- a/apps/window.c +++ b/apps/window.c @@ -8,8 +8,7 @@ int main(void) { struct gui_window win = { 0 }; assert(gui_new_window(&win) > 0); - while (1) - ; + return 0; #if 0 gfx_fill(win.ctx, COLOR_GREEN); // Professional testing |