patch-2.1.23 linux/arch/i386/kernel/Makefile

Next file: linux/arch/i386/kernel/entry.S
Previous file: linux/arch/i386/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.22/linux/arch/i386/kernel/Makefile linux/arch/i386/kernel/Makefile
@@ -7,9 +7,6 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
-#.S.s:
-#	$(CPP) -D__ASSEMBLY__ -traditional $< -o $*.s
-
 ifdef SMP
 .S.o:
 	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
@@ -31,7 +28,7 @@
 
 ifdef SMP
 
-O_OBJS += smp.o
+O_OBJS += smp.o trampoline.o
 
 head.o: head.S $(TOPDIR)/include/linux/tasks.h
 	$(CC) -D__ASSEMBLY__ -D__SMP__ -traditional -c $*.S -o $*.o
@@ -42,31 +39,5 @@
 	$(CC) -D__ASSEMBLY__ -traditional -c $*.S -o $*.o
 
 endif
-
-hexify:
-	$(HOSTCC) hexify.c -o hexify
-
-smp.c: trampoline.hex
-
-trampoline.hex: trampoline hexify
-	(dd if=trampoline bs=1 skip=32 | ./hexify >trampoline.hex )
-
-trampoline: trampoline.o trampoline32.o
-	$(LD86) -s -o $@ trampoline.o trampoline32.o
-
-trampoline.o: trampoline.s
-	$(AS86) -o $@ $<
-
-trampoline32.o: trampoline32.s
-	$(AS386) -o $@ $<
-
-trampoline.s: trampoline.S $(CONFIGURE) $(TOPDIR)/include/linux/config.h Makefile
-	$(CPP) -D__SMP__ -traditional $< -o $@
-
-trampoline32.s: trampoline32.S $(CONFIGURE) $(TOPDIR)/include/linux/config.h Makefile
-	$(CPP) -D__SMP__ -traditional $< -o $@
-
-clean:
-	rm -f trampoline hexify trampoline.hex
 
 include $(TOPDIR)/Rules.make

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov