From ac1750959be6bcf7b8516bbc8c480c049f038c49 Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Tue, 4 Jan 2005 17:55:09 +0000 Subject: [PATCH] Fixing glibc issues; bug #76626. --- sys-kernel/linux26-headers/ChangeLog | 6 +- sys-kernel/linux26-headers/Manifest | 4 +- .../linux26-headers-2.6.8.1-appCompat.patch | 76 +++++++++++++++++++ 3 files changed, 83 insertions(+), 3 deletions(-) diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog index e55cb4deb336..3894d76848d5 100644 --- a/sys-kernel/linux26-headers/ChangeLog +++ b/sys-kernel/linux26-headers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/linux26-headers # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.44 2005/01/04 12:23:36 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.45 2005/01/04 17:55:09 plasmaroo Exp $ + + 04 Jan 2005; + files/linux26-headers-2.6.8.1-appCompat.patch: + Fixing glibc issues; bug #76626. 04 Jan 2005; files/linux26-headers-2.6.8.1-appCompat.patch: diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest index 1bed8d999d34..e0719e8f6e96 100644 --- a/sys-kernel/linux26-headers/Manifest +++ b/sys-kernel/linux26-headers/Manifest @@ -1,4 +1,4 @@ -MD5 080beaa5f744645e0efdfb950c74e3ed ChangeLog 10011 +MD5 426b891816ad0c5e7485306796b22bd8 ChangeLog 10134 MD5 b3d1c41a74dbe1041b4082288cacd3ca linux26-headers-2.6.7-r4.ebuild 4031 MD5 21dcb669b4e8535f0a04f40ad2c4c9ff metadata.xml 224 MD5 91179c84e3dc8dadcfdad16cabede343 linux26-headers-2.6.5.ebuild 4188 @@ -21,7 +21,7 @@ MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386 MD5 9101139b0720280f338a1823c281ee84 files/linux26-headers-2.6.8.1-parisc-syscall.patch 413 MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689 MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240 -MD5 0c659cc32bef2c87df38a69d2da06e23 files/linux26-headers-2.6.8.1-appCompat.patch 56196 +MD5 aaeefcdf049bbb51aa8da8892ff086a9 files/linux26-headers-2.6.8.1-appCompat.patch 58456 MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r4 66 MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288 MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66 diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch index 67fb62fa33ff..62d102a34463 100644 --- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch +++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch @@ -1802,3 +1802,79 @@ diff -ur linux-2.6.8.1/include/asm-alpha/signal.h linux-2.6.8.1-gentoo/include/a #ifdef __KERNEL__ #include +diff -ur linux-2.6.8.1/include/asm-alpha/bitops.h linux-2.6.8.1-gentoo/include/asm-alpha/bitops.h +--- linux-2.6.8.1/include/asm-alpha/bitops.h 2004-08-14 11:55:32.000000000 +0100 ++++ linux-2.6.8.1-gentoo/include/asm-alpha/bitops.h 2005-01-04 17:37:15.000000000 +0000 +@@ -280,6 +280,7 @@ + /* + * __ffs = Find First set bit in word. Undefined if no set bit exists. + */ ++#ifndef __ffs + static inline unsigned long __ffs(unsigned long word) + { + #if defined(__alpha_cix__) && defined(__alpha_fix__) +@@ -296,6 +297,7 @@ + return qofs*8 + bofs; + #endif + } ++#endif /* __ffs */ + + #ifdef __KERNEL__ + +diff -ur linux-2.6.8.1/include/asm-i386/bitops.h linux-2.6.8.1-gentoo/include/asm-i386/bitops.h +--- linux-2.6.8.1/include/asm-i386/bitops.h 2004-08-14 11:55:35.000000000 +0100 ++++ linux-2.6.8.1-gentoo/include/asm-i386/bitops.h 2005-01-04 17:37:24.000000000 +0000 +@@ -358,6 +358,7 @@ + * + * Undefined if no bit exists, so code should check against 0 first. + */ ++#ifndef __ffs + static inline unsigned long __ffs(unsigned long word) + { + __asm__("bsfl %1,%0" +@@ -365,6 +366,7 @@ + :"rm" (word)); + return word; + } ++#endif + + /* + * fls: find last bit set. +diff -ur linux-2.6.8.1/include/asm-ia64/bitops.h linux-2.6.8.1-gentoo/include/asm-ia64/bitops.h +--- linux-2.6.8.1/include/asm-ia64/bitops.h 2004-08-14 11:56:14.000000000 +0100 ++++ linux-2.6.8.1-gentoo/include/asm-ia64/bitops.h 2005-01-04 17:36:44.000000000 +0000 +@@ -302,6 +302,7 @@ + * + * Undefined if no bit exists, so code should check against 0 first. + */ ++#ifndef __ffs + static __inline__ unsigned long + __ffs (unsigned long x) + { +@@ -310,6 +311,7 @@ + result = ia64_popcnt((x-1) & ~x); + return result; + } ++#endif + + #ifdef __KERNEL__ + +diff -ur linux-2.6.8.1/include/asm-sparc64/bitops.h linux-2.6.8.1-gentoo/include/asm-sparc64/bitops.h +--- linux-2.6.8.1/include/asm-sparc64/bitops.h 2004-08-14 11:54:50.000000000 +0100 ++++ linux-2.6.8.1-gentoo/include/asm-sparc64/bitops.h 2005-01-04 17:36:57.000000000 +0000 +@@ -101,6 +101,7 @@ + * + * Undefined if no bit exists, so code should check against 0 first. + */ ++#ifndef __ffs + static __inline__ unsigned long __ffs(unsigned long word) + { + unsigned long result = 0; +@@ -111,6 +112,7 @@ + } + return result; + } ++#endif + + /* + * fls: find last bit set. -- 2.26.2