3 files changed, 13 insertions, 10 deletions

diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 0f79aaaadd..7b6fd1a084 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -1,13 +1,10 @@
 PROVIDES = "\
     linux-libc-headers \
-    virtual/arm-poky-linux-gnueabi-gcc \
-    virtual/arm-poky-linux-gnueabi-gcc-initial \
-    virtual/arm-poky-linux-binutils \
-    virtual/arm-poky-linux-libc-for-gcc \
-    virtual/i586-poky-linux-gcc \
-    virtual/i586-poky-linux-gcc-initial \
-    virtual/i586-poky-linux-binutils \
-    virtual/i586-poky-linux-libc-for-gcc \
+    virtual/${TARGET_PREFIX}gcc \
+    virtual/${TARGET_PREFIX}gcc-intermediate \
+    virtual/${TARGET_PREFIX}gcc-initial \
+    virtual/${TARGET_PREFIX}binutils \
+    virtual/${TARGET_PREFIX}libc-for-gcc \
     virtual/libc \
     virtual/libintl \
     virtual/libiconv \
diff --git a/meta/packages/uclibc/uclibc-initial_0.9.29.bb b/meta/packages/uclibc/uclibc-initial_0.9.29.bb
index 572693dd6b..ee0631d453 100644
--- a/meta/packages/uclibc/uclibc-initial_0.9.29.bb
+++ b/meta/packages/uclibc/uclibc-initial_0.9.29.bb
@@ -3,7 +3,7 @@ require uclibc_${PV}.bb
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-DEPENDS = "linux-libc-headers ncurses-native"
+DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
 
@@ -12,11 +12,17 @@ do_stage() {
         make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                 RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                 pregen install_dev
+        make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+                RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+                lib/crt1.o lib/crti.o lib/crtn.o
 
         ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
         # This conflicts with the c++ version of this header
         rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+        install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
+        ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+                -o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
 }
 
 do_install() {
diff --git a/meta/packages/uclibc/uclibc.inc b/meta/packages/uclibc/uclibc.inc
index a620ace10a..68dcd14ef8 100644
--- a/meta/packages/uclibc/uclibc.inc
+++ b/meta/packages/uclibc/uclibc.inc
@@ -22,7 +22,7 @@ python __anonymous () {
 PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']}"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils \
-           virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
+           virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers ncurses-native pax-utils-native"
 
 # Blackfin needs a wrapper around ld
 DEPENDS_append_bfin = " elf2flt "