diff options
5 files changed, 301 insertions, 1 deletions
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc index 381e2424b3..064fb698dc 100644 --- a/meta/conf/distro/include/poky-eabi.inc +++ b/meta/conf/distro/include/poky-eabi.inc @@ -10,7 +10,7 @@ PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" PREFERRED_VERSION_binutils ?= "2.17.50.0.5" PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.18+2.6.19-rc1" PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" PREFERRED_VERSION_glibc-initial ?= "2.5" diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-procinfo-hwcap.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-procinfo-hwcap.patch new file mode 100644 index 0000000000..3b20b4ac59 --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-procinfo-hwcap.patch @@ -0,0 +1,31 @@ +# Add HWCAP definitions in asm/procinfo.h + +Index: linux-2.6.19-rc1/usr/include/asm-arm/procinfo.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.19-rc1/usr/include/asm-arm/procinfo.h 2006-10-05 10:28:40.000000000 +0200 +@@ -0,0 +1,24 @@ ++/* ++ * linux/include/asm-arm/procinfo.h ++ * ++ * Copyright (C) 1996-1999 Russell King ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++#ifndef __ASM_PROCINFO_H ++#define __ASM_PROCINFO_H ++ ++#define HWCAP_SWP 1 ++#define HWCAP_HALF 2 ++#define HWCAP_THUMB 4 ++#define HWCAP_26BIT 8 /* Play it safe */ ++#define HWCAP_FAST_MULT 16 ++#define HWCAP_FPA 32 ++#define HWCAP_VFP 64 ++#define HWCAP_EDSP 128 ++#define HWCAP_JAVA 256 ++#define HWCAP_IWMMXT 512 ++ ++#endif diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-unistd-syscall.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-unistd-syscall.patch new file mode 100644 index 0000000000..f1fed650bb --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/arm-unistd-syscall.patch @@ -0,0 +1,190 @@ +# Add asm syscall definitions, needed for fstab/llseek.c in util-linux + +Index: linux-2.6.19-rc1/usr/include/asm-arm/unistd.h +=================================================================== +--- linux-2.6.19-rc1.orig/usr/include/asm-arm/unistd.h 2006-10-05 10:29:50.000000000 +0200 ++++ linux-2.6.19-rc1/usr/include/asm-arm/unistd.h 2006-10-05 10:31:43.000000000 +0200 +@@ -376,4 +376,183 @@ + #undef __NR_ipc + #endif + ++#include <linux/err.h> ++ ++#define __sys2(x) #x ++#define __sys1(x) __sys2(x) ++ ++#ifndef __syscall ++#if defined(__thumb__) || defined(__ARM_EABI__) ++#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name; ++#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs ++#define __syscall(name) "swi\t0" ++#else ++#define __SYS_REG(name) ++#define __SYS_REG_LIST(regs...) regs ++#define __syscall(name) "swi\t" __sys1(__NR_##name) "" ++#endif ++#endif ++ ++#define __syscall_return(type, res) \ ++do { \ ++ if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \ ++ errno = -(res); \ ++ res = -1; \ ++ } \ ++ return (type) (res); \ ++} while (0) ++ ++#define _syscall0(type,name) \ ++type name(void) { \ ++ __SYS_REG(name) \ ++ register long __res_r0 __asm__("r0"); \ ++ long __res; \ ++ __asm__ __volatile__ ( \ ++ __syscall(name) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST() \ ++ : "memory" ); \ ++ __res = __res_r0; \ ++ __syscall_return(type,__res); \ ++} ++ ++#define _syscall1(type,name,type1,arg1) \ ++type name(type1 arg1) { \ ++ __SYS_REG(name) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __res_r0 __asm__("r0"); \ ++ long __res; \ ++ __asm__ __volatile__ ( \ ++ __syscall(name) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0) ) \ ++ : "memory" ); \ ++ __res = __res_r0; \ ++ __syscall_return(type,__res); \ ++} ++ ++#define _syscall2(type,name,type1,arg1,type2,arg2) \ ++type name(type1 arg1,type2 arg2) { \ ++ __SYS_REG(name) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __r1 __asm__("r1") = (long)arg2; \ ++ register long __res_r0 __asm__("r0"); \ ++ long __res; \ ++ __asm__ __volatile__ ( \ ++ __syscall(name) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) \ ++ : "memory" ); \ ++ __res = __res_r0; \ ++ __syscall_return(type,__res); \ ++} ++ ++ ++#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ ++type name(type1 arg1,type2 arg2,type3 arg3) { \ ++ __SYS_REG(name) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __r1 __asm__("r1") = (long)arg2; \ ++ register long __r2 __asm__("r2") = (long)arg3; \ ++ register long __res_r0 __asm__("r0"); \ ++ long __res; \ ++ __asm__ __volatile__ ( \ ++ __syscall(name) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) \ ++ : "memory" ); \ ++ __res = __res_r0; \ ++ __syscall_return(type,__res); \ ++} ++ ++ ++#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\ ++type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ ++ __SYS_REG(name) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __r1 __asm__("r1") = (long)arg2; \ ++ register long __r2 __asm__("r2") = (long)arg3; \ ++ register long __r3 __asm__("r3") = (long)arg4; \ ++ register long __res_r0 __asm__("r0"); \ ++ long __res; \ ++ __asm__ __volatile__ ( \ ++ __syscall(name) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) \ ++ : "memory" ); \ ++ __res = __res_r0; \ ++ __syscall_return(type,__res); \ ++} ++ ++ ++#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ ++type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \ ++ __SYS_REG(name) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __r1 __asm__("r1") = (long)arg2; \ ++ register long __r2 __asm__("r2") = (long)arg3; \ ++ register long __r3 __asm__("r3") = (long)arg4; \ ++ register long __r4 __asm__("r4") = (long)arg5; \ ++ register long __res_r0 __asm__("r0"); \ ++ long __res; \ ++ __asm__ __volatile__ ( \ ++ __syscall(name) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \ ++ "r" (__r3), "r" (__r4) ) \ ++ : "memory" ); \ ++ __res = __res_r0; \ ++ __syscall_return(type,__res); \ ++} ++ ++#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \ ++type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) { \ ++ __SYS_REG(name) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __r1 __asm__("r1") = (long)arg2; \ ++ register long __r2 __asm__("r2") = (long)arg3; \ ++ register long __r3 __asm__("r3") = (long)arg4; \ ++ register long __r4 __asm__("r4") = (long)arg5; \ ++ register long __r5 __asm__("r5") = (long)arg6; \ ++ register long __res_r0 __asm__("r0"); \ ++ long __res; \ ++ __asm__ __volatile__ ( \ ++ __syscall(name) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \ ++ "r" (__r3), "r" (__r4), "r" (__r5) ) \ ++ : "memory" ); \ ++ __res = __res_r0; \ ++ __syscall_return(type,__res); \ ++} ++ ++#define __ARCH_WANT_IPC_PARSE_VERSION ++#define __ARCH_WANT_STAT64 ++#define __ARCH_WANT_SYS_GETHOSTNAME ++#define __ARCH_WANT_SYS_PAUSE ++#define __ARCH_WANT_SYS_GETPGRP ++#define __ARCH_WANT_SYS_LLSEEK ++#define __ARCH_WANT_SYS_NICE ++#define __ARCH_WANT_SYS_SIGPENDING ++#define __ARCH_WANT_SYS_SIGPROCMASK ++#define __ARCH_WANT_SYS_RT_SIGACTION ++ ++#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT) ++#define __ARCH_WANT_SYS_TIME ++#define __ARCH_WANT_SYS_OLDUMOUNT ++#define __ARCH_WANT_SYS_ALARM ++#define __ARCH_WANT_SYS_UTIME ++#define __ARCH_WANT_SYS_OLD_GETRLIMIT ++#define __ARCH_WANT_OLD_READDIR ++#define __ARCH_WANT_SYS_SOCKETCALL ++#endif ++ ++/* ++ * "Conditional" syscalls ++ * ++ * What we want is __attribute__((weak,alias("sys_ni_syscall"))), ++ * but it doesn't work on all toolchains, so we just do it by hand ++ */ ++#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") ++ + #endif /* __ASM_ARM_UNISTD_H */ diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/linux-err.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/linux-err.patch new file mode 100644 index 0000000000..39a8e8a2f5 --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.18+2.6.19-rc1/linux-err.patch @@ -0,0 +1,23 @@ +# Add linux/err.h for MAX_ERRNO definition, needed by util-linux mount + +Index: linux-2.6.19-rc1/usr/include/linux/err.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.19-rc1/usr/include/linux/err.h 2006-10-05 10:55:17.000000000 +0200 +@@ -0,0 +1,16 @@ ++#ifndef _LINUX_ERR_H ++#define _LINUX_ERR_H ++ ++#include <asm/errno.h> ++ ++/* ++ * Kernel pointers have redundant information, so we can use a ++ * scheme where we can return either an error code or a dentry ++ * pointer with the same return value. ++ * ++ * This should be a per-architecture thing, to allow different ++ * error and pointer decisions. ++ */ ++#define MAX_ERRNO 4095 ++ ++#endif /* _LINUX_ERR_H */ diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb new file mode 100644 index 0000000000..c4125ee75a --- /dev/null +++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb @@ -0,0 +1,56 @@ +require linux-libc-headers.inc + +DEFAULT_PREFERENCE = "-1" +INHIBIT_DEFAULT_DEPS = "1" + +SRC_URI = " \ + ${KERNELORG_MIRROR}/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \ + file://arm-procinfo-hwcap.patch;patch=1 \ + file://arm-unistd-syscall.patch;patch=1 \ + file://linux-err.patch;patch=1 \ +" + +S = "${WORKDIR}/linux-2.6.19-rc1" + +set_arch() { + case ${TARGET_ARCH} in + alpha*) ARCH=alpha ;; + arm*) ARCH=arm ;; + cris*) ARCH=cris ;; + hppa*) ARCH=parisc ;; + i*86*) ARCH=i386 ;; + ia64*) ARCH=ia64 ;; + mips*) ARCH=mips ;; + m68k*) ARCH=m68k ;; + powerpc*) ARCH=powerpc ;; + s390*) ARCH=s390 ;; + sh*) ARCH=sh ;; + sparc64*) ARCH=sparc64 ;; + sparc*) ARCH=sparc ;; + x86_64*) ARCH=x86_64 ;; + esac +} + +do_install() { + set_arch + install -d ${D}${includedir} + cp -pfLR ${S}${includedir}/linux ${D}${includedir}/ + cp -pfLR ${S}${includedir}/asm-${ARCH} ${D}${includedir}/asm + cp -pfLR ${S}${includedir}/asm-generic ${D}${includedir}/ +} + +do_stage () { + set_arch + install -d ${STAGING_INCDIR} + rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic + cp -pfLR ${S}${includedir}/linux ${STAGING_INCDIR}/ + cp -pfLR ${S}${includedir}/asm-${ARCH} ${STAGING_INCDIR}/asm + cp -pfLR ${S}${includedir}/asm-generic ${STAGING_INCDIR}/ + rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux + rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm + rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic + install -d ${CROSS_DIR}/${TARGET_SYS}/include + cp -pfLR ${S}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/ + cp -pfLR ${S}${includedir}/asm-${ARCH} ${CROSS_DIR}/${TARGET_SYS}/include/asm + cp -pfLR ${S}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/ +} |