Manual merge

diff --cc Makefile
index 96ab92de90a81bfcc21dc0bacbb1542e36aefbf3,b8e107f9a0a79a657e5d69f299c0f9427b1cd5f0..41d9fdcd90e62f0fbc98a820e2af5c798bceff34
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -158,11 -237,16 +159,11 @@@ export  CPPFLAGS CFLAGS CFLAGS_KERNEL AF
  
  export        NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS
  
 -.S.s:
 -      $(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -o $*.s $<
 -.S.o:
 -      $(CC) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -c -o $*.o $<
 -
 -Version: dummy
 -      @rm -f include/linux/compile.h
 +# Build vmlinux / boot target
 +# ---------------------------------------------------------------------------
  
  boot: vmlinux
-       @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C arch/$(ARCH)/boot
+       @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C arch/$(ARCH)/boot
  
  vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o init/do_mounts.o linuxsubdirs
        $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o init/do_mounts.o \