Commit 5e8a4a7d authored by Linus Torvalds's avatar Linus Torvalds

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 73ae0302 6763090e
...@@ -8,12 +8,11 @@ ...@@ -8,12 +8,11 @@
# Copyright (C) 1994 by Linus Torvalds # Copyright (C) 1994 by Linus Torvalds
# #
LINKFLAGS = -static -T bootloader.lds #-N -relax USE_STANDARD_AS_RULE := true
EXTRA_AFLAGS := -traditional
.S.s: LINKFLAGS = -static -T bootloader.lds #-N -relax
$(CPP) $(AFLAGS) -traditional -o $*.o $<
.S.o:
$(CC) $(AFLAGS) -traditional -c -o $*.o $<
OBJECTS = head.o main.o OBJECTS = head.o main.o
BPOBJECTS = head.o bootp.o BPOBJECTS = head.o bootp.o
......
...@@ -7,13 +7,12 @@ ...@@ -7,13 +7,12 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $(AFLAGS) -o $*.s $<
.S.o:
$(CC) $(CFLAGS) $(AFLAGS) -c -o $*.o $<
O_TARGET := kernel.o O_TARGET := kernel.o
EXTRA_AFLAGS := $(CFLAGS)
export-objs := alpha_ksyms.o export-objs := alpha_ksyms.o
obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o irq_alpha.o \ obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o irq_alpha.o \
......
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
# Makefile for alpha-specific library files.. # Makefile for alpha-specific library files..
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) -D__ASSEMBLY__ $(CFLAGS) -o $*.s $<
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) -D__ASSEMBLY__ $(CFLAGS) -c -o $*.o $<
# Many of these routines have implementations tuned for ev6. # Many of these routines have implementations tuned for ev6.
# Choose them iff we're targeting ev6 specifically. # Choose them iff we're targeting ev6 specifically.
......
...@@ -8,10 +8,7 @@ ...@@ -8,10 +8,7 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
# These assembly files can't be assembld with -traditional, so we USE_STANDARD_AS_RULE := true
# need another build rule than the one in the toplevel Makefile.
.S.o:
$(CC) $(AFLAGS) -c $< -o $*.o
all: kernel.o head.o all: kernel.o head.o
......
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
# Makefile for Etrax-specific library files.. # Makefile for Etrax-specific library files..
# #
.S.o: USE_STANDARD_AS_RULE := true
$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
L_TARGET = lib.a L_TARGET = lib.a
EXTRA_AFLAGS := -traditional
obj-y = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o obj-y = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(AFLAGS) -traditional -c -o $*.o $<
EXTRA_AFLAGS := -traditional
OS_TARGET := fpsp.o OS_TARGET := fpsp.o
......
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
# License. See the file "README.legal" in the main directory of this archive # License. See the file "README.legal" in the main directory of this archive
# for more details. # for more details.
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(AFLAGS) -traditional -c -o $*.o $<
EXTRA_AFLAGS := -traditional
OS_TARGET := ifpsp.o OS_TARGET := ifpsp.o
......
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(AFLAGS) -traditional -c $< -o $*.o
EXTRA_AFLAGS := -traditional
ifndef CONFIG_SUN3 ifndef CONFIG_SUN3
all: head.o kernel.o all: head.o kernel.o
......
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
# Makefile for m68k-specific library files.. # Makefile for m68k-specific library files..
# #
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(AFLAGS) -traditional -c $< -o $@
L_TARGET = lib.a L_TARGET = lib.a
EXTRA_AFLAGS := -traditional
obj-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ obj-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
checksum.o memcmp.o memcpy.o memset.o semaphore.o checksum.o memcmp.o memcpy.o memset.o semaphore.o
......
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(EXTRA_CFLAGS) $(AFLAGS) -traditional -c $< -o $*.o
#EXTRA_CFLAGS=-DFPU_EMU_DEBUG EXTRA_AFLAGS := -traditional
#EXTRA_AFLAGS += -DFPU_EMU_DEBUG
#EXTRA_CFLAGS += -DFPU_EMU_DEBUG
O_TARGET := mathemu.o O_TARGET := mathemu.o
......
# q#
# Makefile for Linux arch/m68k/sun3 source directory # Makefile for Linux arch/m68k/sun3 source directory
# #
# Note! Dependencies are done automagically by 'make dep', which also # Note! Dependencies are done automagically by 'make dep', which also
...@@ -7,9 +7,6 @@ ...@@ -7,9 +7,6 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # 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 O_TARGET := sun3.o
export-objs := sun3_ksyms.o export-objs := sun3_ksyms.o
......
...@@ -10,10 +10,9 @@ ...@@ -10,10 +10,9 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
all: au1000.o all: au1000.o
......
...@@ -10,11 +10,6 @@ ...@@ -10,11 +10,6 @@
# unless it's something special (ie not a .c file). # 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 all: pb1000.o
O_TARGET := pb1000.o O_TARGET := pb1000.o
......
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
# Copyright (C) 1995, 1998, 2001 by Ralf Baechle # 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 OBJS = milo.o a.out.o
# #
......
...@@ -9,10 +9,9 @@ ...@@ -9,10 +9,9 @@
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
O_TARGET = ddb5074.a O_TARGET = ddb5074.a
......
...@@ -9,10 +9,9 @@ ...@@ -9,10 +9,9 @@
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
O_TARGET = ddb5476.a O_TARGET = ddb5476.a
......
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
# unless it's something special (ie not a .c file). # 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 O_TARGET:= ddb5xxx.o
obj-y += irq.o irq_cpu.o nile4.o prom.o pci.o pci_auto.o rtc_ds1386.o obj-y += irq.o irq_cpu.o nile4.o prom.o pci.o pci_auto.o rtc_ds1386.o
......
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
O_TARGET:= ddb5477.o O_TARGET:= ddb5477.o
......
...@@ -6,10 +6,7 @@ ...@@ -6,10 +6,7 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(AFLAGS) $< -o $@
.S.o:
$(CC) $(AFLAGS) -c $< -o $@
O_TARGET := dec.o O_TARGET := dec.o
......
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
# unless it's something special (ie not a .c file). # 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 netboot: all
mipsel-linux-ld -N -G 0 -T ld.ecoff ../../boot/zImage \ mipsel-linux-ld -N -G 0 -T ld.ecoff ../../boot/zImage \
dec_boot.o ramdisk.img -o nbImage dec_boot.o ramdisk.img -o nbImage
......
...@@ -8,10 +8,9 @@ ...@@ -8,10 +8,9 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
OBJS = init.o memory.o cmdline.o identify.o locore.o OBJS = init.o memory.o cmdline.o identify.o locore.o
......
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
# unless it's something special (ie not a .c file). # 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 O_TARGET:= gt64120.o
obj-y := gt_irq.o pci.o obj-y := gt_irq.o pci.o
......
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
O_TARGET:= momenco_ocelot.o O_TARGET:= momenco_ocelot.o
......
...@@ -10,10 +10,9 @@ ...@@ -10,10 +10,9 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
all: it8172.o all: it8172.o
......
...@@ -11,11 +11,6 @@ ...@@ -11,11 +11,6 @@
# unless it's something special (ie not a .c file). # 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 all: ivr.o
O_TARGET := ivr.o O_TARGET := ivr.o
......
...@@ -11,11 +11,6 @@ ...@@ -11,11 +11,6 @@
# unless it's something special (ie not a .c file). # 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 all: ite.o
O_TARGET := ite.o O_TARGET := ite.o
......
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $@
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $@
all: jazz.o all: jazz.o
......
...@@ -6,12 +6,9 @@ ...@@ -6,12 +6,9 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(AFLAGS) $< -o $@
.S.o:
$(CC) $(AFLAGS) -c $< -o $@
EXTRA_AFLAGS = -mips3 -mcpu=r4000 # EXTRA_AFLAGS = -mips3 -mcpu=r4000 # not used?
all: kernel.o head.o init_task.o all: kernel.o head.o init_task.o
......
...@@ -2,13 +2,12 @@ ...@@ -2,13 +2,12 @@
# Makefile for MIPS-specific library files.. # Makefile for MIPS-specific library files..
# #
.S.s: USE_STANDARD_AS_RULE := true;
$(CPP) $(CFLAGS) $< -o $*.s
.S.o:
$(CC) $(CFLAGS) -c $< -o $*.o
L_TARGET = lib.a L_TARGET = lib.a
EXTRA_AFLAGS := $(CFLAGS)
obj-y += csum_partial.o csum_partial_copy.o \ obj-y += csum_partial.o csum_partial_copy.o \
rtc-std.o rtc-no.o memcpy.o memset.o \ rtc-std.o rtc-no.o memcpy.o memset.o \
watch.o strlen_user.o strncpy_user.o \ watch.o strlen_user.o strncpy_user.o \
......
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
# unless it's something special (ie not a .c file). # 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 O_TARGET:= fpu_emulator.o
obj-y := cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \ obj-y := cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # 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 all: atlas.o
O_TARGET := atlas.o O_TARGET := atlas.o
......
...@@ -27,10 +27,9 @@ ...@@ -27,10 +27,9 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
O_TARGET := mipsboards.o O_TARGET := mipsboards.o
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # 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 O_TARGET := malta.o
obj-y := malta_int.o malta_rtc.o malta_setup.o obj-y := malta_int.o malta_rtc.o malta_setup.o
......
...@@ -6,10 +6,7 @@ ...@@ -6,10 +6,7 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(AFLAGS) $< -o $@
.S.o:
$(CC) $(AFLAGS) -c $< -o $@
O_TARGET := nino.o O_TARGET := nino.o
......
...@@ -8,10 +8,9 @@ ...@@ -8,10 +8,9 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
O_TARGET := ip22-kern.o O_TARGET := ip22-kern.o
......
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
all: sni.o int-handler.o all: sni.o int-handler.o
......
...@@ -7,11 +7,6 @@ ...@@ -7,11 +7,6 @@
# #
TARGET := $(TOPDIR)/include/asm-$(ARCH)/offset.h TARGET := $(TOPDIR)/include/asm-$(ARCH)/offset.h
.S.s:
$(CPP) $(CFLAGS) $< -o $*.s
.S.o:
$(CC) $(CFLAGS) -c $< -o $*.o
$(TARGET): offset.h $(TARGET): offset.h
cmp -s $^ $@ || (cp $^ $(TARGET).new && mv $(TARGET).new $(TARGET)) cmp -s $^ $@ || (cp $^ $(TARGET).new && mv $(TARGET).new $(TARGET))
...@@ -22,7 +17,7 @@ offset.s: offset.c $(TOPDIR)/include/linux/autoconf.h ...@@ -22,7 +17,7 @@ offset.s: offset.c $(TOPDIR)/include/linux/autoconf.h
clean: clean:
rm -f offset.[hs] $(TARGET).new rm -f offset.[hs] $(TARGET).new
mrproper: mrproper:
rm -f offset.[hs] $(TARGET).new rm -f offset.[hs] $(TARGET).new
rm -f $(TARGET) rm -f $(TARGET)
......
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
# Copyright (C) 1995, 1998, 1999 by Ralf Baechle # 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 # Some DECstations need all possible sections of an ECOFF executable
# #
......
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
# unless it's something special (ie not a .c file). # unless it's something special (ie not a .c file).
# #
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(CFLAGS) $(CFLAGS_$@) -c $< -o $*.o
EXTRA_AFLAGS := $(CFLAGS)
all: kernel.o head.o init_task.o 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 ...@@ -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_BINFMT_ELF32) += binfmt_elf32.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o
CFLAGS_r4k_genex.o := -P AFLAGS_r4k_genex.o := -P
CFLAGS_r4k_tlb_glue.o := -P AFLAGS_r4k_tlb_glue.o := -P
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
# Makefile for MIPS-specific library files.. # Makefile for MIPS-specific library files..
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
L_TARGET = lib.a L_TARGET = lib.a
......
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
# unless it's something special (ie not a .c file). # 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 O_TARGET:= fpu_emulator.o
obj-y := cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \ obj-y := cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # 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 all: atlas.o
O_TARGET := atlas.o O_TARGET := atlas.o
......
...@@ -27,10 +27,9 @@ ...@@ -27,10 +27,9 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
all: mipsboards.o all: mipsboards.o
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # 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 all: malta.o
O_TARGET := malta.o O_TARGET := malta.o
......
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
# under Linux. # under Linux.
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
L_TARGET = ip22.a L_TARGET = ip22.a
......
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
# Makefile for the IP27 specific kernel interface routines under Linux. # Makefile for the IP27 specific kernel interface routines under Linux.
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
O_TARGET = ip27.o O_TARGET = ip27.o
......
...@@ -8,10 +8,9 @@ ...@@ -8,10 +8,9 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(CFLAGS) $< -o $*.s
.S.o: EXTRA_AFLAGS := $(CFLAGS)
$(CC) $(CFLAGS) -c $< -o $*.o
O_TARGET := ip32-kern.a O_TARGET := ip32-kern.a
......
...@@ -7,11 +7,6 @@ ...@@ -7,11 +7,6 @@
# #
TARGET := $(TOPDIR)/include/asm-$(ARCH)/offset.h TARGET := $(TOPDIR)/include/asm-$(ARCH)/offset.h
.S.s:
$(CPP) $(CFLAGS) $< -o $*.s
.S.o:
$(CC) $(CFLAGS) -c $< -o $*.o
$(TARGET): offset.h $(TARGET): offset.h
cmp -s $^ $@ || (cp $^ $(TARGET).new && mv $(TARGET).new $(TARGET)) cmp -s $^ $@ || (cp $^ $(TARGET).new && mv $(TARGET).new $(TARGET))
...@@ -22,7 +17,7 @@ offset.s: offset.c $(TOPDIR)/include/linux/autoconf.h ...@@ -22,7 +17,7 @@ offset.s: offset.c $(TOPDIR)/include/linux/autoconf.h
clean: clean:
rm -f offset.[hs] $(TARGET).new rm -f offset.[hs] $(TARGET).new
mrproper: mrproper:
rm -f offset.[hs] $(TARGET).new rm -f offset.[hs] $(TARGET).new
rm -f $(TARGET) rm -f $(TARGET)
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
# Makefile for parisc-specific library files.. # Makefile for parisc-specific library files..
# #
USE_STANDARD_AS_RULE := true
L_TARGET = lib.a L_TARGET = lib.a
L_OBJS = lusercopy.o bitops.o checksum.o
obj-y := lusercopy.o bitops.o checksum.o
.S.o: EXTRA_AFLAGS := -traditional
$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -7,11 +7,6 @@ ...@@ -7,11 +7,6 @@
# #
TARGET := $(TOPDIR)/include/asm-$(ARCH)/offset.h TARGET := $(TOPDIR)/include/asm-$(ARCH)/offset.h
.S.s:
$(CPP) $(CFLAGS) $< -o $*.s
.S.o:
$(CC) $(CFLAGS) -c $< -o $*.o
all: $(TARGET) all: $(TARGET)
$(TARGET): offset.h $(TARGET): offset.h
......
...@@ -7,14 +7,15 @@ ...@@ -7,14 +7,15 @@
# #
# Note 2! The CFLAGS definition is now in the main makefile... # Note 2! The CFLAGS definition is now in the main makefile...
USE_STANDARD_AS_RULE := true
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
O_TARGET := O_TARGET :=
include $(TOPDIR)/Rules.make EXTRA_AFLAGS := -traditional
.S.o: include $(TOPDIR)/Rules.make
$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
%.lnk: %.o %.lnk: %.o
$(LD) -Ttext 0x0 -o $@ $< $(LD) -Ttext 0x0 -o $@ $<
......
...@@ -7,13 +7,14 @@ ...@@ -7,13 +7,14 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.o: USE_STANDARD_AS_RULE := true
$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
all: kernel.o head.o init_task.o all: kernel.o head.o init_task.o
O_TARGET := kernel.o O_TARGET := kernel.o
EXTRA_AFLAGS := -traditional
export-objs := debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o 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 \ 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 \ setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
......
...@@ -2,16 +2,12 @@ ...@@ -2,16 +2,12 @@
# Makefile for s390-specific library files.. # Makefile for s390-specific library files..
# #
ifdef SMP USE_STANDARD_AS_RULE := true
.S.o:
$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
else
.S.o:
$(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
endif
L_TARGET = lib.a L_TARGET = lib.a
EXTRA_AFLAGS := -traditional
obj-y = checksum.o delay.o memset.o misaligned.o strcmp.o strncpy.o uaccess.o obj-y = checksum.o delay.o memset.o misaligned.o strcmp.o strncpy.o uaccess.o
export-objs += misaligned.o export-objs += misaligned.o
......
...@@ -7,14 +7,15 @@ ...@@ -7,14 +7,15 @@
# #
# Note 2! The CFLAGS definition is now in the main makefile... # Note 2! The CFLAGS definition is now in the main makefile...
USE_STANDARD_AS_RULE := true
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
O_TARGET := O_TARGET :=
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
.S.o: EXTRA_AFLAGS := -traditional
$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
%.lnk: %.o %.lnk: %.o
$(LD) -Ttext 0x0 -o $@ $< $(LD) -Ttext 0x0 -o $@ $<
......
...@@ -7,13 +7,14 @@ ...@@ -7,13 +7,14 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
.S.o: USE_STANDARD_AS_RULE := true
$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
all: kernel.o head.o init_task.o all: kernel.o head.o init_task.o
O_TARGET := kernel.o O_TARGET := kernel.o
EXTRA_AFLAGS := -traditional
export-objs := debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o \ export-objs := debug.o ebcdic.o irq.o s390_ext.o smp.o s390_ksyms.o \
exec32.o exec32.o
......
...@@ -2,16 +2,12 @@ ...@@ -2,16 +2,12 @@
# Makefile for s390-specific library files.. # Makefile for s390-specific library files..
# #
ifdef SMP USE_STANDARD_AS_RULE := true
.S.o:
$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
else
.S.o:
$(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
endif
L_TARGET = lib.a L_TARGET = lib.a
EXTRA_AFLAGS := -traditional
obj-y = checksum.o delay.o memset.o misaligned.o strcmp.o strncpy.o uaccess.o obj-y = checksum.o delay.o memset.o misaligned.o strcmp.o strncpy.o uaccess.o
export-objs += misaligned.o export-objs += misaligned.o
......
...@@ -7,18 +7,16 @@ ...@@ -7,18 +7,16 @@
# #
# Note 2! The CFLAGS definitions are now in the main makefile... # Note 2! The CFLAGS definitions are now in the main makefile...
SH = $(CONFIG_SHELL) USE_STANDARD_AS_RULE := true
.S.s:
$(CPP) $(AFLAGS) -ansi $< -o $*.s
.S.o: SH = $(CONFIG_SHELL)
$(CC) $(AFLAGS) -ansi -c $< -o $*.o
all: kernel.o head.o init_task.o all: kernel.o head.o init_task.o
O_TARGET := kernel.o O_TARGET := kernel.o
EXTRA_AFLAGS := -ansi
export-objs := sparc_ksyms.o export-objs := sparc_ksyms.o
IRQ_OBJS := irq.o sun4m_irq.o sun4c_irq.o sun4d_irq.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} \ obj-y := entry.o wof.o wuf.o etrap.o rtrap.o traps.o ${IRQ_OBJS} \
......
...@@ -2,14 +2,12 @@ ...@@ -2,14 +2,12 @@
# Makefile for Sparc library files.. # Makefile for Sparc library files..
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(AFLAGS) -ansi -DST_DIV0=0x2 $< -o $*.s
.S.o:
$(CC) $(AFLAGS) -ansi -DST_DIV0=0x2 -c $< -o $*.o
L_TARGET = lib.a 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 \ 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 \ strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \
strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \ strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \
......
...@@ -7,15 +7,12 @@ ...@@ -7,15 +7,12 @@
# #
# Note 2! The CFLAGS definition is now in the main makefile... # Note 2! The CFLAGS definition is now in the main makefile...
USE_STANDARD_AS_RULE := true
O_TARGET := math-emu.o O_TARGET := math-emu.o
obj-y := math.o ashldi3.o obj-y := math.o ashldi3.o
.S.s: EXTRA_AFLAGS := -ansi
$(CPP) $(AFLAGS) -ansi $< -o $*.s
.S.o:
$(CC) $(AFLAGS) -ansi -c $< -o $*.o
EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
# #
# Note 2! The CFLAGS definition is now in the main makefile... # Note 2! The CFLAGS definition is now in the main makefile...
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(AFLAGS) -ansi -c -o $*.o $< EXTRA_AFLAGS := -ansi
O_TARGET := mm.o O_TARGET := mm.o
obj-y := fault.o init.o loadmmu.o generic.o extable.o btfixup.o obj-y := fault.o init.o loadmmu.o generic.o extable.o btfixup.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment