From 54ece9141e9ad8cfb59f2c8315c84b8e247275f7 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Mon, 10 Aug 2020 16:01:04 +0200
Subject: Started elf parser/loader

---
 apps/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'apps/Makefile')

diff --git a/apps/Makefile b/apps/Makefile
index 29136d0..5a6ec67 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -3,17 +3,15 @@
 COBJS = a.o b.o init.o
 CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
-OC = ../cross/opt/bin/i686-elf-objcopy
 
 # Flags to make the binary smaller TODO: Remove after indirect pointer support!
 CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
 
-CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -std=c99 -m32 -pedantic-errors -I../lib/inc/ -fPIE -Duserspace
+CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-emain -I../lib/inc/ -Duserspace
 
 all: $(COBJS)
 
 %.o: %.c
 	@mkdir -p ../build/apps/
 	@$(CC) -c $(CFLAGS) $< -o $@
-	@$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lc
-	@$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=)
+	@$(CC) -r $(CFLAGS) -o ../build/apps/$(@:.o=) -L../build $< -lc
-- 
cgit v1.2.3