[PATCH] 2.4.2 'ld' fix

From: Chris Wedgwood (cw@f00f.org)
Date: Sat Feb 24 2001 - 07:38:43 EST

  • Next message: Alan Cox: "Re: [PATCH] 2.4.2 'ld' fix"

    Linus/Alan

    The ld in newer bintuils doesn't like -oformat, rather it
    requires --oformat instead. This is backwards compatible at
    least to 2.9.5 so shouldn't break anything :)

    As far as I can tell on i386 uses ld in such a way.

      --cw

    diff -Nur linux-2.4.2/arch/i386/boot/Makefile linux-2.4.2.new/arch/i386/boot/Makefile
    --- linux-2.4.2/arch/i386/boot/Makefile Tue Dec 21 11:43:39 1999
    +++ linux-2.4.2.new/arch/i386/boot/Makefile Sun Feb 25 01:12:23 2001
    @@ -43,7 +43,7 @@
             $(HOSTCC) $(HOSTCFLAGS) -o $@ $< -I$(TOPDIR)/include
     
     bootsect: bootsect.o
    - $(LD) -Ttext 0x0 -s -oformat binary -o $@ $<
    + $(LD) -Ttext 0x0 -s --oformat binary -o $@ $<
     
     bootsect.o: bootsect.s
             $(AS) -o $@ $<
    @@ -52,7 +52,7 @@
             $(CPP) $(CPPFLAGS) -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
     
     bbootsect: bbootsect.o
    - $(LD) -Ttext 0x0 -s -oformat binary $< -o $@
    + $(LD) -Ttext 0x0 -s --oformat binary $< -o $@
     
     bbootsect.o: bbootsect.s
             $(AS) -o $@ $<
    @@ -61,7 +61,7 @@
             $(CPP) $(CPPFLAGS) -D__BIG_KERNEL__ -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
     
     setup: setup.o
    - $(LD) -Ttext 0x0 -s -oformat binary -e begtext -o $@ $<
    + $(LD) -Ttext 0x0 -s --oformat binary -e begtext -o $@ $<
     
     setup.o: setup.s
             $(AS) -o $@ $<
    @@ -70,7 +70,7 @@
             $(CPP) $(CPPFLAGS) -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
     
     bsetup: bsetup.o
    - $(LD) -Ttext 0x0 -s -oformat binary -e begtext -o $@ $<
    + $(LD) -Ttext 0x0 -s --oformat binary -e begtext -o $@ $<
     
     bsetup.o: bsetup.s
             $(AS) -o $@ $<
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/



    This archive was generated by hypermail 2b29 : Sat Feb 24 2001 - 07:40:57 EST