[Etherboot-developers] -oformat vs --oformat

[Arkadiusz M. <mi...@pl...>]

Old ld from binutils supports both: -oformat and --oformat while new version
supports only --oformat option. Patch to fix etherboot/mknbi included (similar
change was done in kernel's makefiles)...

Please apply.

diff -urN etherboot-5.0.0.org/src/Config etherboot-5.0.0/src/Config
--- etherboot-5.0.0.org/src/Config	Wed May  2 11:12:05 2001
+++ etherboot-5.0.0/src/Config	Wed May  2 11:13:36 2001
@@ -245,5 +245,5 @@
 CFLAGS32+=	-Wall -W -Wno-format -Wno-unused
 ASFLAGS32=
 LDFLAGS32+=	-N -Ttext $(RELOCADDR) -e _start
-LDBINARY32=	-oformat binary		# flag for headerless binary
+LDBINARY32=	--oformat binary		# flag for headerless binary
 LIBC32=					# not needed


diff -urN mknbi-1.2.org/Makefile mknbi-1.2/Makefile
--- mknbi-1.2.org/Makefile	Wed May  2 11:41:04 2001
+++ mknbi-1.2/Makefile	Wed May  2 11:41:33 2001
@@ -76,17 +76,17 @@
 
 # New 32-bit first stage setup program
 first32.linux:	start32.o first32.o printf.o
-	$(LD) -N -Ttext $(FIRSRELOC) -e _start -oformat binary -o $@ start32.o first32.o printf.o
+	$(LD) -N -Ttext $(FIRSRELOC) -e _start --oformat binary -o $@ start32.o first32.o printf.o
 	@if [ `wc -c < $@` -gt 4096 ]; then echo Binary too large; fi
 
 # New 32-bit first stage protected mode call setup program
 first32pm.linux:	start32pm.o first32pm.o printf.o
-	$(LD) -N -Ttext $(FIRSRELOC) -e _start -oformat binary -o $@ start32pm.o first32pm.o printf.o
+	$(LD) -N -Ttext $(FIRSRELOC) -e _start --oformat binary -o $@ start32pm.o first32pm.o printf.o
 	@if [ `wc -c < $@` -gt 4096 ]; then echo Binary too large; fi
 
 # New 32-bit first stage ELF setup program
 first32elf.linux:	start32pm.o first32elf.o printf.o
-	$(LD) -N -Ttext $(FIRSRELOC) -e _start -oformat binary -o $@ start32pm.o first32elf.o printf.o
+	$(LD) -N -Ttext $(FIRSRELOC) -e _start --oformat binary -o $@ start32pm.o first32elf.o printf.o
 	@if [ `wc -c < $@` -gt 4096 ]; then echo Binary too large; fi
 
 start32.o:	start32.S
@@ -135,11 +135,11 @@
 
 # Menu first stage program
 menu:	startmenu.o menu.o string.o printf.o ansiesc.o
-	$(LD) -N -Ttext $(MENURELOC) -e _start -oformat binary -o $@ startmenu.o menu.o string.o printf.o ansiesc.o
+	$(LD) -N -Ttext $(MENURELOC) -e _start --oformat binary -o $@ startmenu.o menu.o string.o printf.o ansiesc.o
 
 # Another menu program, this one simpler
 menu-simple:	startmenu.o menu-simple.o string.o printf.o ansiesc.o
-	$(LD) -N -Ttext $(MENURELOC) -e _start -oformat binary -o $@ startmenu.o menu-simple.o string.o printf.o ansiesc.o
+	$(LD) -N -Ttext $(MENURELOC) -e _start --oformat binary -o $@ startmenu.o menu-simple.o string.o printf.o ansiesc.o
 
 startmenu.o:	startmenu.S
 	gcc -E -DRELOC=$(MENURELOC) $(OLDGAS) startmenu.S | $(AS) -o startmenu.o

-- 
Arkadiusz Miśkiewicz, AM2-6BONE    [ PLD GNU/Linux IPv6 ]
http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/   [ enabled ]