Changeset e175d69 in mainline for boot

Timestamp:

2011-05-01T13:08:18Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

042fbe0

Parents:

a41577e (diff), e515a827 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge dynamic linking support (ia32-only, off by default). Very limited TLS
support. Executables which use TLS should set STATIC_ONLY = y in Makefile.

Location:

boot

Files:

• Makefile (modified) (2 diffs)
• Makefile.common (modified) (2 diffs)

boot/Makefile

@@ -55 +55 @@
                 cp "$$file" "$(DIST_PATH)/srv/" ; \
         done
+        for file in $(RD_LIBS) ; do \
+                cp "$$file" "$(DIST_PATH)/lib/" ; \
+        done
         for file in $(RD_APPS) ; do \
                 cp "$$file" "$(DIST_PATH)/app/" ; \
@@ -83 +86 @@
         rm -f $(USPACE_PATH)/dist/srv/*
         rm -rf $(USPACE_PATH)/dist/drv/*
+        rm -f $(USPACE_PATH)/dist/lib/*
         rm -f $(USPACE_PATH)/dist/app/*
         rm -f $(USPACE_PATH)/dist/cfg/net/*

boot/Makefile.common

@@ -118 +118 @@
 RD_DRV_CFG = 
 
+RD_LIBS =
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
+        RD_LIBS += \
+                $(USPACE_PATH)/lib/test/libtest.so.0 \
+                $(USPACE_PATH)/lib/c/libc.so.0 \
+                $(USPACE_PATH)/lib/softint/libsoftint.so.0
+        RD_APPS += \
+                $(USPACE_PATH)/app/dltest/dltest
+endif
+
 RD_APPS_ESSENTIAL = \
         $(USPACE_PATH)/app/bdsh/bdsh \
@@ -124 +135 @@
 
 RD_APPS_NON_ESSENTIAL = \
+        $(USPACE_PATH)/app/dltest/dltest \
+        $(USPACE_PATH)/app/dltest2/dltest2 \
+        $(USPACE_PATH)/app/dload/dload \
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/kill/kill \