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

Next file: linux/arch/arm/mm/fault-armv.c
Previous file: linux/arch/arm/lib/uaccess.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.95/linux/arch/arm/mm/Makefile linux/arch/arm/mm/Makefile
@@ -7,8 +7,14 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
+ifeq ($(MACHINE),a5k)
+MMARCH=arc
+else
+MMARCH=$(MACHINE)
+endif
+
 O_TARGET := mm.o
-O_OBJS   := init.o extable.o fault-$(PROCESSOR).o mm-$(MACHINE).o
+O_OBJS   := init.o extable.o fault-$(PROCESSOR).o mm-$(MMARCH).o
 
 ifeq ($(PROCESSOR),armo)
  O_OBJS += proc-arm2,3.o
@@ -28,9 +34,9 @@
 ../lib/constants.h:
 	@$(MAKE) -C ../lib constants.h
 
+ifneq ($(CONFIG_BINUTILS_NEW),y)
 %.o: %.S
-ifndef $(CONFIG_BINUTILS_NEW)
-	$(CC) $(CFLAGS) -D__ASSEMBLY__ -E $< | tr ';$$' '\n#' > ..tmp.s
-	$(CC) $(CFLAGS:-pipe=) -c -o $@ ..tmp.s
-	$(RM) ..tmp.s
+	$(CC) $(CFLAGS) -D__ASSEMBLY__ -E $< | tr ';$$' '\n#' > ..$@.tmp.s
+	$(CC) $(CFLAGS:-pipe=) -c -o $@ ..$@.tmp.s
+	$(RM) ..$@.tmp.s
 endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov