Merge http://linux-isdn.bkbits.net/linux-2.5.make-as

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/alpha/boot/Makefile

@@ -8,12 +8,11 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-LINKFLAGS = -static -T bootloader.lds #-N -relax
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := -traditional
 
-.S.s:
-	$(CPP) $(AFLAGS) -traditional -o $*.o $<
-.S.o:
-	$(CC) $(AFLAGS) -traditional -c -o $*.o $<
+LINKFLAGS = -static -T bootloader.lds #-N -relax
 
 OBJECTS = head.o main.o
 BPOBJECTS = head.o bootp.o

arch/alpha/kernel/Makefile

@@ -7,13 +7,12 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $(AFLAGS) -o $*.s $<
-.S.o:
-	$(CC) $(CFLAGS) $(AFLAGS) -c -o $*.o $<
+USE_STANDARD_AS_RULE := true
 
 O_TARGET := kernel.o
 
+EXTRA_AFLAGS := $(CFLAGS)
+
 export-objs := alpha_ksyms.o
 
 obj-y    := entry.o traps.o process.o init_task.o osf_sys.o irq.o irq_alpha.o \

arch/alpha/lib/Makefile

@@ -2,10 +2,9 @@
 # Makefile for alpha-specific library files..
 #
 
-.S.s:
-	$(CPP) -D__ASSEMBLY__ $(CFLAGS) -o $*.s $<
-.S.o:
-	$(CC) -D__ASSEMBLY__ $(CFLAGS) -c -o $*.o $<
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 # Many of these routines have implementations tuned for ev6.
 # Choose them iff we're targeting ev6 specifically.

arch/cris/kernel/Makefile

@@ -8,10 +8,7 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-# These assembly files can't be assembld with -traditional, so we
-# need another build rule than the one in the toplevel Makefile.
-.S.o:
-	$(CC) $(AFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
 
 all: kernel.o head.o
 

arch/cris/lib/Makefile

@@ -2,10 +2,12 @@
 # Makefile for Etrax-specific library files..
 #
 
-.S.o:
-	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
 
 L_TARGET = lib.a
+
+EXTRA_AFLAGS := -traditional
+
 obj-y  = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
 
 include $(TOPDIR)/Rules.make

arch/m68k/fpsp040/Makefile

@@ -7,8 +7,9 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.o:
-	$(CC) $(AFLAGS) -traditional -c -o $*.o $<
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := -traditional
 
 OS_TARGET := fpsp.o
 

arch/m68k/ifpsp060/Makefile

@@ -4,8 +4,9 @@
 # License.  See the file "README.legal" in the main directory of this archive
 # for more details.
 
-.S.o:
-	$(CC) $(AFLAGS) -traditional -c -o $*.o $<
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := -traditional
 
 OS_TARGET := ifpsp.o
 

arch/m68k/kernel/Makefile

@@ -7,8 +7,9 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.o:
-	$(CC) $(AFLAGS) -traditional -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := -traditional
 
 ifndef CONFIG_SUN3
 all: head.o kernel.o

arch/m68k/lib/Makefile

@@ -2,11 +2,12 @@
 # Makefile for m68k-specific library files..
 #
 
-.S.o:
-	$(CC) $(AFLAGS) -traditional -c $< -o $@
+USE_STANDARD_AS_RULE := true
 
 L_TARGET = lib.a
 
+EXTRA_AFLAGS := -traditional
+
 obj-y		:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
 			checksum.o memcmp.o memcpy.o memset.o semaphore.o
 

arch/m68k/math-emu/Makefile

@@ -7,10 +7,12 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.o:
-	$(CC) $(EXTRA_CFLAGS) $(AFLAGS) -traditional -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
 
-#EXTRA_CFLAGS=-DFPU_EMU_DEBUG
+EXTRA_AFLAGS := -traditional
+
+#EXTRA_AFLAGS += -DFPU_EMU_DEBUG
+#EXTRA_CFLAGS += -DFPU_EMU_DEBUG
 
 O_TARGET := mathemu.o
 

arch/m68k/sun3/Makefile

-#
+q#
 # Makefile for Linux arch/m68k/sun3 source directory
 #
 # Note! Dependencies are done automagically by 'make dep', which also
@@ -7,9 +7,6 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.o:
-	$(CC) $(AFLAGS) -traditional -Wa,-m68020 -c $< -o $*.o
-
 O_TARGET := sun3.o 
 
 export-objs	:= sun3_ksyms.o

arch/mips/au1000/common/Makefile

@@ -10,10 +10,9 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 all: au1000.o
 

arch/mips/au1000/pb1000/Makefile

@@ -10,11 +10,6 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 all: pb1000.o
 
 O_TARGET := pb1000.o

arch/mips/boot/Makefile

@@ -6,11 +6,6 @@
 # Copyright (C) 1995, 1998, 2001 by Ralf Baechle
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 OBJS  = milo.o a.out.o
 
 #

arch/mips/ddb5074/Makefile

@@ -9,10 +9,9 @@
 # Note 2! The CFLAGS definitions are now in the main makefile...
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 O_TARGET = ddb5074.a
 

arch/mips/ddb5476/Makefile

@@ -9,10 +9,9 @@
 # Note 2! The CFLAGS definitions are now in the main makefile...
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 O_TARGET = ddb5476.a
 

arch/mips/ddb5xxx/common/Makefile

@@ -6,11 +6,6 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 O_TARGET:= ddb5xxx.o
 
 obj-y	 += irq.o irq_cpu.o nile4.o prom.o pci.o pci_auto.o rtc_ds1386.o

arch/mips/ddb5xxx/ddb5477/Makefile

@@ -6,10 +6,9 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 O_TARGET:= ddb5477.o
 

arch/mips/dec/Makefile

@@ -6,10 +6,7 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(AFLAGS) $< -o $@
-.S.o:
-	$(CC) $(AFLAGS) -c $< -o $@
+USE_STANDARD_AS_RULE := true
 
 O_TARGET := dec.o
 

arch/mips/dec/boot/Makefile

@@ -6,11 +6,6 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 netboot: all
 	mipsel-linux-ld -N -G 0 -T ld.ecoff ../../boot/zImage \
 		dec_boot.o ramdisk.img -o nbImage

arch/mips/dec/prom/Makefile

@@ -8,10 +8,9 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 OBJS  = init.o memory.o cmdline.o identify.o locore.o
 

arch/mips/gt64120/common/Makefile

@@ -6,11 +6,6 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 O_TARGET:= gt64120.o
 
 obj-y	 := gt_irq.o pci.o

arch/mips/gt64120/momenco_ocelot/Makefile

@@ -6,10 +6,9 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 O_TARGET:= momenco_ocelot.o
 

arch/mips/ite-boards/generic/Makefile

@@ -10,10 +10,9 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 all: it8172.o
 

arch/mips/ite-boards/ivr/Makefile

@@ -11,11 +11,6 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 all: ivr.o
 
 O_TARGET := ivr.o

arch/mips/ite-boards/qed-4n-s01b/Makefile

@@ -11,11 +11,6 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 all: ite.o
 
 O_TARGET := ite.o

arch/mips/jazz/Makefile

@@ -6,10 +6,9 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $@
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $@
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 all: jazz.o
 

arch/mips/kernel/Makefile

@@ -6,12 +6,9 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(AFLAGS) $< -o $@
-.S.o:
-	$(CC) $(AFLAGS) -c $< -o $@
+USE_STANDARD_AS_RULE := true
 
-EXTRA_AFLAGS = -mips3 -mcpu=r4000
+# EXTRA_AFLAGS = -mips3 -mcpu=r4000 # not used?
 
 all:	kernel.o head.o init_task.o
 

arch/mips/lib/Makefile

@@ -2,13 +2,12 @@
 # Makefile for MIPS-specific library files..
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true;
 
 L_TARGET = lib.a
 
+EXTRA_AFLAGS := $(CFLAGS)
+
 obj-y				+= csum_partial.o csum_partial_copy.o \
 				   rtc-std.o rtc-no.o memcpy.o memset.o \
 				   watch.o strlen_user.o strncpy_user.o \

arch/mips/math-emu/Makefile

@@ -6,11 +6,6 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
-EXTRA_ASFLAGS = -mips2 -mcpu=r4000
-
 O_TARGET:= fpu_emulator.o
 
 obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \

arch/mips/mips-boards/atlas/Makefile

@@ -28,11 +28,6 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 all: atlas.o
 
 O_TARGET := atlas.o

arch/mips/mips-boards/generic/Makefile

@@ -27,10 +27,9 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 O_TARGET := mipsboards.o
 

arch/mips/mips-boards/malta/Makefile

@@ -28,11 +28,6 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 O_TARGET := malta.o
 
 obj-y := malta_int.o malta_rtc.o malta_setup.o

arch/mips/philips/nino/Makefile

@@ -6,10 +6,7 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(AFLAGS) $< -o $@
-.S.o:
-	$(CC) $(AFLAGS) -c $< -o $@
+USE_STANDARD_AS_RULE := true
 
 O_TARGET := nino.o
 

arch/mips/sgi/kernel/Makefile

@@ -8,10 +8,9 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 O_TARGET := ip22-kern.o
 

arch/mips/sni/Makefile

@@ -6,10 +6,9 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 all:	sni.o int-handler.o
 

arch/mips/tools/Makefile

@@ -7,11 +7,6 @@
 #
 TARGET	:= $(TOPDIR)/include/asm-$(ARCH)/offset.h
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 $(TARGET): offset.h
 	cmp -s $^ $@ || (cp $^ $(TARGET).new && mv $(TARGET).new $(TARGET))
 
@@ -22,7 +17,7 @@ offset.s: offset.c $(TOPDIR)/include/linux/autoconf.h
 
 clean:
 	rm -f offset.[hs] $(TARGET).new
-	
+
 mrproper:	
 	rm -f offset.[hs] $(TARGET).new
 	rm -f $(TARGET)

arch/mips64/boot/Makefile

@@ -6,11 +6,6 @@
 # Copyright (C) 1995, 1998, 1999 by Ralf Baechle
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 #
 # Some DECstations need all possible sections of an ECOFF executable
 #

arch/mips64/kernel/Makefile

@@ -6,8 +6,9 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.o:
-	$(CC) $(CFLAGS) $(CFLAGS_$@) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 all:	kernel.o head.o init_task.o
 
@@ -25,7 +26,7 @@ obj-$(CONFIG_MIPS32_COMPAT)	+= linux32.o scall_o32.o signal32.o ioctl32.o
 obj-$(CONFIG_BINFMT_ELF32)	+= binfmt_elf32.o
 obj-$(CONFIG_SMP)		+= smp.o
 
-CFLAGS_r4k_genex.o := -P
-CFLAGS_r4k_tlb_glue.o := -P
+AFLAGS_r4k_genex.o := -P
+AFLAGS_r4k_tlb_glue.o := -P
 
 include $(TOPDIR)/Rules.make

arch/mips64/lib/Makefile

@@ -2,10 +2,9 @@
 # Makefile for MIPS-specific library files..
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 L_TARGET = lib.a
 

arch/mips64/math-emu/Makefile

@@ -6,11 +6,6 @@
 # unless it's something special (ie not a .c file).
 #
 
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
-EXTRA_ASFLAGS = -mips2 -mcpu=r4000
-
 O_TARGET:= fpu_emulator.o
 
 obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \

arch/mips64/mips-boards/atlas/Makefile

@@ -28,11 +28,6 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 all: atlas.o
 
 O_TARGET := atlas.o

arch/mips64/mips-boards/generic/Makefile

@@ -27,10 +27,9 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 all: mipsboards.o
 

arch/mips64/mips-boards/malta/Makefile

@@ -28,11 +28,6 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 all: malta.o
 
 O_TARGET := malta.o

arch/mips64/sgi-ip22/Makefile

@@ -3,10 +3,9 @@
 # under Linux.
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 L_TARGET = ip22.a
 

arch/mips64/sgi-ip27/Makefile

@@ -2,10 +2,9 @@
 # Makefile for the IP27 specific kernel interface routines under Linux.
 #
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 O_TARGET = ip27.o
 

arch/mips64/sgi-ip32/Makefile

@@ -8,10 +8,9 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
+
+EXTRA_AFLAGS := $(CFLAGS)
 
 O_TARGET := ip32-kern.a
 

arch/mips64/tools/Makefile

@@ -7,11 +7,6 @@
 #
 TARGET	:= $(TOPDIR)/include/asm-$(ARCH)/offset.h
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 $(TARGET): offset.h
 	cmp -s $^ $@ || (cp $^ $(TARGET).new && mv $(TARGET).new $(TARGET))
 
@@ -22,7 +17,7 @@ offset.s: offset.c $(TOPDIR)/include/linux/autoconf.h
 
 clean:
 	rm -f offset.[hs] $(TARGET).new
-	
+
 mrproper:	
 	rm -f offset.[hs] $(TARGET).new
 	rm -f $(TARGET)

arch/parisc/lib/Makefile

@@ -2,12 +2,12 @@
 # Makefile for parisc-specific library files..
 #
 
+USE_STANDARD_AS_RULE := true
 
 L_TARGET = lib.a
-L_OBJS	= lusercopy.o bitops.o checksum.o
 
+obj-y := lusercopy.o bitops.o checksum.o
 
-.S.o:
-	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
+EXTRA_AFLAGS := -traditional
 
 include $(TOPDIR)/Rules.make

arch/parisc/tools/Makefile

@@ -7,11 +7,6 @@
 #
 TARGET	:= $(TOPDIR)/include/asm-$(ARCH)/offset.h
 
-.S.s:
-	$(CPP) $(CFLAGS) $< -o $*.s
-.S.o:
-	$(CC) $(CFLAGS) -c $< -o $*.o
-
 all: $(TARGET)
 
 $(TARGET): offset.h

arch/s390/boot/Makefile

@@ -7,14 +7,15 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
+USE_STANDARD_AS_RULE := true
+
 OBJCOPY = $(CROSS_COMPILE)objcopy
 
 O_TARGET := 
 
-include $(TOPDIR)/Rules.make
+EXTRA_AFLAGS := -traditional
 
-.S.o:
-	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
+include $(TOPDIR)/Rules.make
 
 %.lnk: %.o
 	$(LD) -Ttext 0x0 -o $@ $<

arch/s390/kernel/Makefile

@@ -7,13 +7,14 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.o:
-	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
 
 all: kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
 
+EXTRA_AFLAGS := -traditional
+
 export-objs	:= debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o
 obj-y	:= entry.o bitmap.o traps.o time.o process.o irq.o \
             setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \

arch/s390/lib/Makefile

@@ -2,16 +2,12 @@
 # Makefile for s390-specific library files..
 #
 
-ifdef SMP
-.S.o:
-	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
-else
-.S.o:
-	$(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
-endif
+USE_STANDARD_AS_RULE := true
 
 L_TARGET = lib.a
 
+EXTRA_AFLAGS := -traditional
+
 obj-y = checksum.o delay.o memset.o misaligned.o strcmp.o strncpy.o uaccess.o
 export-objs += misaligned.o
 

arch/s390x/boot/Makefile

@@ -7,14 +7,15 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
+USE_STANDARD_AS_RULE := true
+
 OBJCOPY = $(CROSS_COMPILE)objcopy
 
 O_TARGET := 
 
 include $(TOPDIR)/Rules.make
 
-.S.o:
-	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
+EXTRA_AFLAGS := -traditional
 
 %.lnk: %.o
 	$(LD) -Ttext 0x0 -o $@ $<

arch/s390x/kernel/Makefile

@@ -7,13 +7,14 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.o:
-	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
 
 all: kernel.o head.o init_task.o
 
 O_TARGET	:= kernel.o
 
+EXTRA_AFLAGS := -traditional
+
 export-objs	:= debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o \
 		   exec32.o
 

arch/s390x/lib/Makefile

@@ -2,16 +2,12 @@
 # Makefile for s390-specific library files..
 #
 
-ifdef SMP
-.S.o:
-	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
-else
-.S.o:
-	$(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
-endif
+USE_STANDARD_AS_RULE := true
 
 L_TARGET = lib.a
 
+EXTRA_AFLAGS := -traditional
+
 obj-y = checksum.o delay.o memset.o misaligned.o strcmp.o strncpy.o uaccess.o
 export-objs += misaligned.o
 

arch/sparc/kernel/Makefile

@@ -7,18 +7,16 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-SH = $(CONFIG_SHELL)
-
-.S.s:
-	$(CPP) $(AFLAGS) -ansi $< -o $*.s
+USE_STANDARD_AS_RULE := true
 
-.S.o:
-	$(CC) $(AFLAGS) -ansi -c $< -o $*.o
+SH = $(CONFIG_SHELL)
 
 all: kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
 
+EXTRA_AFLAGS := -ansi
+
 export-objs := sparc_ksyms.o
 IRQ_OBJS := irq.o sun4m_irq.o sun4c_irq.o sun4d_irq.o
 obj-y    := entry.o wof.o wuf.o etrap.o rtrap.o traps.o ${IRQ_OBJS} \

arch/sparc/lib/Makefile

@@ -2,14 +2,12 @@
 # Makefile for Sparc library files..
 #
 
-.S.s:
-	$(CPP) $(AFLAGS) -ansi -DST_DIV0=0x2 $< -o $*.s
-
-.S.o:
-	$(CC) $(AFLAGS) -ansi -DST_DIV0=0x2 -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
 
 L_TARGET = lib.a
 
+EXTRA_AFLAGS := -ansi -DST_DIV0=0x02
+
 obj-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \
          strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \
 	 strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \

arch/sparc/math-emu/Makefile

@@ -7,15 +7,12 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
+USE_STANDARD_AS_RULE := true
+
 O_TARGET := math-emu.o
 obj-y    := math.o ashldi3.o
 
-.S.s:
-	$(CPP) $(AFLAGS) -ansi $< -o $*.s
-
-.S.o:
-	$(CC) $(AFLAGS) -ansi -c $< -o $*.o
-
+EXTRA_AFLAGS := -ansi
 EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w
 
 include $(TOPDIR)/Rules.make

arch/sparc/mm/Makefile

@@ -7,8 +7,8 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
-.S.o:
-	$(CC) $(AFLAGS) -ansi -c -o $*.o $<
+USE_STANDARD_AS_RULE := true
+EXTRA_AFLAGS := -ansi
 
 O_TARGET := mm.o
 obj-y    := fault.o init.o loadmmu.o generic.o extable.o btfixup.o