diff --git a/src/sys/Makefile.inc b/src/sys/Makefile.inc
index 935481a..1ae3a26 100644
--- a/src/sys/Makefile.inc
+++ b/src/sys/Makefile.inc
@@ -2,5 +2,5 @@
 # global 'sys' options
 
 INCLUDES = -I../include
-CFLAGS = -nostdlib -fno-builtin -fno-exceptions -fomit-frame-pointer
+CFLAGS = -Wall -nostdlib -fno-builtin -O2 -g -fno-exceptions
 KERNEL = ubix.elf
diff --git a/src/sys/compile/Makefile b/src/sys/compile/Makefile
index c18c4bd..18dee2c 100644
--- a/src/sys/compile/Makefile
+++ b/src/sys/compile/Makefile
@@ -20,19 +20,19 @@
 
 # Compile the source files
 .cc.o:
-	$(CXX) -Wall -O ${CFLAGS} $(INCLUDES) -c -o $@ $<
+	$(CXX) -${CFLAGS} $(INCLUDES) -c -o $@ $<
  
 .cc.s:
-	$(CXX) -Wall -O ${CFLAGS} -O $(INCLUDES) -S -o $@ $<
+	$(CXX) ${CFLAGS} $(INCLUDES) -S -o $@ $<
  
 .c.o:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES)  -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES)  -c -o $@ $<
  
 .c.s:
-	$(CC) -Wall -O $(INCLUDES) -S -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
  
 .S.o:
-	$(CC) -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
  
 # Clean up the junk
 clean:
diff --git a/src/sys/devfs/Makefile b/src/sys/devfs/Makefile
index d96b505..2e6a497 100644
--- a/src/sys/devfs/Makefile
+++ b/src/sys/devfs/Makefile
@@ -18,15 +18,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .cc.s:
-	$(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .c.o:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .c.s:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .S.o:
-	$(CC) -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/init/Makefile b/src/sys/init/Makefile
index 5560b72..ca78be4 100644
--- a/src/sys/init/Makefile
+++ b/src/sys/init/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .cc.s:
-	$(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .c.o:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .c.s:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .S.o:
-	$(CC) -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/isa/Makefile b/src/sys/isa/Makefile
index 75c32c8..dd0ae7f 100644
--- a/src/sys/isa/Makefile
+++ b/src/sys/isa/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .cc.s:
-	$(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .c.o:
-	$(CC) -Wall -O $(CLFAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CLFAGS) $(INCLUDES) -c -o $@ $<
 .c.s:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .S.o:
-	$(CC) -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/kernel/Makefile b/src/sys/kernel/Makefile
index 4adaa1d..fe4bd12 100644
--- a/src/sys/kernel/Makefile
+++ b/src/sys/kernel/Makefile
@@ -13,15 +13,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) -DNOBOOL -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX) -DNOBOOL $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .cc.s:
-	$(CXX) -DNOBOOL -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CXX) -DNOBOOL $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .c.o:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .c.s:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .S.o:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/kernel/spinlock.c b/src/sys/kernel/spinlock.c
index 25368b1..5aed409 100644
--- a/src/sys/kernel/spinlock.c
+++ b/src/sys/kernel/spinlock.c
@@ -28,8 +28,6 @@
 *****************************************************************************************/
 
 #include <ubixos/spinlock.h>
-#include <lib/kprintf.h>
-#include <assert.h>
 
 void spinLockInit(spinLock_t *lock) {
   *lock = SPIN_LOCK_INITIALIZER;
@@ -37,7 +35,6 @@
 
 void spinUnlock(spinLock_t *lock) {
   register int unlocked;
-  assert(lock);
   asm volatile(
     "xchgl %0, %1"
     : "=&r" (unlocked), "=m" (*lock) : "0" (0)
@@ -46,7 +43,6 @@
 
 int spinTryLock(spinLock_t *lock) {
   register int locked;
-  assert(lock);
   asm volatile("xchgl %0, %1"
     : "=&r" (locked), "=m" (*lock) : "0" (1)
     );
@@ -54,19 +50,20 @@
   }
 
 void spinLock(spinLock_t *lock) {
-  assert(lock);
   while (!spinTryLock(lock))
     while (*lock == 1);
   }
 
 int spinLockLocked(spinLock_t *lock) {
-  assert(lock);
   return(*lock != 0);
   }
 
  
 /***
  $Log$
+ Revision 1.9  2004/07/20 20:25:57  reddawg
+ Works perfectly here
+
  Revision 1.8  2004/07/20 20:20:19  reddawg
  spinlock: made them non inline functions I think this actually fixed the problem
 
diff --git a/src/sys/lib/Makefile b/src/sys/lib/Makefile
index 94de836..de49a9f 100644
--- a/src/sys/lib/Makefile
+++ b/src/sys/lib/Makefile
@@ -14,17 +14,17 @@
 
 #  Compile Types
 .cpp.o:
-	$(CXX) -Wall -DNOBOOL $(CFLAGS) -fno-rtti $(INCLUDES) -g -c -o $@ $<
+	$(CXX) -DNOBOOL $(CFLAGS) -fno-rtti $(INCLUDES) -c -o $@ $<
 .cc.o:
-	$(CXX) -Wall -DNOBOOL -D__UBIXOS_KERNEL__ $(CFLAGS) -fno-rtti $(INCLUDES) -c -o $@ $<
+	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__ $(CFLAGS) -fno-rtti $(INCLUDES) -c -o $@ $<
 .cc.s:
-	$(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .c.o:
-	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC)  $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .c.s:
-	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CC)  $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .S.o:
-	$(CC)  -Wall -c -o $@ $<
+	$(CC)  $(CFLAGS) -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/mpi/Makefile b/src/sys/mpi/Makefile
index 11142f5..c6584c5 100644
--- a/src/sys/mpi/Makefile
+++ b/src/sys/mpi/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) -Wall -DNOBOOL -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX)-DNOBOOL $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .cc.s:
-	$(CXX) -Wall -DNOBOOL -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CXX)-DNOBOOL $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .c.o:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .c.s:
-	$(CC) -Wall -O $(CLFAGS) $(INCLUDES) -S -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .S.o:
-	$(CC) -Wall -O -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/net/api/Makefile b/src/sys/net/api/Makefile
index 9f74f5c..11a72ae 100644
--- a/src/sys/net/api/Makefile
+++ b/src/sys/net/api/Makefile
@@ -13,15 +13,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../../include -c -o $@ $<
+	$(CXX) ${CFLAGS}-DNOBOOL -I../../include -c -o $@ $<
 .cc.s:
-	$(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../../include -S -o $@ $<
+	$(CXX) ${CFLAGS}-DNOBOOL -I../../include -S -o $@ $<
 .c.o:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../../include -c -o $@ $<
+	$(CC) ${CFLAGS} -I../../include -c -o $@ $<
 .c.s:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../../include -S -o $@ $<
+	$(CC) ${CFLAGS}-I../../include -S -o $@ $<
 .S.o:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $<
+	$(CC) ${CFLAGS}-c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/net/core/Makefile b/src/sys/net/core/Makefile
index 29a2da8..96cc433 100644
--- a/src/sys/net/core/Makefile
+++ b/src/sys/net/core/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../../include -c -o $@ $<
+	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -c -o $@ $<
 .cc.s:
-	$(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../../include -S -o $@ $<
+	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -S -o $@ $<
 .c.o:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../../include -c -o $@ $<
+	$(CC) ${CFLAGS} -I../../include -c -o $@ $<
 .c.s:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../../include -S -o $@ $<
+	$(CC) ${CFLAGS} -I../../include -S -o $@ $<
 .S.o:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $<
+	$(CC) ${CFLAGS} -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/net/net/Makefile b/src/sys/net/net/Makefile
index 2e8bcfa..aa3bc32 100644
--- a/src/sys/net/net/Makefile
+++ b/src/sys/net/net/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../../include -c -o $@ $<
+	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -c -o $@ $<
 .cc.s:
-	$(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../../include -S -o $@ $<
+	$(CXX) ${CFLAGS} -DNOBOOL-I../../include -S -o $@ $<
 .c.o:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../../include -c -o $@ $<
+	$(CC) ${CFLAGS} -I../../include -c -o $@ $<
 .c.s:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../../include -S -o $@ $<
+	$(CC) ${CFLAGS} -I../../include -S -o $@ $<
 .S.o:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $<
+	$(CC) ${CFLAGS} -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/net/netif/Makefile b/src/sys/net/netif/Makefile
index d11a495..0617340 100755
--- a/src/sys/net/netif/Makefile
+++ b/src/sys/net/netif/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../../include -c -o $@ $<
+	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -c -o $@ $<
 .cc.s:
-	$(CXX) ${CFLAGS} -fno-exceptions -DNOBOOL -Wall -fomit-frame-pointer -O -I../../include -S -o $@ $<
+	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -S -o $@ $<
 .c.o:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../../include -c -o $@ $<
+	$(CC) ${CFLAGS} -I../../include -c -o $@ $<
 .c.s:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -O -I../../include -S -o $@ $<
+	$(CC) ${CFLAGS} -I../../include -S -o $@ $<
 .S.o:
-	$(CC) ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $<
+	$(CC) ${CFLAGS} -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/pci/Makefile b/src/sys/pci/Makefile
index aa4fe8a..a96850d 100644
--- a/src/sys/pci/Makefile
+++ b/src/sys/pci/Makefile
@@ -12,13 +12,13 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .cc.s:
-	$(CXX) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .c.o:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 .c.s:
-	$(CC) -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
 .S.o:
 	$(CC) -Wall -c -o $@ $<
 
diff --git a/src/sys/sde/Makefile b/src/sys/sde/Makefile
index e81b997..504eb8c 100644
--- a/src/sys/sde/Makefile
+++ b/src/sys/sde/Makefile
@@ -28,17 +28,17 @@
 
 #  Compile Types
 .cpp.o:
-	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__ -Wall $(CFLAGS) -g -c -I../include -I../../lib/objgfx40 -o $@ $<
+	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__ $(CFLAGS) ${INCLUDES} -I../../lib/objgfx40 -c -o $@ $<
 .cc.o:
-	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__  -Wall $(CFLAGS) -g -c -I../include -I../../lib/objgfx40 -o $@ $<
+	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__  $(CFLAGS) ${INCLUDES} -I../../lib/objgfx40 -c -o $@ $<
 .cc.s:
-	$(CXX) ${CFLAGS} -Wall -DNOBOOL -O -I../include -S -o $@ $<
+	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__ ${CFLAGS} ${INCLUDES} -S -o $@ $<
 .c.o:
-	$(CC) ${CFLAGS} -Wall -O -I../include -c -o $@ $<
+	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
 .c.s:
-	$(CC) ${CFLAGS} -Wall  -O -I../include -S -o $@ $<
+	$(CC) ${CFLAGS} ${INCLUDES} -S -o $@ $<
 .S.o:
-	$(CC) ${CFLAGS} -Wall -c -o $@ $<
+	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/sys/Makefile b/src/sys/sys/Makefile
index 065bfdf..802f90d 100644
--- a/src/sys/sys/Makefile
+++ b/src/sys/sys/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) ${CFLAGS} -Wall -O -I../include -c -o $@ $<
+	$(CXX) ${CFLAGS} ${INCLUDES} -c -o $@ $<
 .cc.s:
-	$(CXX) ${CFLAGS} -Wall -O -I../include -S -o $@ $<
+	$(CXX) ${CFLAGS} ${INCLUDES} -S -o $@ $<
 .c.o:
-	$(CC) ${CFLAGS} -Wall -O -I../include -c -o $@ $<
+	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
 .c.s:
-	$(CC) ${CFLAGS} -Wall -O -I../include -S -o $@ $<
+	$(CC) ${CFLAGS} ${INCLUDES} -S -o $@ $<
 .S.o:
-	$(CC) ${CFLAGS} -Wall -c -o $@ $<
+	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/ubixfs/Makefile b/src/sys/ubixfs/Makefile
index 2cf0990..f0d265d 100644
--- a/src/sys/ubixfs/Makefile
+++ b/src/sys/ubixfs/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) ${CFLAGS} -Wall -O -I../include -c -o $@ $<
+	$(CXX) ${CFLAGS} ${INCLUDES} -c -o $@ $<
 .cc.s:
-	$(CXX) ${CFLAGS} -Wall -O -I../include -S -o $@ $<
+	$(CXX) ${CFLAGS} ${INCLUDES} -S -o $@ $<
 .c.o:
-	$(CC) ${CFLAGS} -Wall -O -I../include -c -o $@ $<
+	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
 .c.s:
-	$(CC) ${CFLAGS} -Wall -O -I../include -S -o $@ $<
+	$(CC) ${CFLAGS} ${INCLUDES} -S -o $@ $<
 .S.o:
-	$(CC) ${CFLAGS} -Wall -c -o $@ $<
+	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/vfs/Makefile b/src/sys/vfs/Makefile
index 7fd5c83..a8748fe 100644
--- a/src/sys/vfs/Makefile
+++ b/src/sys/vfs/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) ${CFLAGS} -Wall -O -I../include -c -o $@ $<
+	$(CXX) ${CFLAGS} ${INCLUDES} -c -o $@ $<
 .cc.s:
-	$(CXX) ${CFLAGS} -Wall -O -I../include -S -o $@ $<
+	$(CXX) ${CFLAGS} ${INCLUDES} -S -o $@ $<
 .c.o:
-	$(CC)  ${CFLAGS} -Wall -O -I../include -c -o $@ $<
+	$(CC)  ${CFLAGS} ${INCLUDES} -c -o $@ $<
 .c.s:
-	$(CC)  ${CFLAGS} -Wall -O -I../include -S -o $@ $<
+	$(CC)  ${CFLAGS} ${INCLUDES} -S -o $@ $<
 .S.o:
-	$(CC)  ${CFLAGS} -Wall -c -o $@ $<
+	$(CC)  ${CFLAGS} ${INCLUDES} -c -o $@ $<
 
 # Clean up the junk
 clean:
diff --git a/src/sys/vmm/Makefile b/src/sys/vmm/Makefile
index e6475eb..77ba794 100644
--- a/src/sys/vmm/Makefile
+++ b/src/sys/vmm/Makefile
@@ -12,15 +12,15 @@
 
 #  Compile Types
 .cc.o:
-	$(CXX) ${CFLAGS} -Wall -O $(INCLUDES) -c -o $@ $<
+	$(CXX) ${CFLAGS} $(INCLUDES) -c -o $@ $<
 .cc.s:
-	$(CXX) ${CFLAGS} -Wall -O $(INCLUDES) -S -o $@ $<
+	$(CXX) ${CFLAGS} $(INCLUDES) -S -o $@ $<
 .c.o:
-	$(CC)  ${CFLAGS} -Wall -O $(INCLUDES) -c -o $@ $<
+	$(CC)  ${CFLAGS} $(INCLUDES) -c -o $@ $<
 .c.s:
-	$(CC)  ${CFLAGS} -Wall -O $(INCLUDES) -S -o $@ $<
+	$(CC)  ${CFLAGS} $(INCLUDES) -S -o $@ $<
 .S.o:
-	$(CC)  ${CFLAGS} -Wall $(INCLUDES) -c -o $@ $<
+	$(CC)  ${CFLAGS} $(INCLUDES) -c -o $@ $<
 
 # Clean up the junk
 clean: