Skip to content

L
linux
Commit 977e3db5 authored by Kai Germaschewski's avatar Kai Germaschewski
Browse files
Options

Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5 

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-as
parents fa82a1da 3460269d
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 68 deletions
Makefile
View file @ 977e3db5
...@@ -39,6 +39,7 @@ GENKSYMS = /sbin/genksyms ...@@ -39,6 +39,7 @@ GENKSYMS = /sbin/genksyms
DEPMOD = /sbin/depmod DEPMOD = /sbin/depmod
MODFLAGS = -DMODULE MODFLAGS = -DMODULE
CFLAGS_KERNEL = CFLAGS_KERNEL =
AFLAGS_KERNEL =
PERL = perl PERL = perl
export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \ export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
...@@ -245,7 +246,7 @@ Version: dummy ...@@ -245,7 +246,7 @@ Version: dummy
@rm -f include/linux/compile.h @rm -f include/linux/compile.h
boot: vmlinux 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 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 \ $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o init/do_mounts.o \
...@@ -286,7 +287,7 @@ include/config/MARKER: scripts/split-include include/linux/autoconf.h ...@@ -286,7 +287,7 @@ include/config/MARKER: scripts/split-include include/linux/autoconf.h
linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS)) linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))
$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER $(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER
$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@) @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@)
$(TOPDIR)/include/linux/version.h: include/linux/version.h $(TOPDIR)/include/linux/version.h: include/linux/version.h
$(TOPDIR)/include/linux/compile.h: include/linux/compile.h $(TOPDIR)/include/linux/compile.h: include/linux/compile.h
...@@ -331,7 +332,7 @@ init/do_mounts.o: init/do_mounts.c include/config/MARKER ...@@ -331,7 +332,7 @@ init/do_mounts.o: init/do_mounts.c include/config/MARKER
$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $< $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
fs lib mm ipc kernel drivers net sound: dummy fs lib mm ipc kernel drivers net sound: dummy
$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@) @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
TAGS: dummy TAGS: dummy
{ find include/asm-${ARCH} -name '*.h' -print ; \ { find include/asm-${ARCH} -name '*.h' -print ; \
......
arch/alpha/boot/Makefile
View file @ 977e3db5
...@@ -8,12 +8,13 @@ ...@@ -8,12 +8,13 @@
# Copyright (C) 1994 by Linus Torvalds # Copyright (C) 1994 by Linus Torvalds
# #
USE_STANDARD_AS_RULE := true
EXTRA_AFLAGS := -traditional
LINKFLAGS = -static -T bootloader.lds #-N -relax 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 OBJECTS = head.o main.o
BPOBJECTS = head.o bootp.o BPOBJECTS = head.o bootp.o
TARGETS = vmlinux.gz tools/objstrip # also needed by aboot & milo TARGETS = vmlinux.gz tools/objstrip # also needed by aboot & milo
......
arch/ia64/boot/Makefile
View file @ 977e3db5
...@@ -10,11 +10,6 @@ ...@@ -10,11 +10,6 @@
LINKFLAGS = -static -T bootloader.lds LINKFLAGS = -static -T bootloader.lds
.S.s:
$(CPP) $(AFLAGS) -traditional -o $*.o $<
.S.o:
$(CC) $(AFLAGS) -traditional -c -o $*.o $<
OBJECTS = bootloader.o OBJECTS = bootloader.o
targets-$(CONFIG_IA64_HP_SIM) += bootloader targets-$(CONFIG_IA64_HP_SIM) += bootloader
......
arch/ia64/dig/Makefile
View file @ 977e3db5
...@@ -5,11 +5,6 @@ ...@@ -5,11 +5,6 @@
# Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com) # Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com)
# #
.S.s:
$(CPP) $(AFLAGS) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) -c -o $*.o $<
all: dig.a all: dig.a
O_TARGET := dig.a O_TARGET := dig.a
......
arch/ia64/ia32/Makefile
View file @ 977e3db5
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
# Makefile for the ia32 kernel emulation subsystem. # Makefile for the ia32 kernel emulation subsystem.
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
all: ia32.o all: ia32.o
......
arch/ia64/kernel/Makefile
View file @ 977e3db5
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
# Makefile for the linux kernel. # Makefile for the linux kernel.
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
all: kernel.o head.o init_task.o all: kernel.o head.o init_task.o
......
arch/ia64/lib/Makefile
View file @ 977e3db5
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
# Makefile for ia64-specific library routines.. # Makefile for ia64-specific library routines..
# #
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c $< -o $@
L_TARGET = lib.a L_TARGET = lib.a
...@@ -25,27 +24,27 @@ IGNORE_FLAGS_OBJS = __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \ ...@@ -25,27 +24,27 @@ IGNORE_FLAGS_OBJS = __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \
$(L_TARGET): $(obj-y) $(export-objs) $(L_TARGET): $(obj-y) $(export-objs)
__divdi3.o: idiv64.S __divdi3.o: idiv64.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $< $(CC) $(AFLAGS) -c -o $@ $<
__udivdi3.o: idiv64.S __udivdi3.o: idiv64.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $< $(CC) $(AFLAGS) -c -DUNSIGNED -c -o $@ $<
__moddi3.o: idiv64.S __moddi3.o: idiv64.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $< $(CC) $(AFLAGS) -c -DMODULO -c -o $@ $<
__umoddi3.o: idiv64.S __umoddi3.o: idiv64.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $< $(CC) $(AFLAGS) -c -DMODULO -DUNSIGNED -c -o $@ $<
__divsi3.o: idiv32.S __divsi3.o: idiv32.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $@ $< $(CC) $(AFLAGS) -c -o $@ $<
__udivsi3.o: idiv32.S __udivsi3.o: idiv32.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DUNSIGNED -c -o $@ $< $(CC) $(AFLAGS) -c -DUNSIGNED -c -o $@ $<
__modsi3.o: idiv32.S __modsi3.o: idiv32.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -c -o $@ $< $(CC) $(AFLAGS) -c -DMODULO -c -o $@ $<
__umodsi3.o: idiv32.S __umodsi3.o: idiv32.S
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -DMODULO -DUNSIGNED -c -o $@ $< $(CC) $(AFLAGS) -c -DMODULO -DUNSIGNED -c -o $@ $<
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
arch/ia64/sn/fakeprom/Makefile
View file @ 977e3db5
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
# Copyright (c) 2000-2001 Silicon Graphics, Inc. All rights reserved. # Copyright (c) 2000-2001 Silicon Graphics, Inc. All rights reserved.
# #
USE_STANDARD_AS_RULE := true
TOPDIR=../../../.. TOPDIR=../../../..
HPATH = $(TOPDIR)/include HPATH = $(TOPDIR)/include
...@@ -17,11 +19,6 @@ obj-y=fprom ...@@ -17,11 +19,6 @@ obj-y=fprom
fprom: $(OBJ) fprom: $(OBJ)
$(LD) -static -Tfprom.lds -o fprom $(OBJ) $(LIB) $(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: clean:
rm -f *.o fprom rm -f *.o fprom
......
arch/ia64/sn/kernel/Makefile
View file @ 977e3db5
...@@ -31,12 +31,9 @@ ...@@ -31,12 +31,9 @@
# http://oss.sgi.com/projects/GenInfo/NoticeExplan # http://oss.sgi.com/projects/GenInfo/NoticeExplan
# #
EXTRA_CFLAGS := -DLITTLE_ENDIAN USE_STANDARD_AS_RULE := true
.S.s: EXTRA_CFLAGS := -DLITTLE_ENDIAN
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
O_TARGET = sn.o O_TARGET = sn.o
......
arch/ia64/sn/kernel/sn1/Makefile
View file @ 977e3db5
...@@ -32,14 +32,10 @@ ...@@ -32,14 +32,10 @@
# http://oss.sgi.com/projects/GenInfo/NoticeExplan # http://oss.sgi.com/projects/GenInfo/NoticeExplan
# #
USE_STANDARD_AS_RULE := true
EXTRA_CFLAGS := -DLITTLE_ENDIAN EXTRA_CFLAGS := -DLITTLE_ENDIAN
.S.s:
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
all: sn1.a all: sn1.a
O_TARGET = sn1.a O_TARGET = sn1.a
......
arch/ia64/sn/kernel/sn2/Makefile
View file @ 977e3db5
...@@ -32,14 +32,10 @@ ...@@ -32,14 +32,10 @@
# http://oss.sgi.com/projects/GenInfo/NoticeExplan # http://oss.sgi.com/projects/GenInfo/NoticeExplan
# #
USE_STANDARD_AS_RULE := true
EXTRA_CFLAGS := -DLITTLE_ENDIAN EXTRA_CFLAGS := -DLITTLE_ENDIAN
.S.s:
$(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) $(AFLAGS_KERNEL) -c -o $*.o $<
all: sn2.a all: sn2.a
O_TARGET = sn2.a O_TARGET = sn2.a
......
arch/x86_64/ia32/Makefile
View file @ 977e3db5
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
# Makefile for the ia32 kernel emulation subsystem. # Makefile for the ia32 kernel emulation subsystem.
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(AFLAGS) -o $*.s $<
.S.o:
$(CC) $(AFLAGS) -c -o $*.o $<
export-objs := ia32_ioctl.o export-objs := ia32_ioctl.o
......
arch/x86_64/kernel/Makefile
View file @ 977e3db5
# #
# Makefile for the linux kernel. # 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: USE_STANDARD_AS_RULE := true
$(CC) $(AFLAGS) -traditional -c $< -o $*.o
EXTRA_AFLAGS := -traditional
all: kernel.o head.o head64.o init_task.o all: kernel.o head.o head64.o init_task.o
......
arch/x86_64/lib/Makefile
View file @ 977e3db5
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
# Makefile for x86_64-specific library files.. # Makefile for x86_64-specific library files..
# #
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(AFLAGS) -c $< -o $*.o
L_TARGET = lib.a L_TARGET = lib.a
obj-y = generic-checksum.o old-checksum.o delay.o \ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7