patch-2.4.2 linux/arch/arm/mm/Makefile

• Lines: 61
• Date: Thu Feb 8 16:32:44 2001
• Orig file: v2.4.1/linux/arch/arm/mm/Makefile
• Orig date: Mon Sep 18 15:15:25 2000

diff -u --recursive --new-file v2.4.1/linux/arch/arm/mm/Makefile linux/arch/arm/mm/Makefile
@@ -9,12 +9,11 @@
 
 USE_STANDARD_AS_RULE := true
 
-EXTRA_AFLAGS	:= -traditional
 O_TARGET	:= mm.o
 
 # Object file lists.
 
-obj-y		:= extable.o fault-$(PROCESSOR).o init.o \
+obj-y		:= extable.o fault-common.o fault-$(PROCESSOR).o init.o \
 		   mm-$(PROCESSOR).o small_page.o
 obj-m		:=
 obj-n		:=
@@ -22,10 +21,10 @@
 export-objs	:= proc-syms.o
 
 p-$(CONFIG_CPU_26)	+= proc-arm2,3.o
-p-$(CONFIG_CPU_ARM6)	+= proc-arm6,7.o
-p-$(CONFIG_CPU_ARM7)	+= proc-arm6,7.o
-p-$(CONFIG_CPU_ARM720)	+= proc-arm720.o
-p-$(CONFIG_CPU_ARM920)	+= proc-arm920.o
+p-$(CONFIG_CPU_ARM610)	+= proc-arm6,7.o
+p-$(CONFIG_CPU_ARM710)	+= proc-arm6,7.o
+p-$(CONFIG_CPU_ARM720T)	+= proc-arm720.o
+p-$(CONFIG_CPU_ARM920T)	+= proc-arm920.o
 p-$(CONFIG_CPU_ARM10)	+= proc-arm10.o
 p-$(CONFIG_CPU_SA110)	+= proc-sa110.o
 p-$(CONFIG_CPU_SA1100)	+= proc-sa110.o
@@ -37,29 +36,16 @@
 
 # Integrator follows "new style"
 # Soon, others will do too, and we can get rid of this
-MMMACH		:= mm-$(MACHINE).o
+MMMACH		:= mm-$(MACHINE).c
 ifeq ($(MMMACH),$(wildcard $(MMMACH)))
-obj-$(CONFIG_CPU_32)	+= $(MMMACH)
+obj-$(CONFIG_CPU_32)	+= $(MMMACH:.c=.o)
 endif
 
 obj-y		+= $(sort $(p-y))
 
-# Files that are both resident and modular; remove from modular.
-
-obj-m		:= $(filter-out $(obj-y), $(obj-m))
-
-# Translate to Rules.make lists.
-
-O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
-OX_OBJS 	:= $(filter	$(export-objs), $(obj-y))
-M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
-MX_OBJS 	:= $(sort $(filter     $(export-objs), $(obj-m)))
-
 include $(TOPDIR)/Rules.make
 
 # Special dependencies
-fault-armv.o:   fault-common.c
-fault-armo.o:   fault-common.c
 proc-arm2,3.o:	../lib/constants.h
 proc-arm6,7.o:	../lib/constants.h
 proc-arm720.o:	../lib/constants.h