Commit a06ae2d9 authored by Linus Torvalds's avatar Linus Torvalds

Manual merge

parents 20c6b26d 977e3db5
......@@ -39,6 +39,7 @@ GENKSYMS = /sbin/genksyms
DEPMOD = /sbin/depmod
MODFLAGS = -DMODULE
CFLAGS_KERNEL =
AFLAGS_KERNEL =
PERL = perl
export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
......@@ -162,7 +163,7 @@ export NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS
# ---------------------------------------------------------------------------
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 \
......
......@@ -8,12 +8,13 @@
# Copyright (C) 1994 by Linus Torvalds
#
USE_STANDARD_AS_RULE := true
EXTRA_AFLAGS := -traditional
LINKFLAGS = -static -T bootloader.lds #-N -relax
.S.s:
$(CPP) $(AFLAGS) -traditional -o $*.o $<
.S.o:
$(CC) $(AFLAGS) -traditional -c -o $*.o $<
OBJECTS = head.o main.o
BPOBJECTS = head.o bootp.o
TARGETS = vmlinux.gz tools/objstrip # also needed by aboot & milo
......
......@@ -10,11 +10,6 @@
LINKFLAGS = -static -T bootloader.lds
.S.s:
$(CPP) $(AFLAGS) -traditional -o $*.o $<
.S.o:
$(CC) $(AFLAGS) -traditional -c -o $*.o $<
OBJECTS = bootloader.o
targets-$(CONFIG_IA64_HP_SIM) += bootloader
......
......@@ -5,11 +5,6 @@
# Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com)
#
.S.s:
$(CPP) $(AFLAGS) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) -c -o $*.o $<
all: dig.a
O_TARGET := dig.a
......
......@@ -2,10 +2,7 @@
# Makefile for the ia32 kernel emulation subsystem.
#
.S.s:
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
USE_STANDARD_AS_RULE := true
all: ia32.o
......
......@@ -2,10 +2,7 @@
# Makefile for the linux kernel.
#
.S.s:
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
USE_STANDARD_AS_RULE := true
all: kernel.o head.o init_task.o
......
......@@ -2,8 +2,7 @@
# Makefile for ia64-specific library routines..
#
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c $< -o $@
USE_STANDARD_AS_RULE := true
L_TARGET = lib.a
......@@ -25,27 +24,27 @@ IGNORE_FLAGS_OBJS = __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \
$(L_TARGET): $(obj-y) $(export-objs)
__divdi3.o: idiv64.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
$(CC) $(AFLAGS) -c -o $@ $<
__udivdi3.o: idiv64.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
$(CC) $(AFLAGS) -c -DUNSIGNED -c -o $@ $<
__moddi3.o: idiv64.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
$(CC) $(AFLAGS) -c -DMODULO -c -o $@ $<
__umoddi3.o: idiv64.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
$(CC) $(AFLAGS) -c -DMODULO -DUNSIGNED -c -o $@ $<
__divsi3.o: idiv32.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $<
$(CC) $(AFLAGS) -c -o $@ $<
__udivsi3.o: idiv32.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $<
$(CC) $(AFLAGS) -c -DUNSIGNED -c -o $@ $<
__modsi3.o: idiv32.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $<
$(CC) $(AFLAGS) -c -DMODULO -c -o $@ $<
__umodsi3.o: idiv32.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $<
$(CC) $(AFLAGS) -c -DMODULO -DUNSIGNED -c -o $@ $<
include $(TOPDIR)/Rules.make
......@@ -6,6 +6,8 @@
# Copyright (c) 2000-2001 Silicon Graphics, Inc. All rights reserved.
#
USE_STANDARD_AS_RULE := true
TOPDIR=../../../..
HPATH = $(TOPDIR)/include
......@@ -17,11 +19,6 @@ obj-y=fprom
fprom: $(OBJ)
$(LD) -static -Tfprom.lds -o fprom $(OBJ) $(LIB)
.S.o:
$(CC) -D__ASSEMBLY__ $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
.c.o:
$(CC) $(CFLAGS) $(CFLAGS_KERNEL) -c -o $*.o $<
clean:
rm -f *.o fprom
......
......@@ -31,12 +31,9 @@
# http://oss.sgi.com/projects/GenInfo/NoticeExplan
#
EXTRA_CFLAGS := -DLITTLE_ENDIAN
USE_STANDARD_AS_RULE := true
.S.s:
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
EXTRA_CFLAGS := -DLITTLE_ENDIAN
O_TARGET = sn.o
......
......@@ -32,14 +32,10 @@
# http://oss.sgi.com/projects/GenInfo/NoticeExplan
#
USE_STANDARD_AS_RULE := true
EXTRA_CFLAGS := -DLITTLE_ENDIAN
.S.s:
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
all: sn1.a
O_TARGET = sn1.a
......
......@@ -32,14 +32,10 @@
# http://oss.sgi.com/projects/GenInfo/NoticeExplan
#
USE_STANDARD_AS_RULE := true
EXTRA_CFLAGS := -DLITTLE_ENDIAN
.S.s:
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
all: sn2.a
O_TARGET = sn2.a
......
......@@ -2,10 +2,7 @@
# Makefile for the ia32 kernel emulation subsystem.
#
.S.s:
$(CPP) $(AFLAGS) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) -c -o $*.o $<
USE_STANDARD_AS_RULE := true
export-objs := ia32_ioctl.o
......
#
# Makefile for the linux kernel.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# 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
all: kernel.o head.o head64.o init_task.o
......
......@@ -2,8 +2,7 @@
# Makefile for x86_64-specific library files..
#
.S.o:
$(CC) $(AFLAGS) -c $< -o $*.o
USE_STANDARD_AS_RULE := true
L_TARGET = lib.a
obj-y = generic-checksum.o old-checksum.o delay.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