Patch: x86 makefiles and assembly rules

From: Russell King (rmk@arm.linux.org.uk)
Date: Mon Aug 28 2000 - 16:55:35 EST


Linus,

Here is some more of the patch for the assembly rule migration. This
time, it covers just the x86 makefiles. As you can see, to enable
the new rules, we need to set USE_STANDARD_AS_RULE to be "true", and
any extra flags that the old rule was using must be included into
EXTRA_AFLAGS. If we have any extra per-file flags, they go into
AFLAGS_name_of_object.o, just like EXTRA_CFLAGS/CFLAGS_name.o.

Please consider applying for test8.

diff -urN linux-orig/arch/i386/kernel/Makefile linux/arch/i386/kernel/Makefile
--- linux-orig/arch/i386/kernel/Makefile Sun Jul 9 10:48:33 2000
+++ linux/arch/i386/kernel/Makefile Thu Aug 3 19:17:24 2000
@@ -7,8 +7,8 @@
 #
 # 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 init_task.o
 
diff -urN linux-orig/arch/i386/lib/Makefile linux/arch/i386/lib/Makefile
--- linux-orig/arch/i386/lib/Makefile Thu Aug 10 20:45:41 2000
+++ linux/arch/i386/lib/Makefile Wed Aug 9 20:47:43 2000
@@ -2,8 +2,7 @@
 # Makefile for i386-specific library files..
 #
 
-.S.o:
- $(CC) $(AFLAGS) -c $< -o $*.o
+USE_STANDARD_AS_RULE := true
 
 L_TARGET = lib.a
 L_OBJS = checksum.o old-checksum.o delay.o \
diff -urN linux-orig/arch/i386/math-emu/Makefile linux/arch/i386/math-emu/Makefile
--- linux-orig/arch/i386/math-emu/Makefile Wed Mar 1 11:38:27 2000
+++ linux/arch/i386/math-emu/Makefile Thu Aug 3 19:17:47 2000
@@ -2,15 +2,15 @@
 # Makefile for wm-FPU-emu
 #
 
+USE_STANDARD_AS_RULE := true
+
 L_TARGET := math.a
 
 #DEBUG = -DDEBUGGING
 DEBUG =
 PARANOID = -DPARANOID
 CFLAGS := $(CFLAGS) $(PARANOID) $(DEBUG) -fno-builtin $(MATH_EMULATION)
-
-.S.o:
- $(CC) $(AFLAGS) $(PARANOID) -c $<
+EXTRA_AFLAGS := $(PARANOID)
 
 # From 'C' language sources:
 C_OBJS =fpu_entry.o errors.o \

   _____
  |_____| ------------------------------------------------- ---+---+-
  | | Russell King rmk@arm.linux.org.uk --- ---
  | | | | http://www.arm.linux.org.uk/personal/aboutme.html / / |
  | +-+-+ --- -+-
  / | THE developer of ARM Linux |+| /|\
 / | | | --- |
    +-+-+ ------------------------------------------------- /\\\ |
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Aug 31 2000 - 21:00:22 EST