Changeset 3375bd4 in mainline for boot/Makefile.common

Timestamp:

2011-05-17T07:44:17Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04c418d, 2586860, 5e6e50b

Parents:

72cd53d (diff), 0d8a304 (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 mainline changes

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

File:

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

boot/Makefile.common

@@ -118 +118 @@
 RD_DRV_CFG = 
 
+RD_LIBS =
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
+        RD_LIBS += \
+                $(USPACE_PATH)/lib/c/libc.so0 \
+                $(USPACE_PATH)/lib/softint/libsofti.so0
+        RD_APPS += \
+                $(USPACE_PATH)/app/dltest/dltest
+endif
+
 RD_APPS_ESSENTIAL = \
         $(USPACE_PATH)/app/bdsh/bdsh \
@@ -124 +134 @@
 
 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 \