update

[l4.git] / kernel / fiasco / src / boot / ia32 / Makerules.BOOT.ia32

diff --git a/kernel/fiasco/src/boot/ia32/Makerules.BOOT.ia32 b/kernel/fiasco/src/boot/ia32/Makerules.BOOT.ia32
index 95dbc37ce8dbce1763bd8df6012b468a09cf9893..ad2725a5aa38f15b919aae5ee9a3ae4234f40891 100644 (file)
--- a/kernel/fiasco/src/boot/ia32/Makerules.BOOT.ia32
+++ b/kernel/fiasco/src/boot/ia32/Makerules.BOOT.ia32
@@ -9,12 +9,24 @@
 # can be replaced by using div32/mod32 from lib/libk (and should
 # for efficency reasons).
 
-boot_img.o:    $(OBJ_BOOT) $(DRIVERS) $(MINILIBC) 
-               $(LINK_MESSAGE)
-               $(VERBOSE)$(LD) -m $(LD_EMULATION) -r -s -o $@_x.o \
-                  -T $(srcdir)/boot/ia32/bootstrap.ld $^
-               $(VERBOSE)$(OBJCOPY) -G _boot_start $@_x.o $@
-               $(VERBOSE)$(RM) $@_x.o
+boot_img.o:    boot_img.x2 boot_img.ren_syms
+       $(LINK_MESSAGE)
+       $(VERBOSE)$(OBJCOPY) --redefine-syms=boot_img.ren_syms $< $@
+
+boot_img.ren_syms: boot_img.x2
+       $(LINK_MESSAGE)
+       $(VERBOSE)$(NM) -u $^ | perl -n -e 'if (/^\s*U\s+bootstrap_(.*)$$/) { print "bootstrap_$$1 $$1\n"; }' > $@
+
+boot_img.x1:   $(OBJ_BOOT) $(DRIVERS) $(MINILIBC) 
+       $(LINK_MESSAGE)
+       $(VERBOSE)$(LD) -m $(LD_EMULATION) -r -s -o $@ \
+       -T $(srcdir)/boot/ia32/bootstrap.ld $^ $(LIBGCC)
+
+boot_img.x2:   boot_img.x1
+       $(LINK_MESSAGE)
+       $(VERBOSE)$(OBJCOPY) --prefix-alloc-sections=.bootstrap --prefix-symbols=bootstrap_ -G bootstrap__boot_start $^ $@
+
+
 
 kernel.ia32.lds: linking.h