diff --git a/src/sys/Makefile.inc b/src/sys/Makefile.inc index 695dc16..ec53ce7 100644 --- a/src/sys/Makefile.inc +++ b/src/sys/Makefile.inc @@ -1,5 +1,6 @@ # $Id: # global 'sys' options -CFLAGS = -fno-builtin -O2 +INCLUDES = -I../include +CFLAGS = -fno-builtin -nostdlib -nostdinc -fno-rtti -fno-exceptions KERNEL = ubix.elf diff --git a/src/sys/compile/Makefile b/src/sys/compile/Makefile index 058993e..56da09e 100644 --- a/src/sys/compile/Makefile +++ b/src/sys/compile/Makefile @@ -14,24 +14,24 @@ # Link the kernel statically with fixed text+data address @1M $(KERNEL) : $(OBJS) - $(LD) -nobuiltin -o $@ $(OBJS) $(KPARTS) -Ttext 0x30000 + $(LD) -nostdlib -nostdinc -o $@ $(OBJS) $(KPARTS) -Ttext 0x30000 /usr/bin/strip $@ # Compile the source files .cc.o: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) -Wall -O ${CFLAGS} $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) -Wall -O ${CFLAGS} -O $(INCLUDES) -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -O -I../include -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) -Wall -O $(INCLUDES) -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/devfs/Makefile b/src/sys/devfs/Makefile index c94fb69..d96b505 100644 --- a/src/sys/devfs/Makefile +++ b/src/sys/devfs/Makefile @@ -3,8 +3,7 @@ # Include Global 'Source' Options include ../../Makefile.inc - -CFLAGS = -fno-builtin +include ../Makefile.inc # Linker LINKER = ld @@ -19,15 +18,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/init/Makefile b/src/sys/init/Makefile index 65360b4..5560b72 100644 --- a/src/sys/init/Makefile +++ b/src/sys/init/Makefile @@ -12,15 +12,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/isa/Makefile b/src/sys/isa/Makefile index b5e2b03..d15c5da 100644 --- a/src/sys/isa/Makefile +++ b/src/sys/isa/Makefile @@ -12,15 +12,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) -Wall -O $(CLFAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/kernel/Makefile b/src/sys/kernel/Makefile index bf35cd5..f765cfb 100644 --- a/src/sys/kernel/Makefile +++ b/src/sys/kernel/Makefile @@ -12,15 +12,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) -DNOBOOL -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) -DNOBOOL -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/lib/Makefile b/src/sys/lib/Makefile index dbff453..353e875 100644 --- a/src/sys/lib/Makefile +++ b/src/sys/lib/Makefile @@ -5,6 +5,8 @@ include ../../Makefile.inc include ../Makefile.inc +INCLUDES += -I../../lib/objgfx40/ + # Objects OBJS = ogprintf.o sqrt.o atan.o divdi3.o libcpp.o strtok.o kmalloc.o kprintf.o vsprintf.o string.o net.o strtol.o @@ -12,17 +14,17 @@ # Compile Types .cpp.o: - $(CXX) ${CFLAGS} -Wall -DNOBOOL -fno-rtti -fno-exceptions -g -c -I../include -o $@ $< + $(CXX) -Wall -DNOBOOL $(CFLAGS) $(INCLUDES) -g -c -o $@ $< .cc.o: - $(CXX) ${CFLAGS} -Wall -DNOBOOL -D__UBIXOS_KERNEL__ -fno-rtti -fno-exceptions -fomit-frame-pointer -O -I../include -I../../lib/objgfx40 -c -o $@ $< + $(CXX) -Wall -DNOBOOL -D__UBIXOS_KERNEL__ -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/mpi/Makefile b/src/sys/mpi/Makefile index a74968d..11142f5 100644 --- a/src/sys/mpi/Makefile +++ b/src/sys/mpi/Makefile @@ -12,15 +12,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) -Wall -DNOBOOL -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) -Wall -DNOBOOL -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) -Wall -O $(CLFAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) -Wall -O -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/pci/Makefile b/src/sys/pci/Makefile index 211c093..aa4fe8a 100644 --- a/src/sys/pci/Makefile +++ b/src/sys/pci/Makefile @@ -12,15 +12,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) -Wall -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/sde/Makefile b/src/sys/sde/Makefile index 7b36095..fe24d97 100644 --- a/src/sys/sde/Makefile +++ b/src/sys/sde/Makefile @@ -3,8 +3,7 @@ # Include Global 'Source' Options include ../../Makefile.inc - -CFLAGS = -DNOBOOL -D__UBIXOS_KERNEL__ -fno-builtin -fno-exceptions -fno-rtti +include ../Makefile.inc # Linker LINKER = ld @@ -26,17 +25,17 @@ # Compile Types .cpp.o: - $(CXX) -Wall $(CFLAGS) -fomit-frame-pointer -g -c -I../include -I../../lib/objgfx40 -o $@ $< + $(CXX) -DNOBOOL -D__UBIXOS_KERNEL__ -Wall $(CFLAGS) -g -c -I../include -I../../lib/objgfx40 -o $@ $< .cc.o: - $(CXX) -Wall $(CFLAGS) -fomit-frame-pointer -g -c -I../include -I../../lib/objgfx40 -o $@ $< + $(CXX) -DNOBOOL -D__UBIXOS_KERNEL__ -Wall $(CFLAGS) -g -c -I../include -I../../lib/objgfx40 -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -DNOBOOL -O -I../include -S -o $@ $< + $(CXX) ${CFLAGS} -Wall -DNOBOOL -O -I../include -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) ${CFLAGS} -Wall -O -I../include -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) ${CFLAGS} -Wall -O -I../include -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) ${CFLAGS} -Wall -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/sys/Makefile b/src/sys/sys/Makefile index 293a990..065bfdf 100644 --- a/src/sys/sys/Makefile +++ b/src/sys/sys/Makefile @@ -12,15 +12,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) ${CFLAGS} -Wall -O -I../include -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) ${CFLAGS} -Wall -O -I../include -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) ${CFLAGS} -Wall -O -I../include -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) ${CFLAGS} -Wall -O -I../include -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) ${CFLAGS} -Wall -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/ubixfs/Makefile b/src/sys/ubixfs/Makefile index 435025c..335e1fc 100644 --- a/src/sys/ubixfs/Makefile +++ b/src/sys/ubixfs/Makefile @@ -12,15 +12,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) ${CFLAGS} -Wall -O -I../include -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) ${CFLAGS} -Wall -O -I../include -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) ${CFLAGS} -Wall -O -I../include -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) ${CFLAGS} -Wall -O -I../include -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) ${CFLAGS} -Wall -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/vfs/Makefile b/src/sys/vfs/Makefile index e90b817..7fd5c83 100644 --- a/src/sys/vfs/Makefile +++ b/src/sys/vfs/Makefile @@ -12,15 +12,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) ${CFLAGS} -Wall -O -I../include -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) ${CFLAGS} -Wall -O -I../include -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) ${CFLAGS} -Wall -O -I../include -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) ${CFLAGS} -Wall -O -I../include -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) ${CFLAGS} -Wall -c -o $@ $< # Clean up the junk clean: diff --git a/src/sys/vmm/Makefile b/src/sys/vmm/Makefile index 2ee2926..e6475eb 100644 --- a/src/sys/vmm/Makefile +++ b/src/sys/vmm/Makefile @@ -12,15 +12,15 @@ # Compile Types .cc.o: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CXX) ${CFLAGS} -Wall -O $(INCLUDES) -c -o $@ $< .cc.s: - $(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CXX) ${CFLAGS} -Wall -O $(INCLUDES) -S -o $@ $< .c.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -c -o $@ $< + $(CC) ${CFLAGS} -Wall -O $(INCLUDES) -c -o $@ $< .c.s: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../include -S -o $@ $< + $(CC) ${CFLAGS} -Wall -O $(INCLUDES) -S -o $@ $< .S.o: - $(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $< + $(CC) ${CFLAGS} -Wall $(INCLUDES) -c -o $@ $< # Clean up the junk clean: