patch-2.4.0-test9 linux/arch/arm/mm/Makefile

• Lines: 84
• Date: Mon Sep 18 15:15:25 2000
• Orig file: v2.4.0-test8/linux/arch/arm/mm/Makefile
• Orig date: Sun Aug 13 09:54:15 2000

diff -u --recursive --new-file v2.4.0-test8/linux/arch/arm/mm/Makefile linux/arch/arm/mm/Makefile
@@ -9,40 +9,61 @@
 
 USE_STANDARD_AS_RULE := true
 
+EXTRA_AFLAGS	:= -traditional
 O_TARGET	:= mm.o
-O_OBJS		:= extable.o fault-$(PROCESSOR).o init.o \
+
+# Object file lists.
+
+obj-y		:= extable.o fault-$(PROCESSOR).o init.o \
 		   mm-$(PROCESSOR).o small_page.o
+obj-m		:=
+obj-n		:=
+obj-		:=
+export-objs	:= proc-syms.o
 
-ifeq ($(CONFIG_CPU_26),y)
-  O_OBJS	+= proc-arm2,3.o
-endif
+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_ARM10)	+= proc-arm10.o
+p-$(CONFIG_CPU_SA110)	+= proc-sa110.o
+p-$(CONFIG_CPU_SA1100)	+= proc-sa110.o
 
+obj-$(CONFIG_CPU_32)  	+= consistent.o ioremap.o
 ifeq ($(CONFIG_CPU_32),y)
-  ifeq ($(CONFIG_CPU_ARM6),y)
-    P_OBJS	+= proc-arm6,7.o
-  endif
-  ifeq ($(CONFIG_CPU_ARM7),y)
-    P_OBJS	+= proc-arm6,7.o
-  endif
-  ifeq ($(CONFIG_CPU_ARM720),y)
-    P_OBJS	+= proc-arm720.o
-  endif
-  ifeq ($(CONFIG_CPU_SA110),y)
-    P_OBJS	+= proc-sa110.o
-  endif
-  ifeq ($(CONFIG_CPU_SA1100),y)
-    P_OBJS	+= proc-sa110.o
-  endif
-  O_OBJS	+= mm-$(MACHINE).o consistent.o ioremap.o $(sort $(P_OBJS))
+obj-$(CONFIG_MODULES)	+= proc-syms.o
+endif
+
+# Integrator follows "new style"
+# Soon, others will do too, and we can get rid of this
+MMMACH		:= mm-$(MACHINE).o
+ifeq ($(MMMACH),$(wildcard $(MMMACH)))
+obj-$(CONFIG_CPU_32)	+= $(MMMACH)
 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
+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
+proc-arm920.o:	../lib/constants.h
+proc-arm10.o:	../lib/constants.h
 proc-sa110.o:	../lib/constants.h