[PATCH] USE_STANDARD_AS_RULE in i386 arch Makefiles

In Rules.make, a comment says:

# Old makefiles define their own rules for compiling .S files,
# but these standard rules are available for any Makefile that
# wants to use them.  Our plan is to incrementally convert all
# the Makefiles to these standard rules.  -- rmk, mec

This patch does that for the i386 arch Makefiles.

diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 12f530e688fae860a483d793d70751e764f50b75..0271fab4d583f1fdd857693aa1ee75b193767101 100644 (file)
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -7,8 +7,8 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-.S.o:
-       $(CC) $(AFLAGS) -traditional -c $< -o $*.o
+EXTRA_AFLAGS   := -traditional
+USE_STANDARD_AS_RULE   := true
 
 all: first_rule kernel.o head.o init_task.o
 

diff --git a/arch/i386/lib/Makefile b/arch/i386/lib/Makefile
index 44a12b70502a05ab55061b68095c330db1aba37b..8bfbcf0f9e74e7fef62ff5dd4c28c0490f562644 100644 (file)
--- a/arch/i386/lib/Makefile
+++ b/arch/i386/lib/Makefile
@@ -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
 

diff --git a/arch/i386/math-emu/Makefile b/arch/i386/math-emu/Makefile
index 9b489779ce83c6cb5925bfc9e01f9baa5748b861..b3ceba12db20b5b691ac0da081b69b41bf062fbb 100644 (file)
--- a/arch/i386/math-emu/Makefile
+++ b/arch/i386/math-emu/Makefile
@@ -9,8 +9,8 @@ DEBUG   =
 PARANOID = -DPARANOID
 CFLAGS := $(CFLAGS) $(PARANOID) $(DEBUG) -fno-builtin $(MATH_EMULATION)
 
-.S.o:
-       $(CC) $(AFLAGS) $(PARANOID) -c $<
+USE_STANDARD_AS_RULE   := true
+EXTRA_AFLAGS   := $(PARANOID)
 
 # From 'C' language sources:
 C_OBJS =fpu_entry.o errors.o \