Changeset 1ea99cc in mainline for boot/arch

Timestamp:

2009-08-20T20:47:35Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b50b5af2

Parents:

24edc18

Message:

Merge changes from original Subversion dynload branch.

Location:

boot/arch

Files:

• ia32/Makefile.inc (modified) (3 diffs)
• mips32/loader/Makefile (modified) (2 diffs)
• ppc32/loader/Makefile (modified) (3 diffs)
• sparc64/loader/main.c (modified) (1 diff)

boot/arch/ia32/Makefile.inc

@@ -58 +58 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
+        $(USPACEDIR)/app/dltest2/dltest2 \
+        $(USPACEDIR)/app/dload/dload \
         $(USPACEDIR)/app/trace/trace \
         $(USPACEDIR)/app/klog/klog \
         $(USPACEDIR)/app/bdsh/bdsh
 
+RD_LIBS = \
+        $(USPACEDIR)/lib/libtest/libtest.so.0
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBC), y)
+        RD_LIBS += $(USPACEDIR)/lib/libc/shared/libc.so.0
+        RD_APPS += $(USPACEDIR)/app/dltest/dltest
+endif
+
 build: $(BASE)/image.iso
 
-$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
+$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS)
         mkdir -p $(TMP)/boot/grub
         cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
@@ -79 +89 @@
         for file in $(RD_SRVS) ; do \
                 cp $$file $(USPACEDIR)/dist/srv/ ; \
+        done
+        for lib in $(RD_LIBS) ; do \
+                cp $$lib $(USPACEDIR)/dist/lib/ ; \
         done
         for file in $(RD_APPS) ; do \
@@ -97 +110 @@
                 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
         done
+        -for lib in $(RD_LIBS) ; do \
+                rm -f $(USPACEDIR)/dist/lib/`basename $$lib` ; \
+        done
         -for file in $(RD_APPS) ; do \
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \

boot/arch/mips32/loader/Makefile

@@ -112 +112 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
+        $(USPACEDIR)/app/dload/dload \
+        $(USPACEDIR)/app/dltest/dltest \
+        $(USPACEDIR)/app/dltest2/dltest2 \
         $(USPACEDIR)/app/trace/trace \
         $(USPACEDIR)/app/bdsh/bdsh \
         $(USPACEDIR)/app/klog/klog
+
+RD_LIBS = \
+        $(USPACEDIR)/lib/libc/shared/libc.so.0 \
+        $(USPACEDIR)/lib/libtest/libtest.so.0
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -143 +150 @@
         -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.raw image.boot Makefile.depend
 
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS) _link.ld.in
         for file in $(RD_SRVS) ; do \
                 cp $$file $(USPACEDIR)/dist/srv/ ; \
+        done
+        for lib in $(RD_LIBS) ; do \
+                cp $$lib $(USPACEDIR)/dist/lib/ ; \
         done
         for file in $(RD_APPS) ; do \

boot/arch/ppc32/loader/Makefile

@@ -98 +98 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
+        $(USPACEDIR)/app/dload/dload \
+        $(USPACEDIR)/app/dltest/dltest \
+        $(USPACEDIR)/app/dltest2/dltest2 \
         $(USPACEDIR)/app/trace/trace \
         $(USPACEDIR)/app/klog/klog \
         $(USPACEDIR)/app/bdsh/bdsh
+
+RD_LIBS = \
+        $(USPACEDIR)/lib/libc/shared/libc.so.0 \
+        $(USPACEDIR)/lib/libtest/libtest.so.0
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -121 +128 @@
                 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
         done
+        -for lib in $(RD_LIBS) ; do \
+                rm -f $(USPACEDIR)/dist/lib/`basename $$lib` ; \
+        done
         -for file in $(RD_APPS) ; do \
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
@@ -126 +136 @@
         -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
 
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS) _link.ld.in
         for file in $(RD_SRVS) ; do \
                 cp $$file $(USPACEDIR)/dist/srv/ ; \
+        done
+        for lib in $(RD_LIBS) ; do \
+                cp $$lib $(USPACEDIR)/dist/lib/ ; \
         done
         for file in $(RD_APPS) ; do \

boot/arch/sparc64/loader/main.c

@@ -210 +210 @@
                 (void) ofw_map(bootinfo.physmem_start + base + top, base + top,
                     silo_ramdisk_size, -1);
-                memmove(base + top, (void *)((uintptr_t)silo_ramdisk_image),
+                /*
+                 * FIXME If the source and destination overlap, it may be
+                 * desirable to copy in reverse order, depending on how the two
+                 * regions overlap.
+                 */
+                memcpy(base + top, (void *)((uintptr_t)silo_ramdisk_image),
                     silo_ramdisk_size);
                 printf("done.\n");