patch-2.0.21-2.1.0 linux/arch/i386/Makefile

• Lines: 65
• Date: Thu Sep 26 07:39:10 1996
• Orig file: lx2.0/v2.0.21/linux/arch/i386/Makefile
• Orig date: Thu Jul 25 19:35:00 1996

diff -u --recursive --new-file lx2.0/v2.0.21/linux/arch/i386/Makefile linux/arch/i386/Makefile
@@ -13,27 +13,25 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
+AS86    =$(CROSS_COMPILE)as86 -0 -a
+AS386   =$(CROSS_COMPILE)as86 -3
+LD86    =$(CROSS_COMPILE)ld86 -0
+
 #
-# Set these to indicate how to link it..
-#
-# -zmagic:   (aout, old GCC-2.5.2)
-#
-# ZLINKFLAGS   = -Ttext 0x1000
-# BZLINKFLAGS  = -Ttext 0x100000     # (for big high loaded kernels)
-# LINKFLAGS    = -Ttext 0x100000
+# ZIMAGE_OFFSET is the load offset of the compression loader
+# BZIMAGE_OFFSET is the load offset of the high loaded compression loader
 #
-# -qmagic:   (aout)
+ZIMAGE_OFFSET=0x1000
+BZIMAGE_OFFSET=0x100000
+
 #
-# ZLINKFLAGS   = -Ttext 0x0xfe0
-# BZLINKFLAGS  = -Ttext 0xfffe0      # (for big high loaded kernels)
-# LINKFLAGS    = -Ttext 0xfffe0
+# IMAGE_OFFSET is the load offset of the _real_ kernel, soon
+# to be offset by another 0xC0000000...
 #
+IMAGE_OFFSET=0xC0100000
 
-AS86    =$(CROSS_COMPILE)as86 -0 -a
-AS386   =$(CROSS_COMPILE)as86 -3
-LD86    =$(CROSS_COMPILE)ld86 -0
-
-ifdef CONFIG_KERNEL_ELF
+# This is used for ELF - it needs to migrate or be moved.
+LD_RFLAG = -m elf_i386
 
 LD=$(CROSS_COMPILE)ld -m elf_i386
 CPP=$(CC) -E -D__ELF__
@@ -43,21 +41,9 @@
 OBJCOPY=$(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -R .stab -R .stabstr
 ZLDFLAGS=-e startup_32 
 LDFLAGS=-e stext
-ZIMAGE_OFFSET=0x1000
-IMAGE_OFFSET=0x100000
 ZLINKFLAGS =-Ttext $(ZIMAGE_OFFSET) $(ZLDFLAGS)
-BZLINKFLAGS =-Ttext $(IMAGE_OFFSET) $(ZLDFLAGS)
+BZLINKFLAGS =-Ttext $(BZIMAGE_OFFSET) $(ZLDFLAGS)
 LINKFLAGS =-Ttext $(IMAGE_OFFSET) $(LDFLAGS)
-
-else
-
-#
-# -qmagic (we need to remove the 32 byte header for bootup purposes)
-#
-ZLINKFLAGS =-qmagic -Ttext 0xfe0
-BZLINKFLAGS =-qmagic -Ttext 0xfffe0
-LINKFLAGS =-qmagic -Ttext 0xfffe0
-endif
 
 CFLAGS := $(CFLAGS) -pipe