patch-2.1.17 linux/arch/m68k/Makefile

• Lines: 41
• Date: Fri Dec 20 11:19:57 1996
• Orig file: v2.1.16/linux/arch/m68k/Makefile
• Orig date: Fri Nov 22 18:28:13 1996

diff -u --recursive --new-file v2.1.16/linux/arch/m68k/Makefile linux/arch/m68k/Makefile
@@ -18,19 +18,11 @@
 
 # override top level makefile
 AS += -m68020
-ifdef CONFIG_KERNEL_ELF
 LD += -m m68kelf
 ifneq ($(COMPILE_ARCH),$(ARCH))
 	# prefix for cross-compiling binaries
 	CROSS_COMPILE = m68k-linux-
 endif
-else
-LD += -m m68klinux
-ifneq ($(COMPILE_ARCH),$(ARCH))
-	# prefix for cross-compiling binaries
-	CROSS_COMPILE = m68k-linuxaout-
-endif
-endif
 
 #
 # Set these to indicate how to link it..
@@ -42,11 +34,7 @@
 # -qmagic (we need to remove the 32 byte header for bootup purposes)
 #
 
-ifdef CONFIG_KERNEL_ELF
 LINKFLAGS = -Ttext 0x1000
-else
-LINKFLAGS = -qmagic -Ttext 0xFE0
-endif
 
 CFLAGS := $(CFLAGS) -pipe
 
@@ -55,7 +43,7 @@
 endif
 
 ifdef CONFIG_OPTIMIZE_060
-CFLAGS := $(CFLAGS) -m68020-40 -Wa,-m68060
+CFLAGS := $(CFLAGS) -m68020-40
 endif
 
 HEAD := arch/m68k/kernel/head.o