rpms/dietlibc/F-8 dietlibc-0.31-pagesize.patch,1.7,1.8

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/dietlibc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv595

Modified Files:
	dietlibc-0.31-pagesize.patch 
Log Message:
* fixed post-increment issue on ppc*
* die when AT_PAGESZ entry is empty


dietlibc-0.31-pagesize.patch:

Index: dietlibc-0.31-pagesize.patch
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/F-8/dietlibc-0.31-pagesize.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dietlibc-0.31-pagesize.patch	21 Jun 2008 14:19:34 -0000	1.7
+++ dietlibc-0.31-pagesize.patch	21 Jun 2008 14:22:29 -0000	1.8
@@ -129,12 +129,13 @@
    register size_t idx=0;
 --- dietlibc-0.31.20080409/ppc/start.S.pagesize
 +++ dietlibc-0.31.20080409/ppc/start.S
-@@ -31,6 +31,14 @@ _start:
+@@ -31,6 +31,15 @@ _start:
  	lis	14,environ at ha
  	stw	5,environ at l(14)
  
 +#ifdef WANT_ELFINFO
-+1:	lwzu	15,4(5)
++1:	lwzu	15,0(5)
++	addi	5, 5, 4
 +	cmpwi	15,0
 +	bne	1b
 +	
@@ -355,7 +356,7 @@
 +}
 --- dietlibc-0.31.20080409/libcruft/getpagesize.c.pagesize
 +++ dietlibc-0.31.20080409/libcruft/getpagesize.c
-@@ -2,14 +2,23 @@
+@@ -2,14 +2,22 @@
  #include <sys/ipc.h>
  #include <sys/shm.h>
  
@@ -373,8 +374,7 @@
 +
 +  if (__unlikely(pgsz==0)) {
 +    __diet_elf_addr_t	*v = __get_elf_aux_value(AT_PAGESZ);
-+    if (__likely(v))
-+      pgsz = *v;
++    pgsz = *v;	/* causes segfault when 'v==NULL' */
 +  }
 +
 +  return pgsz;
@@ -675,12 +675,13 @@
  }
 --- dietlibc-0.31.20080409/ppc64/start.S.pagesize
 +++ dietlibc-0.31.20080409/ppc64/start.S
-@@ -58,6 +58,14 @@ _start:
+@@ -58,6 +58,15 @@ _start:
  	oris	14,14,environ at ha
  	std	5,environ at l(14)
  
 +#ifdef WANT_ELFINFO
-+1:	ldu	15,8(5)
++1:	ldu	15,0(5)
++	addi	5, 5, 8
 +	cmpdi	15,0
 +	bne	1b
 +