patch-2.3.21 linux/arch/i386/boot/Makefile

• Lines: 71
• Date: Mon Oct 11 14:06:10 1999
• Orig file: v2.3.20/linux/arch/i386/boot/Makefile
• Orig date: Tue Aug 31 17:29:12 1999

diff -u --recursive --new-file v2.3.20/linux/arch/i386/boot/Makefile linux/arch/i386/boot/Makefile
@@ -8,9 +8,6 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-AS86	=$(CROSS_COMPILE)as86 -0 -a
-LD86	=$(CROSS_COMPILE)ld86 -0
-
 BOOT_INCL =	$(TOPDIR)/include/linux/config.h \
 		$(TOPDIR)/include/linux/autoconf.h \
 		$(TOPDIR)/include/asm/boot.h
@@ -45,40 +42,40 @@
 tools/build: tools/build.c
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $< -I$(TOPDIR)/include
 
-setup: setup.o
-	$(LD86) -s -o $@ $<
+bootsect: bootsect.o
+	$(LD) -Ttext 0x0 -s -oformat binary -o $@ $<
 
-setup.o: setup.s
-	$(AS86) -o $@ $<
+bootsect.o: bootsect.s
+	$(AS) -o $@ $<
 
-setup.s: setup.S video.S Makefile $(BOOT_INCL) $(TOPDIR)/include/linux/version.h $(TOPDIR)/include/linux/compile.h
+bootsect.s: bootsect.S Makefile $(BOOT_INCL)
 	$(CPP) -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
 
-bsetup: bsetup.o
-	$(LD86) -s -o $@ $<
+bbootsect: bbootsect.o bsetup
+	$(LD) -Ttext 0x0 -s -oformat binary $< -R bsetup.o -o $@
 
-bsetup.o: bsetup.s
-	$(AS86) -o $@ $<
+bbootsect.o: bbootsect.s
+	$(AS) -o $@ $<
 
-bsetup.s: setup.S video.S Makefile $(BOOT_INCL) $(TOPDIR)/include/linux/version.h $(TOPDIR)/include/linux/compile.h
+bbootsect.s: bootsect.S Makefile $(BOOT_INCL)
 	$(CPP) -D__BIG_KERNEL__ -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
 
-bootsect: bootsect.o
-	$(LD86) -s -o $@ $<
+setup: setup.o
+	$(LD) -Ttext 0x0 -s -oformat binary -e begtext -o $@ $<
 
-bootsect.o: bootsect.s
-	$(AS86) -o $@ $<
+setup.o: setup.s
+	$(AS) -o $@ $<
 
-bootsect.s: bootsect.S Makefile $(BOOT_INCL)
+setup.s: setup.S video.S Makefile $(BOOT_INCL) $(TOPDIR)/include/linux/version.h $(TOPDIR)/include/linux/compile.h
 	$(CPP) -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
 
-bbootsect: bbootsect.o
-	$(LD86) -s -o $@ $<
+bsetup: bsetup.o
+	$(LD) -Ttext 0x0 -s -oformat binary -e begtext -o $@ $<
 
-bbootsect.o: bbootsect.s
-	$(AS86) -o $@ $<
+bsetup.o: bsetup.s
+	$(AS) -o $@ $<
 
-bbootsect.s: bootsect.S Makefile $(BOOT_INCL)
+bsetup.s: setup.S video.S Makefile $(BOOT_INCL) $(TOPDIR)/include/linux/version.h $(TOPDIR)/include/linux/compile.h
 	$(CPP) -D__BIG_KERNEL__ -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
 
 dep: