Index: branches/xZen/src/arm/Make.rules
===================================================================
--- branches/xZen/src/arm/Make.rules	(revision 1253)
+++ branches/xZen/src/arm/Make.rules	(revision 1254)
@@ -1,9 +1,12 @@
-ARM_AS  = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/as -arch arm
-ARM_LD  = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ld -arch arm
-ARM_CC  = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2
-ARM_CPP = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2
+ARM_ARCH = armv5
+ARM_CPU = arm926ej-s
 
-ARM_SDK=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/
+ARM_AS  = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/as -arch ${ARM_ARCH}
+ARM_LD  = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ld -arch ${ARM_ARCH}
+ARM_CC  = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -mcpu=${ARM_CPU}
+ARM_CPP = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -mcpu=${ARM_CPU}
+
+ARM_SDK=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk/
 AMR_CFLAGS += -I"$(ARM_SDK)/usr/include"
 ARM_LDFLAGS += -L"$(ARM_SDK)/usr/lib"
 ARM_LDFLAGS += -L"$(ARM_SDK)/usr/lib/system/"
@@ -14,25 +17,25 @@
 ##### ARM Rules #####
 $(OBJROOT)/%.armo: %.c $(OBJROOT)
 	@echo "\t[CC:ARM] $<"
-	@$(ARM_CC) -arch arm ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \
+	@$(ARM_CC) -arch ${ARM_ARCH} ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \
 	    -MD -dependency-file $(OBJROOT)/$*.d
 	@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
 
 $(OBJROOT)/%.armo: %.m $(OBJROOT)
 	@echo "\t[M:ARM] $<"
-	@$(ARM_CC) -arch arm ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \
+	@$(ARM_CC) -arch ${ARM_ARCH} ${AMR_CFLAGS} $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ \
 	    -MD -dependency-file $(OBJROOT)/$*.d
 	@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
 
 $(OBJROOT)/%.armo: %.cpp $(OBJROOT)
 	@echo "\t[CPP:ARM] $<"
-	@$(ARM_CPP) -arch arm ${AMR_CFLAGS} $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \
+	@$(ARM_CPP) -arch ${ARM_ARCH} ${AMR_CFLAGS} $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ \
 	    -MD -dependency-file $(OBJROOT)/$*.d
 	@md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
 	
 $(OBJROOT)/%.armo: %.s
 	@echo "\t[AS:I386] $<"
-	@$(ARM_CC) $(CPPFLAGS) -c $(INC) -arch arm -o $@ $< \
+	@$(ARM_CC) -arch ${ARM_ARCH} $(CPPFLAGS) -c $(INC) -o $@ $< \
 		    -MD -dependency-file $*.d
 	@md -u $(OBJROOT)/Makedep -f -d $*.d
 
Index: branches/xZen/src/Make.rules
===================================================================
--- branches/xZen/src/Make.rules	(revision 1253)
+++ branches/xZen/src/Make.rules	(revision 1254)
@@ -1,5 +1,6 @@
 -include $(SRCROOT)/auto.conf
 
+
 -include ${SRCROOT}/i386/Make.rules
 #-include ${SRCROOT}/x86_64/Make.rules
 -include ${SRCROOT}/ppc/Make.rules
Index: branches/xZen/src/modules/MakeInc.dir
===================================================================
--- branches/xZen/src/modules/MakeInc.dir	(revision 1253)
+++ branches/xZen/src/modules/MakeInc.dir	(revision 1254)
@@ -133,14 +133,14 @@
 	-o $(SYMROOT)/$(MODULE_NAME).ppc.dylib
 	
 	@echo "\t[LD:ARM] $(MODULE_NAME).dylib"
-	@ld -arch arm -undefined dynamic_lookup \
+	@ld -arch ${ARM_ARCH} -undefined dynamic_lookup \
 	-dylib -read_only_relocs suppress \
 	-S -x -Z -dead_strip_dylibs \
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
 	$(filter %.armo,$^) \
-	/Developer/Platforms/iPhoneOS.platform//Developer/SDKs/iPhoneOS4.3.sdk/usr/lib/dylib1.o \
+	/Developer/Platforms/iPhoneOS.platform//Developer/SDKs/iPhoneOS4.2.sdk/usr/lib/dylib1.o \
 	-macosx_version_min 10.6 \
 	-sectcreate __INFO __author $(OBJROOT)/$(MODULE_NAME).author \
 	-sectcreate __INFO __description $(OBJROOT)/$(MODULE_NAME).desc \
@@ -149,7 +149,7 @@
 	@echo "\t[LIPO] $(@F)"
 	@lipo -create -arch i386 $(SYMROOT)/$(MODULE_NAME).i386.dylib \
 			 	  -arch ppc  $(SYMROOT)/$(MODULE_NAME).ppc.dylib \
-			 	  -arch arm  $(SYMROOT)/$(MODULE_NAME).arm.dylib \
+			 	  -arch ${ARM_ARCH}  $(SYMROOT)/$(MODULE_NAME).arm.dylib \
 			 	  -output $(SYMROOT)/$(MODULE_NAME).dylib
 			 	  
 	@rm $(SYMROOT)/$(MODULE_NAME).i386.dylib $(SYMROOT)/$(MODULE_NAME).ppc.dylib $(SYMROOT)/$(MODULE_NAME).arm.dylib
Index: branches/xZen/src/modules/Makefile
===================================================================
--- branches/xZen/src/modules/Makefile	(revision 1253)
+++ branches/xZen/src/modules/Makefile	(revision 1254)
@@ -62,3 +62,6 @@
 	@echo "// Autogenerated - do not modify" > $@
 	@echo "void start_built_in_modules(); " > $@
 endif
+
+.PHONEY: $(SYMROOT)/boot_modules.c
+.PHONEY: $(SYMROOT)/boot_modules.h
Index: branches/xZen/src/util/fdisk/Makefile
===================================================================
--- branches/xZen/src/util/fdisk/Makefile	(revision 1253)
+++ branches/xZen/src/util/fdisk/Makefile	(revision 1254)
@@ -22,15 +22,15 @@
 $(PROGRAM): $(ACTUAL_OBJECTS)
 	@echo "\t[LD:I386] $(@F)"
 	@$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F).i386 $(OBJROOT)/*.i386o
-	@echo "\t[LD:X86_64] $(@F)"
-	@$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F).x86_64 $(OBJROOT)/*.x86_64o
+	@#echo "\t[LD:X86_64] $(@F)"
+	@#$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F).x86_64 $(OBJROOT)/*.x86_64o
 	@echo "\t[LD:PPC] $(@F)"
 	@$(PPC_CC) $(CFLAGS) $(PPC_LDFLAGS) $(LDFLAGS) $(DEFINES) -arch ppc -o $(SYMROOT)/$(@F).ppc $(OBJROOT)/*.ppco
 	@#echo "\t[LD:ARM] $(@F)"
 	@#$(ARM_CC) $(CFLAGS) $(ARM_LDFLAGS) $(LDFLAGS) $(DEFINES) -arch arm -o $(SYMROOT)/$(@F).arm $(OBJROOT)/*.armo
 
 	@echo "\t[LIPO] $(@F)"
-	@lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch x86_64 $(SYMROOT)/$(@F).x86_64 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F)
+	@lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F)
 	@$(RM) $(SYMROOT)/$(@F).i386 $(SYMROOT)/$(@F).x86_64 $(SYMROOT)/$(@F).ppc
 
 else
Index: branches/xZen/src/util/Makefile
===================================================================
--- branches/xZen/src/util/Makefile	(revision 1253)
+++ branches/xZen/src/util/Makefile	(revision 1254)
@@ -14,7 +14,7 @@
 DIR = util
 
 PROGRAMS = machOconv dyldsymboltool
-OBJECTS = dyldsymboltool machOconv
+OBJECTS = machOconv dyldsymboltool
 
 ifeq (${CONFIG_BDMESG}, y)
 PROGRAMS += bdmesg
@@ -33,20 +33,17 @@
 
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-
 include ${ROOT}/Make.rules
 
 
-
 all: $(DIRS_NEEDED) $(SYMPROG) fdisk440
 
 
-
 $(SYMPROG): ${ACTUAL_OBJECTS}
 	@echo "\t[LD:I386] $(@F)"
 	@$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F).i386 $(OBJROOT)/$(@F).i386o
-	@echo "\t[LD:X86_64] $(@F)"
-	@$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F).x86_64 $(OBJROOT)/$(@F).x86_64o
+	@#echo "\t[LD:X86_64] $(@F)"
+	@#$(X86_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F).x86_64 $(OBJROOT)/$(@F).x86_64o
 	@echo "\t[LD:PPC] $(@F)"
 	@$(PPC_CC) $(CFLAGS) $(PPC_LDFLAGS) $(LDFLAGS) $(DEFINES) -arch ppc -o $(SYMROOT)/$(@F).ppc $(OBJROOT)/$(@F).ppco
 	@#echo "\t[LD:ARM] $(@F)"
@@ -54,8 +51,8 @@
 
 
 	@echo "\t[LIPO] $(@F)"
-	@lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch x86_64 $(SYMROOT)/$(@F).x86_64 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F)
-	@$(RM) $(SYMROOT)/$(@F).i386 $(SYMROOT)/$(@F).x86_64 $(SYMROOT)/$(@F).ppc
+	@lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F)
+	@$(RM) $(SYMROOT)/$(@F).i386 $(SYMROOT)/$(@F).ppc
 
 .PHONY: fdisk440
 fdisk440:
Index: branches/xZen/Makefile
===================================================================
--- branches/xZen/Makefile	(revision 1253)
+++ branches/xZen/Makefile	(revision 1254)
@@ -8,6 +8,8 @@
 
 include Make.rules
 
+ARCHS="i386 ppc arm"
+
 THEME = default
 
 REVISION = `svnversion -n | tr -d [:alpha:] > revision`
@@ -29,6 +31,7 @@
 	    if [ -d $$i ]; then						  \
 		echo ================= make $@ for $$i =================; \
 		( ROOT=$(ROOT);						  	  \
+		  ARCHS=$(ARCHS)						  \
  		  cd $$i; ${MAKE}					  	  \
 			$@			  						  \
 		) || exit $$?; 						  	  \