alpha related fixes

5 files changed, 56 insertions, 10 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index c37479eca30e..b290aa809b27 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.12 2002/08/03 19:40:39 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.13 2002/09/08 16:33:24 azarah Exp $
+
+  08 Sep 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r6.ebuild :
+
+  Add alpha related patches thanks to Bjoern Brauel <bjoern@tuxnetwork.de>.
 
 *glibc-2.2.5-r7 (03 Aug 2002)
 
diff --git a/sys-libs/glibc/files/glibc-2.2.5-alpha-gcc3-fix.diff b/sys-libs/glibc/files/glibc-2.2.5-alpha-gcc3-fix.diff
new file mode 100644
index 000000000000..f51c7e32efcf
--- /dev/null
+++ b/sys-libs/glibc/files/glibc-2.2.5-alpha-gcc3-fix.diff
@@ -0,0 +1,11 @@
+--- glibc-2.2.5/linuxthreads/sysdeps/alpha/pt-machine.h	Mon Jul 23 17:52:42 2001
++++ glibc-2.2.5-alpha-gcc3-fix/linuxthreads/sysdeps/alpha/pt-machine.h	Sat Sep  7 14:58:23 2002
+@@ -71,7 +71,7 @@
+ #define THREAD_SELF \
+ ({									      \
+   register pthread_descr __self __asm__("$0");				      \
+-  __asm__ ("call_pal %1" : "=r"(__self) : "i"(PAL_rduniq) : "$0");	      \
++  __asm__ ("call_pal %1" : "=r"(__self) : "i"(PAL_rduniq));		      \
+   __self;								      \
+ })
+ 
diff --git a/sys-libs/glibc/files/glibc-2.2.5-alpha-pcdyn-fix.diff b/sys-libs/glibc/files/glibc-2.2.5-alpha-pcdyn-fix.diff
new file mode 100644
index 000000000000..ce51ee3fc892
--- /dev/null
+++ b/sys-libs/glibc/files/glibc-2.2.5-alpha-pcdyn-fix.diff
@@ -0,0 +1,19 @@
+--- glibc-2.2.5/sysdeps/alpha/divrem.h	Fri Jul  6 06:55:45 2001
++++ glibc-2.2.5-alpha/sysdeps/alpha/divrem.h	Fri Sep  6 17:32:35 2002
+@@ -86,6 +86,7 @@
+ 
+ 	.align 3
+ UFUNC_NAME:
++$udiv_entry:
+ 	lda	sp, -STACK(sp)
+ 	.frame	sp, STACK, retaddr, 0
+ #ifdef PROF
+@@ -206,7 +207,7 @@
+ 	cmovge	AT, AT, arg2
+ 
+ 	/* Do the unsigned division.  */
+-	bsr	retaddr, UFUNC_NAME
++	bsr	retaddr, $udiv_entry
+ 
+ 	/* Restore originals and adjust the sign of the result.  */
+ 	ldq	arg1, 0(sp)
diff --git a/sys-libs/glibc/glibc-2.2.5-r6.ebuild b/sys-libs/glibc/glibc-2.2.5-r6.ebuild
index 767104bc87c8..ef1216e72271 100644
--- a/sys-libs/glibc/glibc-2.2.5-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.2.5-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r6.ebuild,v 1.3 2002/08/16 01:22:43 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r6.ebuild,v 1.4 2002/09/08 16:33:24 azarah Exp $
 inherit flag-o-matic
 
 filter-flags "-fomit-frame-pointer -malign-double"
@@ -86,24 +86,29 @@ src_unpack() {
 	#
 	cd ${S}; patch -p1 < ${FILESDIR}/${P}-sunrpc-overflow.diff || die
 
-	if [ ${ARCH} == "x86" ]; then
+	if [ "${ARCH}" = "x86" ]; then
 	# This patch fixes the nvidia-glx probs, openoffice and vmware probs and such..
         # http://sources.redhat.com/ml/libc-hacker/2002-02/msg00152.html
-        cd ${S}
-        patch -p1 < ${FILESDIR}/glibc-divdi3.diff || die
+        cd ${S}; patch -p1 < ${FILESDIR}/glibc-divdi3.diff || die
 	fi
 	
 	# Some gcc-3.1.1 fixes.  This works fine for other versions of gcc as well,
 	# and should generally be ok, as it just fixes define order that causes scope
 	# problems with gcc-3.1.1.
 	# (Azarah, 14 Jul 2002)
-	patch -p1 < ${FILESDIR}/glibc-2.2.5-gcc311.patch || die
+	cd ${S}; patch -p1 < ${FILESDIR}/glibc-2.2.5-gcc311.patch || die
 
 	# Avoid "Error: illegal instruction" when compiling on sparc with gcc 3.1.1
-	if [ ${ARCH} == "sparc" -o ${ARCH} == "sparc64" ]; then
-		patch -p1 < ${FILESDIR}/glibc-2.2.5-gcc311-sparc.patch || die
+	if [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]; then
+		cd ${S}; patch -p1 < ${FILESDIR}/glibc-2.2.5-gcc311-sparc.patch || die
+	fi
+	
+	# Some patches to fixup build on alpha
+	if [ "${ARCH}" = "alpha" ]; then
+		cd ${S}
+		patch -p1 < ${FILESDIR}/glibc-2.2.5-alpha-gcc3-fix.diff || die
+		patch -p1 < ${FILESDIR}/glibc-2.2.5-alpha-pcdyn-fix.diff || die
 	fi
-
 }
 
 src_compile() {
diff --git a/sys-libs/glibc/glibc-2.2.5-r7.ebuild b/sys-libs/glibc/glibc-2.2.5-r7.ebuild
index 4bcd24a579aa..df36f0c09cfa 100644
--- a/sys-libs/glibc/glibc-2.2.5-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.2.5-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r7.ebuild,v 1.4 2002/08/16 01:22:43 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r7.ebuild,v 1.5 2002/09/08 16:33:24 azarah Exp $
 inherit flag-o-matic
 
 filter-flags "-fomit-frame-pointer -malign-double"
@@ -34,6 +34,13 @@ PROVIDE="virtual/glibc"
 export CFLAGS="$CFLAGS -O2"
 export CXXFLAGS="$CFLAGS"
 
+pkg_config() {
+	eerror
+	eerror "This is a bad revision of glibc that breaks binary compatibility!!"
+	eerror
+	die
+}
+
 src_unpack() {
 	unpack glibc-${PV}.tar.bz2 || die