summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--userspace/Makefile13
l---------userspace/crt0.s1
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index ce3dd82..fcdc506 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ CFLAGS+=-ffreestanding # do we need this if using own compiler?
CFLAGS+=-nostdlib
CFLAGS+=-O0
CFLAGS+=-I.
-CFLAGS+=-I/home/miguel/foolos/usr/i686-foolos//include/
+CFLAGS+=-I/home/miguel/temp/foolos/usr/i686-foolos/include/
CFLAGS+=-gstabs
#CFLAGS+=-fstack-protector-all
diff --git a/userspace/Makefile b/userspace/Makefile
index e1e5484..a1d0945 100644
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -7,23 +7,23 @@ CC=i686-elf-gcc
CFLAGS=
CFLAGS=-w
+CFLAGS=-ffreestanding
CFLAGS+=-I..
-CFLAGS+=-I/home/miguel/foolos/usr/i686-foolos/include
+CFLAGS+=-I/home/miguel/temp/foolos/usr/i686-foolos/include
CFLAGS+=-O0
CFLAGS+=-g
-LDFLAGS=-L/home/miguel/foolos/usr/i686-foolos/lib/
-LDLIBS=-lc -lm -lg -lnosys
+LDFLAGS=-L/home/miguel/temp/foolos/usr/i686-foolos/lib/
+LDLIBS=-lc -lm -lg -lnosys
PROGS_C=$(wildcard *.c)
PROGS=$(patsubst %.c,%,$(PROGS_C))
-
include ../Makefile.common
-all: ext2.img
+all: crt0.o ext2.img
-ext2.img: crt0.o $(PROGS) ../mp/mp.bin
+ext2.img: $(PROGS) ../mp/mp.bin
dd if=/dev/zero of=ext2.img bs=1024 count=$(IMAGESIZE)
sudo mkfs.ext2 -O none ext2.img -F
@@ -58,4 +58,3 @@ clean:
-rm -f *.o $(PROGS) ext2.img *.d
new: clean all
-
diff --git a/userspace/crt0.s b/userspace/crt0.s
new file mode 120000
index 0000000..8d17c13
--- /dev/null
+++ b/userspace/crt0.s
@@ -0,0 +1 @@
+../newlib/crt0.s \ No newline at end of file