Changeset 888207c9 in mainline for boot

Timestamp:

2011-09-07T22:19:24Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2aeec8ef

Parents:

038b289 (diff), 5081276 (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 from lp:~helenos-posix/helenos/devel.

• Petr Koupy's port of binutils.
• Jiri Zarevucky's port of pcc.
• Petr and Jiri's libposix library.
• Changes needed to make it all work together.

Location:

boot

Files:

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

boot/Makefile

@@ -61 +61 @@
                 cp "$$file" "$(DIST_PATH)/lib/" ; \
         done
+ifeq ($(CONFIG_DEVEL_FILES), y)
+        mkdir "$(DIST_PATH)/inc/c/"
+        cp -r -L "$(USPACE_PATH)/lib/c/include/." "$(DIST_PATH)/inc/c/"
+        cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
+endif
         for file in $(RD_APPS) ; do \
                 cp "$$file" "$(DIST_PATH)/app/" ; \
@@ -94 +99 @@
         rm -rf $(USPACE_PATH)/dist/drv/*
         rm -f $(USPACE_PATH)/dist/lib/*
+        rm -rf $(USPACE_PATH)/dist/inc/*
         rm -f $(USPACE_PATH)/dist/app/*
         rm -f $(USPACE_PATH)/dist/cfg/net/*

boot/Makefile.common

@@ -129 +129 @@
 
 RD_LIBS =
+
+ifeq ($(CONFIG_DEVEL_FILES), y)
+        RD_LIBS += \
+                $(USPACE_PATH)/lib/c/libc.a \
+                $(USPACE_PATH)/lib/softint/libsoftint.a \
+                $(USPACE_PATH)/lib/softfloat/libsoftfloat.a
+endif
 
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
@@ -177 +184 @@
         $(USPACE_PATH)/app/websrv/websrv
 
+ifeq ($(CONFIG_PCC),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/cc/cc \
+        $(USPACE_PATH)/app/ccom/ccom \
+        $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
+        $(USPACE_PATH)/app/cpp/cpp
+endif
+
+ifeq ($(CONFIG_BINUTILS),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/binutils/bin/as \
+        $(USPACE_PATH)/app/binutils/bin/ld
+endif
+
 ifneq ($(CONFIG_BAREBONE),y)
 NET_CFG = \