Merge openembedded@openembedded.bkbits.net:packages

into direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/packages

2004/02/20 17:34:57-06:00 ti.com!kergoth
Glibc toolchain build updates:
	Gcc 3.3.3.
	Kernel-headers 2.4.25 instead of 2.4.21.
	Install them into include rather than sys-include.
	Tweaking some configure options all around based on comments in crosstool.

BKrev: 403699b93isV6v6AhTg1skp2YYom8Q

diff --git a/binutils/binutils-cross_2.14.90.0.6.oe b/binutils/binutils-cross_2.14.90.0.6.oe
index c898d70..dd1aa76 100644 (file)
--- a/binutils/binutils-cross_2.14.90.0.6.oe
+++ b/binutils/binutils-cross_2.14.90.0.6.oe
@@ -4,6 +4,9 @@ PROVIDES = virtual/${TARGET_PREFIX}binutils
 DEPENDS = patcher
 FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}
 PACKAGES =
+EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+               --disable-nls \
+               --program-prefix=${TARGET_PREFIX}'
 
 do_stage () {
        oe_runmake install

diff --git a/binutils/binutils-cross_2.14.90.0.7.oe b/binutils/binutils-cross_2.14.90.0.7.oe
index e69de29..dd1aa76 100644 (file)
--- a/binutils/binutils-cross_2.14.90.0.7.oe
+++ b/binutils/binutils-cross_2.14.90.0.7.oe
@@ -0,0 +1,33 @@
+include binutils_${PV}.oe
+inherit cross
+PROVIDES = virtual/${TARGET_PREFIX}binutils
+DEPENDS = patcher
+FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}
+PACKAGES =
+EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+               --disable-nls \
+               --program-prefix=${TARGET_PREFIX}'
+
+do_stage () {
+       oe_runmake install
+
+       # We don't really need these, so we'll remove them...
+       rm -rf ${CROSS_DIR}/lib/ldscripts
+       rm -rf ${CROSS_DIR}/share/info
+       rm -rf ${CROSS_DIR}/share/locale
+       rm -rf ${CROSS_DIR}/share/man
+       rmdir ${CROSS_DIR}/share || :
+       rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
+       rmdir ${CROSS_DIR}/${libdir} || :
+       rmdir ${CROSS_DIR}/${prefix} || :
+
+       # We want to move this into the target specific location
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+       mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
+       rmdir ${CROSS_DIR}/lib || :
+}
+
+do_install () {
+       :
+}
+

diff --git a/binutils/binutils-cross_2.14.90.0.8.oe b/binutils/binutils-cross_2.14.90.0.8.oe
index e69de29..dd1aa76 100644 (file)
--- a/binutils/binutils-cross_2.14.90.0.8.oe
+++ b/binutils/binutils-cross_2.14.90.0.8.oe
@@ -0,0 +1,33 @@
+include binutils_${PV}.oe
+inherit cross
+PROVIDES = virtual/${TARGET_PREFIX}binutils
+DEPENDS = patcher
+FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}
+PACKAGES =
+EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+               --disable-nls \
+               --program-prefix=${TARGET_PREFIX}'
+
+do_stage () {
+       oe_runmake install
+
+       # We don't really need these, so we'll remove them...
+       rm -rf ${CROSS_DIR}/lib/ldscripts
+       rm -rf ${CROSS_DIR}/share/info
+       rm -rf ${CROSS_DIR}/share/locale
+       rm -rf ${CROSS_DIR}/share/man
+       rmdir ${CROSS_DIR}/share || :
+       rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
+       rmdir ${CROSS_DIR}/${libdir} || :
+       rmdir ${CROSS_DIR}/${prefix} || :
+
+       # We want to move this into the target specific location
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+       mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
+       rmdir ${CROSS_DIR}/lib || :
+}
+
+do_install () {
+       :
+}
+

diff --git a/binutils/binutils-uclibc-cross_2.14.90.0.6.oe b/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
index 7f7b696..2c4f2b2 100644 (file)
--- a/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
+++ b/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
@@ -4,6 +4,9 @@ PROVIDES = virtual/${TARGET_PREFIX}binutils
 DEPENDS = patcher
 FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}
 PACKAGES =
+EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+               --disable-nls \
+               --program-prefix=${TARGET_PREFIX}'
 
 do_stage () {
        oe_runmake install

diff --git a/binutils/binutils-uclibc-cross_2.14.90.0.7.oe b/binutils/binutils-uclibc-cross_2.14.90.0.7.oe
index e69de29..2c4f2b2 100644 (file)
--- a/binutils/binutils-uclibc-cross_2.14.90.0.7.oe
+++ b/binutils/binutils-uclibc-cross_2.14.90.0.7.oe
@@ -0,0 +1,33 @@
+include binutils-uclibc_${PV}.oe
+inherit cross
+PROVIDES = virtual/${TARGET_PREFIX}binutils
+DEPENDS = patcher
+FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}
+PACKAGES =
+EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+               --disable-nls \
+               --program-prefix=${TARGET_PREFIX}'
+
+do_stage () {
+       oe_runmake install
+
+       # We don't really need these, so we'll remove them...
+       rm -rf ${CROSS_DIR}/lib/ldscripts
+       rm -rf ${CROSS_DIR}/share/info
+       rm -rf ${CROSS_DIR}/share/locale
+       rm -rf ${CROSS_DIR}/share/man
+       rmdir ${CROSS_DIR}/share || :
+       rmdir ${CROSS_DIR}${libdir}/gcc-lib || :
+       rmdir ${CROSS_DIR}${libdir} || :
+       rmdir ${CROSS_DIR}${prefix} || :
+
+       # We want to move this into the target specific location
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+       mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
+       rmdir ${CROSS_DIR}/lib || :
+}
+
+do_install () {
+       :
+}
+

diff --git a/binutils/binutils-uclibc-cross_2.14.90.0.8.oe b/binutils/binutils-uclibc-cross_2.14.90.0.8.oe
index e69de29..2c4f2b2 100644 (file)
--- a/binutils/binutils-uclibc-cross_2.14.90.0.8.oe
+++ b/binutils/binutils-uclibc-cross_2.14.90.0.8.oe
@@ -0,0 +1,33 @@
+include binutils-uclibc_${PV}.oe
+inherit cross
+PROVIDES = virtual/${TARGET_PREFIX}binutils
+DEPENDS = patcher
+FILESDIR = ${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-${PV}
+PACKAGES =
+EXTRA_OECONF = '--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+               --disable-nls \
+               --program-prefix=${TARGET_PREFIX}'
+
+do_stage () {
+       oe_runmake install
+
+       # We don't really need these, so we'll remove them...
+       rm -rf ${CROSS_DIR}/lib/ldscripts
+       rm -rf ${CROSS_DIR}/share/info
+       rm -rf ${CROSS_DIR}/share/locale
+       rm -rf ${CROSS_DIR}/share/man
+       rmdir ${CROSS_DIR}/share || :
+       rmdir ${CROSS_DIR}${libdir}/gcc-lib || :
+       rmdir ${CROSS_DIR}${libdir} || :
+       rmdir ${CROSS_DIR}${prefix} || :
+
+       # We want to move this into the target specific location
+       mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+       mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
+       rmdir ${CROSS_DIR}/lib || :
+}
+
+do_install () {
+       :
+}
+

diff --git a/binutils/binutils_2.14.90.0.6.oe b/binutils/binutils_2.14.90.0.6.oe
index 94657cb..8aa5489 100644 (file)
--- a/binutils/binutils_2.14.90.0.6.oe
+++ b/binutils/binutils_2.14.90.0.6.oe
@@ -46,7 +46,7 @@ SRC_URI := http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2
 S := ${WORKDIR}/binutils-${PV}
 B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
 
-EXTRA_OECONF = '--disable-nls --program-prefix=${TARGET_PREFIX}'
+EXTRA_OECONF = '--with-sysroot=${prefix}'
 
 # This is necessary due to a bug in the binutils Makefiles
 EXTRA_OEMAKE = configure-build-libiberty all

diff --git a/binutils/binutils_2.14.90.0.7.oe b/binutils/binutils_2.14.90.0.7.oe
index 94657cb..8aa5489 100644 (file)
--- a/binutils/binutils_2.14.90.0.7.oe
+++ b/binutils/binutils_2.14.90.0.7.oe
@@ -46,7 +46,7 @@ SRC_URI := http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2
 S := ${WORKDIR}/binutils-${PV}
 B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
 
-EXTRA_OECONF = '--disable-nls --program-prefix=${TARGET_PREFIX}'
+EXTRA_OECONF = '--with-sysroot=${prefix}'
 
 # This is necessary due to a bug in the binutils Makefiles
 EXTRA_OEMAKE = configure-build-libiberty all

diff --git a/binutils/binutils_2.14.90.0.8.oe b/binutils/binutils_2.14.90.0.8.oe
index bc564d8..cf2a0ca 100644 (file)
--- a/binutils/binutils_2.14.90.0.8.oe
+++ b/binutils/binutils_2.14.90.0.8.oe
@@ -45,7 +45,7 @@ SRC_URI := http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2
 S := ${WORKDIR}/binutils-${PV}
 B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
 
-EXTRA_OECONF = '--disable-nls --program-prefix=${TARGET_PREFIX}'
+EXTRA_OECONF = '--with-sysroot=${prefix}'
 
 # This is necessary due to a bug in the binutils Makefiles
 EXTRA_OEMAKE = configure-build-libiberty all

diff --git a/gcc/gcc-3.3.3/config.sub.patch b/gcc/gcc-3.3.3/config.sub.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/empty6.patch b/gcc/gcc-3.3.3/empty6.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr10392-1-test.patch b/gcc/gcc-3.3.3/pr10392-1-test.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr10412-1-test.patch b/gcc/gcc-3.3.3/pr10412-1-test.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr10589-1-test.patch b/gcc/gcc-3.3.3/pr10589-1-test.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr11162-1-test.patch b/gcc/gcc-3.3.3/pr11162-1-test.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr11587-1-test.patch b/gcc/gcc-3.3.3/pr11587-1-test.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr11608.patch b/gcc/gcc-3.3.3/pr11608.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr11736-1-test.patch b/gcc/gcc-3.3.3/pr11736-1-test.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr11864-1-test.patch b/gcc/gcc-3.3.3/pr11864-1-test.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr12009.patch b/gcc/gcc-3.3.3/pr12009.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr12010.patch b/gcc/gcc-3.3.3/pr12010.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr13260-test.patch b/gcc/gcc-3.3.3/pr13260-test.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/pr9365-1-test.patch b/gcc/gcc-3.3.3/pr9365-1-test.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/sh-lib1funcs_sizeAndType.patch b/gcc/gcc-3.3.3/sh-lib1funcs_sizeAndType.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/sh-pic-set_fpscr-gcc-3.3.2.patch b/gcc/gcc-3.3.3/sh-pic-set_fpscr-gcc-3.3.2.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-3.3.3/thunk3.patch b/gcc/gcc-3.3.3/thunk3.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-cross_3.3.2.oe b/gcc/gcc-cross_3.3.2.oe
index d372fb9..fd18817 100644 (file)
--- a/gcc/gcc-cross_3.3.2.oe
+++ b/gcc/gcc-cross_3.3.2.oe
@@ -7,14 +7,18 @@ PROVIDES := virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++
 
 PACKAGES =
 
-EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
-                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-                --enable-target-optspace \
-                --with-gnu-ld \
-                --enable-languages=c,c++ \
-                --enable-shared \
-                --enable-multilib \
-                --program-prefix=${TARGET_SYS}-
+EXTRA_OECONF = '--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+               --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
+               --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
+               --disable-nls \
+               --enable-threads=posix \
+               --enable-symvers=gnu \
+               --enable-__cxa_atexit \
+               --enable-languages=c,c++ \
+               --enable-shared \
+               --enable-c99 \
+               --enable-long-long \
+               --program-prefix=${TARGET_PREFIX}'
 
 export CPPFLAGS =
 export CXXFLAGS =
@@ -27,7 +31,7 @@ do_configure () {
        export RANLIB="${TARGET_SYS}-ranlib"
        export LD="${TARGET_SYS}-ld"
        export NM="${TARGET_SYS}-nm"
-       rm -f ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/3.3.2/libgcc_eh.a
+       rm -f ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
        oe_runconf
 }
 

diff --git a/gcc/gcc-cross_3.3.3.oe b/gcc/gcc-cross_3.3.3.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-initial-cross_3.3.2.oe b/gcc/gcc-initial-cross_3.3.2.oe
index 1d1d7ff..ad5dd8d 100644 (file)
--- a/gcc/gcc-initial-cross_3.3.2.oe
+++ b/gcc/gcc-initial-cross_3.3.2.oe
@@ -3,18 +3,19 @@ include gcc-cross_${PV}.oe
 DEPENDS := virtual/${TARGET_PREFIX}binutils glibc-initial patcher-native
 PROVIDES := virtual/${TARGET_PREFIX}gcc-initial
 
-EXTRA_OECONF := --with-local-prefix=${CROSS_DIR}/local \
-                --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-                --enable-target-optspace \
-                --disable-nls \
-                --with-gnu-ld \
-                --enable-languages=c \
-                --disable-shared \
-               --disable-threads \
-                --enable-multilib \
-                --program-prefix=${TARGET_SYS}-
+EXTRA_OECONF = '--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+               --disable-multilib \
+               --with-newlib \
+               --without-headers \
+               --disable-nls \
+               --enable-threads=no \
+               --enable-symvers=gnu \
+               --enable-__cxa_atexit \
+               --enable-languages=c \
+               --disable-shared \
+               --program-prefix=${TARGET_SYS}-'
 
 do_stage_prepend () {
-       mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/3.3.2
-       ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/3.3.2/libgcc_eh.a
+       mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}
+       ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
 }

diff --git a/gcc/gcc-initial-cross_3.3.3.oe b/gcc/gcc-initial-cross_3.3.3.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-initial-uclibc-cross_3.3.3.oe b/gcc/gcc-initial-uclibc-cross_3.3.3.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-uclibc-cross_3.3.3.oe b/gcc/gcc-uclibc-cross_3.3.3.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc-uclibc_3.3.3.oe b/gcc/gcc-uclibc_3.3.3.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gcc/gcc_3.3.2.oe b/gcc/gcc_3.3.2.oe
index 946a673..4c499e7 100644 (file)
--- a/gcc/gcc_3.3.2.oe
+++ b/gcc/gcc_3.3.2.oe
@@ -63,7 +63,11 @@ FILES_${PN}-doc = \
        ${mandir} \
        ${libdir}/gcc-lib/${TARGET_SYS}/${PV}/include/README
 
-SRC_URI := http://gcc.get-software.com/releases/gcc-${PV}/gcc-${PV}.tar.bz2
+SRC_URI := http://gcc.get-software.com/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \
+          file://${FILESDIR}/pr8896.patch;patch=1 \
+          file://${FILESDIR}/gcc-001-disable-mathf.patch;patch=1 \
+          file://${FILESDIR}/gcc-006-include-search.patch;patch=1 \
+          file://${FILESDIR}/gcc-810-libstd++-locale.patch;patch=1
 
 S := ${WORKDIR}/gcc-${PV}
 B := ${S}/build.${HOST_SYS}.${TARGET_SYS}

diff --git a/gcc/gcc_3.3.3.oe b/gcc/gcc_3.3.3.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glibc/glibc-initial_2.3.2.oe b/glibc/glibc-initial_2.3.2.oe
index 24283e8..b5ecfec 100644 (file)
--- a/glibc/glibc-initial_2.3.2.oe
+++ b/glibc/glibc-initial_2.3.2.oe
@@ -37,10 +37,6 @@ do_stage () {
        mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
        touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
        cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}/sys-include
-       cp -a '${WORKDIR}/linux/include/linux' '${CROSS_DIR}/${TARGET_SYS}/sys-include/'
-       cp -R -L '${WORKDIR}/linux/include/asm' '${CROSS_DIR}/${TARGET_SYS}/sys-include/'
 }
 
 do_install () {

diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index 6ca89fc..69ca243 100644 (file)
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -17,12 +17,12 @@ FILES_glibc-i18n='${datadir}/i18n'
 #        file://${FILESDIR}/alpha-crti.patch;patch=1;pnum=1
 #        file://${FILESDIR}/glibc-make-check-perms.patch;patch=1;pnum=0
 # This patch is needed for builds against recent 2.5/2.6 kernel headers:
-#        file://${FILESDIR}/arm-ioperm.patch;patch=1;pnum=0
 SRC_URI = ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.2.tar.gz \
          ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.gz \
-         http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.21.tar.bz2 \
+         http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.25.tar.bz2 \
          file://${FILESDIR}/noinfo.patch;patch=1 \
          file://${FILESDIR}/10_cvs.patch;patch=1 \
+         file://${FILESDIR}/arm-ioperm.patch;patch=1;pnum=0 \
          file://${FILESDIR}/glibc-i686-timing.patch;patch=1;pnum=1 \
          file://${FILESDIR}/makeconfig.patch;patch=1;pnum=0 \
          file://${FILESDIR}/locale-es_AR.patch;patch=1;pnum=0 \
@@ -87,9 +87,6 @@ glibcbuild_do_unpack () {
        mv "${WORKDIR}/linuxthreads" "${WORKDIR}/linuxthreads_db" "${S}/"
 # kernel headers
        cp -a "${FILESDIR}/version.h" "${FILESDIR}/autoconf.h" "${WORKDIR}/linux/include/linux/"
-       if [ -e "${FILESDIR}/asm-${TARGET_ARCH}-unistd.h" ]; then 
-               cp -a "${FILESDIR}/asm-${TARGET_ARCH}-unistd.h" "${WORKDIR}/linux/include/asm-${TARGET_ARCH}/unistd.h"
-       fi
        case $TARGET_ARCH in
                alpha*)   TARGET_ARCH=alpha ;;
                arm*)     TARGET_ARCH=arm ;;
@@ -110,6 +107,10 @@ glibcbuild_do_unpack () {
                oefatal unable to create asm symlink in kernel headers
        fi
        ln -sf "asm-$TARGET_ARCH" "${WORKDIR}/linux/include/asm"
+       if test "$TARGET_ARCH" = "arm"; then
+               ln -sf proc-armv ${WORKDIR}/linux/include/asm/proc
+               ln -sf arch-ebsa285 ${WORKDIR}/linux/include/asm/arch
+       fi
 }
 
 python do_unpack () {
@@ -172,9 +173,9 @@ do_stage() {
                   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
                   install-headers install-lib
 
-       install -d ${CROSS_DIR}/${TARGET_SYS}/sys-include
-       cp -a '${WORKDIR}/linux/include/linux' '${CROSS_DIR}/${TARGET_SYS}/sys-include/'
-       cp -R -L '${WORKDIR}/linux/include/asm' '${CROSS_DIR}/${TARGET_SYS}/sys-include/'
+       install -d ${CROSS_DIR}/${TARGET_SYS}/include
+       cp -a '${WORKDIR}/linux/include/linux' '${CROSS_DIR}/${TARGET_SYS}/include/'
+       cp -R -L '${WORKDIR}/linux/include/asm' '${CROSS_DIR}/${TARGET_SYS}/include/'
 
        install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
                   ${CROSS_DIR}/${TARGET_SYS}/include/bits \