Cleanup arch support

Rules.mak

@@ -76,14 +76,21 @@ GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1includ
 
 ARFLAGS=r
 
-CCFLAGS=$(OPTIMIZATION) -nostdinc $(CPUFLAGS) -Dlinux -D__linux__ -I$(TOPDIR)include -I$(GCCINCDIR) -I. -D__PIC__ -D__LIBC__
-CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS) -fpic
+CCFLAGS=$(OPTIMIZATION) -fno-builtin -nostdinc $(CPUFLAGS) -Dlinux -D__linux__ -I$(TOPDIR)include -I$(GCCINCDIR) -I. -D__LIBC__
+# Figure out what arch to build...
+ARCH = $(shell uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/' -e 's/arm.*/arm/g')
+
+ifeq ($(ARCH), arm)
+    ARCH_CFLAGS=-fpic
+endif
+
+CFLAGS=$(ARCH_CFLAGS) $(CCFLAGS) $(DEFS)
 
 ifeq ($(DODEBUG),true)
-    CFLAGS += -Wall -g -D__PIC__
+    CFLAGS += -Wall -g
     LDFLAGS = -nostdlib 
 else
-    CFLAGS  += -Wall  -D__PIC__ #-fomit-frame-pointer
+    CFLAGS  += -Wall #-fomit-frame-pointer
     LDFLAGS  = -s -nostdlib
 endif