WRONG changes made to ARM tree

From: Russell King (rmk@arm.linux.org.uk)
Date: Fri Mar 24 2000 - 17:19:56 EST


Hi,

In the 2.3.99-pre3 patch, I see the following changes:

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/acorn/block/Makefile linux/drivers/acorn/bloc
k/Makefile
--- v2.3.99-pre2/linux/drivers/acorn/block/Makefile Thu Mar 2 14:36:22 2000
+++ linux/drivers/acorn/block/Makefile Wed Mar 22 09:39:11 2000
@@ -51,9 +51,6 @@

 include $(TOPDIR)/Rules.make

-.S.o:
- $(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c -o $*.o $<
-
 fd1772_mod.o: $(FLOPPY)
        $(LD) -r -o $@ $(FLOPPY)

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/acorn/scsi/Makefile linux/drivers/acorn/scsi/
Makefile
--- v2.3.99-pre2/linux/drivers/acorn/scsi/Makefile Thu Mar 2 14:36:22 2000
+++ linux/drivers/acorn/scsi/Makefile Wed Mar 22 09:39:11 2000
@@ -49,8 +49,5 @@

 include $(TOPDIR)/Rules.make

-.S.o:
- $(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c -o $*.o $<
-
 acornscsi_mod.o: acornscsi.o acornscsi-io.o
        $(LD) $(LD_RFLAG) -r -o $@ acornscsi.o acornscsi-io.o

These are required for correct compilation of the .S files. Without them, the
kernel headers have no knowledge of __ASSEMBLY__ being defined, and as a
consequence they fail to be compiled.

Also, there is NO rule in Rules.make to cover this, apart from makes built in
default.

Could whoever made this change please contact me urgently with the reasons
why this change was made, esp as I shall be imminently be generating a new
patch for Linus.
   _____
  |_____| ------------------------------------------------- ---+---+-
  | | Russell King rmk@arm.linux.org.uk --- ---
  | | | | http://www.arm.linux.org.uk/~rmk/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.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Fri Mar 31 2000 - 21:00:14 EST