[arch-commits] CVS update of core/base/glibc (ChangeLog PKGBUILD fix_memory.diff)

[andyrtr at archlinux.org]

    Date: Wednesday, November 7, 2007 @ 16:23:13
  Author: andyrtr
    Path: /home/cvs-core/core/base/glibc

   Added: fix_memory.diff (1.1)
Modified: ChangeLog (1.2 -> 1.3) PKGBUILD (1.75 -> 1.76)

upgpkg: glibc 2.7-5
fixed gcc-gcj flooding memory


-----------------+
 ChangeLog       |    4 ++++
 PKGBUILD        |   10 +++++++---
 fix_memory.diff |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 3 deletions(-)


Index: core/base/glibc/ChangeLog
diff -u core/base/glibc/ChangeLog:1.2 core/base/glibc/ChangeLog:1.3
--- core/base/glibc/ChangeLog:1.2	Fri Nov  2 14:20:38 2007
+++ core/base/glibc/ChangeLog	Wed Nov  7 16:23:13 2007
@@ -1,3 +1,7 @@
+glibc 2.7-5
+- fix a regression: http://sourceware.org/bugzilla/show_bug.cgi?id=4781
+  mainly for x86_64 where using gcc-gcj eats all memory
+
 glibc 2.7-4
 - extract /etc/locale.gen from sources to have all new locales supported
 - mask other broken locales / added a comment to post.install message
Index: core/base/glibc/PKGBUILD
diff -u core/base/glibc/PKGBUILD:1.75 core/base/glibc/PKGBUILD:1.76
--- core/base/glibc/PKGBUILD:1.75	Fri Nov  2 14:20:38 2007
+++ core/base/glibc/PKGBUILD	Wed Nov  7 16:23:13 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.75 2007/11/02 18:20:38 andyrtr Exp $
+# $Id: PKGBUILD,v 1.76 2007/11/07 21:23:13 andyrtr Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=glibc
 pkgver=2.7
-pkgrel=4
+pkgrel=5
 install=glibc.install
 backup=(etc/locale.gen)
 pkgdesc="GNU C Library"
@@ -15,13 +15,15 @@
 replaces=('glibc-xen')
 source=(http://ftp.gnu.org/gnu/glibc/glibc-${pkgver}.tar.bz2
 	http://ftp.gnu.org/gnu/glibc/glibc-libidn-${pkgver}.tar.bz2
-	ftp://ftp.archlinux.org/other/glibc-patches-2.7-3.tar.bz2
+	ftp://ftp.archlinux.org/other/glibc/glibc-patches-2.7-3.tar.bz2
+	fix_memory.diff
 	nscd
 	locale.gen.txt
 	locale-gen)
 md5sums=('065c5952b439deba40083ccd67bcc8f7'
          '226809992fb1f3dc6ea23e0f26952ea4'
          'aa48afa0f4c0a2859434fb667dccc8d6'
+         'ff8d7d0fe190d9d20f68727a97148330'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -36,6 +38,8 @@
 
   patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.5-localedef_segfault-1.patch || return 1
 
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=4781 - they forgot to apply it to the 2.7 branch
+  patch -Np1 -i ${startdir}/src/fix_memory.diff || return 1
 
   mkdir -p ${startdir}/pkg/etc
   touch ${startdir}/pkg/etc/ld.so.conf
Index: core/base/glibc/fix_memory.diff
diff -u /dev/null core/base/glibc/fix_memory.diff:1.1
--- /dev/null	Wed Nov  7 16:23:13 2007
+++ core/base/glibc/fix_memory.diff	Wed Nov  7 16:23:13 2007
@@ -0,0 +1,50 @@
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
+retrieving revision 1.27
+retrieving revision 1.27.2.1
+diff -u -r1.27 -r1.27.2.1
+--- libc/sysdeps/unix/sysv/linux/i386/clone.S	2006/12/03 23:12:36	1.27
++++ libc/sysdeps/unix/sysv/linux/i386/clone.S	2007/07/31 12:51:32	1.27.2.1
+@@ -120,9 +120,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (eip);
+ 	/* Note: %esi is zero.  */
+ 	movl	%esi,%ebp	/* terminate the stack frame */
+ #ifdef RESET_PID
+@@ -155,7 +152,6 @@
+ 	jmp	L(haspid)
+ 	.previous
+ #endif
+-	cfi_endproc;
+ 
+ 	cfi_startproc
+ PSEUDO_END (BP_SYM (__clone))
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/x86_64/clone.S,v
+retrieving revision 1.7
+retrieving revision 1.7.2.1
+diff -u -r1.7 -r1.7.2.1
+--- libc/sysdeps/unix/sysv/linux/x86_64/clone.S	2006/12/03 23:12:36	1.7
++++ libc/sysdeps/unix/sysv/linux/x86_64/clone.S	2007/07/31 12:51:32	1.7.2.1
+@@ -89,9 +89,6 @@
+ 	ret
+ 
+ L(thread_start):
+-	cfi_startproc;
+-	/* Clearing frame pointer is insufficient, use CFI.  */
+-	cfi_undefined (rip);
+ 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
+ 	   the outermost frame obviously.  */
+ 	xorl	%ebp, %ebp
+@@ -116,7 +113,6 @@
+ 	/* Call exit with return value from function call. */
+ 	movq	%rax, %rdi
+ 	call	HIDDEN_JUMPTARGET (_exit)
+-	cfi_endproc;
+ 
+ 	cfi_startproc;
+ PSEUDO_END (BP_SYM (__clone))