rpms/dietlibc/F-8 dietlibc-0.31-pagesize.patch,1.2,1.3
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sat Jun 21 13:55:30 UTC 2008
Author: ensc
Update of /cvs/extras/rpms/dietlibc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24641
Modified Files:
dietlibc-0.31-pagesize.patch
Log Message:
lib/alloc.c: return value of__ind_shift() depends on PAGE_SIZE
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dietlibc-0.31-pagesize.patch 21 Jun 2008 13:52:22 -0000 1.2
+++ dietlibc-0.31-pagesize.patch 21 Jun 2008 13:54:38 -0000 1.3
@@ -1,6 +1,6 @@
diff -up dietlibc-0.31.20080409/lib/mmap64.c.pagesize dietlibc-0.31.20080409/lib/mmap64.c
--- dietlibc-0.31.20080409/lib/mmap64.c.pagesize 2004-12-13 11:21:31.000000000 +0100
-+++ dietlibc-0.31.20080409/lib/mmap64.c 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/lib/mmap64.c 2008-04-13 18:57:47.000000000 +0200
@@ -4,16 +4,18 @@
#include <syscalls.h>
#include <errno.h>
@@ -24,7 +24,7 @@
void*mmap64(void*addr,size_t len,int prot,int flags,int fd,off64_t offset)
diff -up dietlibc-0.31.20080409/lib/readdir64.c.pagesize dietlibc-0.31.20080409/lib/readdir64.c
--- dietlibc-0.31.20080409/lib/readdir64.c.pagesize 2004-03-02 22:27:19.000000000 +0100
-+++ dietlibc-0.31.20080409/lib/readdir64.c 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/lib/readdir64.c 2008-04-13 18:57:47.000000000 +0200
@@ -14,7 +14,7 @@
#ifndef WANT_LARGEFILE_BACKCOMPAT
struct dirent64* readdir64(DIR *d) {
@@ -54,7 +54,7 @@
trygetdents64=0;
diff -up dietlibc-0.31.20080409/lib/opendir.c.pagesize dietlibc-0.31.20080409/lib/opendir.c
--- dietlibc-0.31.20080409/lib/opendir.c.pagesize 2002-07-03 22:33:38.000000000 +0200
-+++ dietlibc-0.31.20080409/lib/opendir.c 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/lib/opendir.c 2008-04-13 18:57:47.000000000 +0200
@@ -5,6 +5,8 @@
#include <stdlib.h>
#include <fcntl.h>
@@ -75,7 +75,7 @@
lose:
diff -up dietlibc-0.31.20080409/lib/readdir.c.pagesize dietlibc-0.31.20080409/lib/readdir.c
--- dietlibc-0.31.20080409/lib/readdir.c.pagesize 2002-07-03 22:33:38.000000000 +0200
-+++ dietlibc-0.31.20080409/lib/readdir.c 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/lib/readdir.c 2008-04-13 18:57:47.000000000 +0200
@@ -5,7 +5,7 @@
struct dirent* readdir(DIR *d) {
@@ -87,7 +87,7 @@
}
diff -up dietlibc-0.31.20080409/lib/closedir.c.pagesize dietlibc-0.31.20080409/lib/closedir.c
--- dietlibc-0.31.20080409/lib/closedir.c.pagesize 2002-07-03 22:33:37.000000000 +0200
-+++ dietlibc-0.31.20080409/lib/closedir.c 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/lib/closedir.c 2008-04-13 18:57:47.000000000 +0200
@@ -4,8 +4,10 @@
#include <dirent.h>
#include <stdlib.h>
@@ -102,7 +102,7 @@
}
diff -up dietlibc-0.31.20080409/lib/alloc.c.pagesize dietlibc-0.31.20080409/lib/alloc.c
--- dietlibc-0.31.20080409/lib/alloc.c.pagesize 2007-08-03 22:58:33.000000000 +0200
-+++ dietlibc-0.31.20080409/lib/alloc.c 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/lib/alloc.c 2008-04-13 18:57:47.000000000 +0200
@@ -18,8 +18,7 @@
#include <stdlib.h>
#include <string.h>
@@ -122,9 +122,20 @@
#define PAGE_ALIGN(s) (((s)+MEM_BLOCK_SIZE-1)&(unsigned long)(~(MEM_BLOCK_SIZE-1)))
/* a simple mmap :) */
+@@ -66,7 +65,9 @@ static __alloc_t* __small_mem[8];
+
+ #define FIRST_SMALL(p) (((unsigned long)(p))&(~(MEM_BLOCK_SIZE-1)))
+
+-static inline int __ind_shift() { return (MEM_BLOCK_SIZE==4096)?4:5; }
++static inline int __ind_shift() {
++ return __DIET_PAGE_SHIFT - sizeof(__small_mem)/sizeof(__small_mem[0]);
++}
+
+ static size_t REGPARM(1) get_index(size_t _size) {
+ register size_t idx=0;
diff -up dietlibc-0.31.20080409/ppc/start.S.pagesize dietlibc-0.31.20080409/ppc/start.S
--- dietlibc-0.31.20080409/ppc/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/ppc/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/ppc/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -31,6 +31,12 @@ _start:
lis 14,environ at ha
stw 5,environ at l(14)
@@ -140,7 +151,7 @@
bl _dyn_start
diff -up dietlibc-0.31.20080409/dietfeatures.h.pagesize dietlibc-0.31.20080409/dietfeatures.h
--- dietlibc-0.31.20080409/dietfeatures.h.pagesize 2007-10-09 01:15:27.000000000 +0200
-+++ dietlibc-0.31.20080409/dietfeatures.h 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/dietfeatures.h 2008-04-13 18:57:47.000000000 +0200
@@ -126,6 +126,16 @@
/* #define WANT_SSP_XOR */
@@ -169,7 +180,7 @@
#endif
diff -up dietlibc-0.31.20080409/test/Makefile.pagesize dietlibc-0.31.20080409/test/Makefile
--- dietlibc-0.31.20080409/test/Makefile.pagesize 2008-02-23 01:02:19.000000000 +0100
-+++ dietlibc-0.31.20080409/test/Makefile 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/test/Makefile 2008-04-13 18:57:47.000000000 +0200
@@ -14,7 +14,7 @@ glob grent hasmntopt hello iconv if_name
memccpy memchr memcmp memrchr memusage mktime mmap_test pipe printf printftest \
protoent prototypes putenv pwent rand48 read1 readdir regex select sendfile servent siglist \
@@ -181,7 +192,7 @@
diff -up /dev/null dietlibc-0.31.20080409/test/sysconf.c
--- /dev/null 2008-03-18 07:40:22.289057188 +0100
-+++ dietlibc-0.31.20080409/test/sysconf.c 2008-04-13 16:09:57.000000000 +0200
++++ dietlibc-0.31.20080409/test/sysconf.c 2008-04-13 18:57:47.000000000 +0200
@@ -0,0 +1,80 @@
+#include <unistd.h>
+#include <stdio.h>
@@ -265,7 +276,7 @@
+}
diff -up dietlibc-0.31.20080409/test/runtests.sh.pagesize dietlibc-0.31.20080409/test/runtests.sh
--- dietlibc-0.31.20080409/test/runtests.sh.pagesize 2008-02-23 01:02:19.000000000 +0100
-+++ dietlibc-0.31.20080409/test/runtests.sh 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/test/runtests.sh 2008-04-13 18:57:47.000000000 +0200
@@ -1,6 +1,6 @@
SUBDIRS="dirent inet stdio string stdlib time"
@@ -276,7 +287,7 @@
PASS="getpass"
diff -up dietlibc-0.31.20080409/sparc64/start.S.pagesize dietlibc-0.31.20080409/sparc64/start.S
--- dietlibc-0.31.20080409/sparc64/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/sparc64/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/sparc64/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -25,6 +25,11 @@ _start:
or %o3, %lo(environ), %o3
stx %o2, [%o3]
@@ -291,7 +302,7 @@
registered with atexit(). If we are statically linked, this will
diff -up dietlibc-0.31.20080409/libcruft/sysconf.c.pagesize dietlibc-0.31.20080409/libcruft/sysconf.c
--- dietlibc-0.31.20080409/libcruft/sysconf.c.pagesize 2002-12-20 14:32:37.000000000 +0100
-+++ dietlibc-0.31.20080409/libcruft/sysconf.c 2008-04-13 16:08:03.000000000 +0200
++++ dietlibc-0.31.20080409/libcruft/sysconf.c 2008-04-13 18:57:47.000000000 +0200
@@ -3,6 +3,8 @@
#include <limits.h>
#include <sys/resource.h>
@@ -331,7 +342,7 @@
return ARG_MAX;
diff -up /dev/null dietlibc-0.31.20080409/libcruft/__get_elf_aux_value.c
--- /dev/null 2008-03-18 07:40:22.289057188 +0100
-+++ dietlibc-0.31.20080409/libcruft/__get_elf_aux_value.c 2008-04-13 16:06:57.000000000 +0200
++++ dietlibc-0.31.20080409/libcruft/__get_elf_aux_value.c 2008-04-13 18:57:47.000000000 +0200
@@ -0,0 +1,25 @@
+#include <stdlib.h>
+#include "../dietelfinfo.h"
@@ -360,7 +371,7 @@
+}
diff -up dietlibc-0.31.20080409/libcruft/getpagesize.c.pagesize dietlibc-0.31.20080409/libcruft/getpagesize.c
--- dietlibc-0.31.20080409/libcruft/getpagesize.c.pagesize 2002-02-23 23:18:42.000000000 +0100
-+++ dietlibc-0.31.20080409/libcruft/getpagesize.c 2008-04-13 16:07:23.000000000 +0200
++++ dietlibc-0.31.20080409/libcruft/getpagesize.c 2008-04-13 18:57:47.000000000 +0200
@@ -2,14 +2,25 @@
#include <sys/ipc.h>
#include <sys/shm.h>
@@ -395,7 +406,7 @@
-
diff -up /dev/null dietlibc-0.31.20080409/dietpagesize.h
--- /dev/null 2008-03-18 07:40:22.289057188 +0100
-+++ dietlibc-0.31.20080409/dietpagesize.h 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/dietpagesize.h 2008-04-13 18:57:47.000000000 +0200
@@ -0,0 +1,31 @@
+#ifndef H_DIETLIBC_DIETPAGESIZE_H
+#define H_DIETLIBC_DIETPAGESIZE_H
@@ -430,7 +441,7 @@
+#endif /* H_DIETLIBC_DIETPAGESIZE_H */
diff -up dietlibc-0.31.20080409/s390x/start.S.pagesize dietlibc-0.31.20080409/s390x/start.S
--- dietlibc-0.31.20080409/s390x/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/s390x/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/s390x/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -26,6 +26,11 @@ _start:
larl %r13,environ
stg %r4,0(%r13)
@@ -445,7 +456,7 @@
brasl %r14,_dyn_start
diff -up /dev/null dietlibc-0.31.20080409/dietelfinfo.h
--- /dev/null 2008-03-18 07:40:22.289057188 +0100
-+++ dietlibc-0.31.20080409/dietelfinfo.h 2008-04-13 16:04:33.000000000 +0200
++++ dietlibc-0.31.20080409/dietelfinfo.h 2008-04-13 18:57:47.000000000 +0200
@@ -0,0 +1,9 @@
+#include "dietfeatures.h"
+
@@ -458,7 +469,7 @@
+#endif
diff -up dietlibc-0.31.20080409/ia64/start.S.pagesize dietlibc-0.31.20080409/ia64/start.S
--- dietlibc-0.31.20080409/ia64/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/ia64/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/ia64/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -40,6 +40,11 @@ _start:
;;
st8 [r14] = out2 /* store envp in environ */
@@ -473,7 +484,7 @@
br.call.sptk.few rp = _dyn_start
diff -up dietlibc-0.31.20080409/i386/start.S.pagesize dietlibc-0.31.20080409/i386/start.S
--- dietlibc-0.31.20080409/i386/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/i386/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/i386/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -25,6 +25,10 @@ _start:
PIC_INIT /* non-PIC: this is an empty line */
PUT_VAR %eax, environ, %ecx /* non-PIC: movl %eax,environ */
@@ -487,7 +498,7 @@
pushl $.text
diff -up dietlibc-0.31.20080409/dietdirent.h.pagesize dietlibc-0.31.20080409/dietdirent.h
--- dietlibc-0.31.20080409/dietdirent.h.pagesize 2002-07-03 22:33:37.000000000 +0200
-+++ dietlibc-0.31.20080409/dietdirent.h 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/dietdirent.h 2008-04-13 18:57:47.000000000 +0200
@@ -1,8 +1,12 @@
#include <sys/shm.h>
@@ -504,7 +515,7 @@
+#define __DIRSTREAM_BUF_SIZE (__DIET_PAGE_SIZE - offsetof(struct __dirstream, buf))
diff -up dietlibc-0.31.20080409/alpha/start.S.pagesize dietlibc-0.31.20080409/alpha/start.S
--- dietlibc-0.31.20080409/alpha/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/alpha/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/alpha/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -24,6 +24,10 @@ _start:
stq $18, environ
@@ -518,7 +529,7 @@
mov $0, $19 /* mov v0(dynload) to a3 */
diff -up dietlibc-0.31.20080409/syscalls.s/environ.S.pagesize dietlibc-0.31.20080409/syscalls.s/environ.S
--- dietlibc-0.31.20080409/syscalls.s/environ.S.pagesize 2004-09-28 02:01:30.000000000 +0200
-+++ dietlibc-0.31.20080409/syscalls.s/environ.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/syscalls.s/environ.S 2008-04-13 18:57:47.000000000 +0200
@@ -1,6 +1,7 @@
.section ".bss"
.align 8
@@ -552,7 +563,7 @@
+#endif
diff -up dietlibc-0.31.20080409/arm/start.S.pagesize dietlibc-0.31.20080409/arm/start.S
--- dietlibc-0.31.20080409/arm/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/arm/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/arm/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -23,11 +23,15 @@ _start:
#ifdef __DYN_LIB
ldr sl, .L4
@@ -579,7 +590,7 @@
-
diff -up dietlibc-0.31.20080409/parisc/start.S.pagesize dietlibc-0.31.20080409/parisc/start.S
--- dietlibc-0.31.20080409/parisc/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/parisc/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/parisc/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -34,6 +34,11 @@ _start:
ldil LP%environ, %r19
ldo RP%environ(%r19), %r19
@@ -594,7 +605,7 @@
diff -up dietlibc-0.31.20080409/include/sys/shm.h.pagesize dietlibc-0.31.20080409/include/sys/shm.h
--- dietlibc-0.31.20080409/include/sys/shm.h.pagesize 2005-09-21 09:33:08.000000000 +0200
-+++ dietlibc-0.31.20080409/include/sys/shm.h 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/include/sys/shm.h 2008-04-13 18:57:47.000000000 +0200
@@ -60,15 +60,6 @@ struct shm_info {
unsigned long swap_successes;
};
@@ -613,7 +624,7 @@
extern int shmdt (const void *shmaddr) __THROW;
diff -up dietlibc-0.31.20080409/sparc/start.S.pagesize dietlibc-0.31.20080409/sparc/start.S
--- dietlibc-0.31.20080409/sparc/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/sparc/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/sparc/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -25,6 +25,11 @@ _start:
or %o3, %lo(environ), %o3
st %o2, [%o3]
@@ -628,7 +639,7 @@
registered with atexit(). If we are statically linked, this will
diff -up dietlibc-0.31.20080409/sparc/shmat.c.pagesize dietlibc-0.31.20080409/sparc/shmat.c
--- dietlibc-0.31.20080409/sparc/shmat.c.pagesize 2001-06-16 19:48:57.000000000 +0200
-+++ dietlibc-0.31.20080409/sparc/shmat.c 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/sparc/shmat.c 2008-04-13 18:57:47.000000000 +0200
@@ -3,17 +3,15 @@
#include <sys/shm.h>
#include <unistd.h>
@@ -652,7 +663,7 @@
}
diff -up dietlibc-0.31.20080409/ppc64/start.S.pagesize dietlibc-0.31.20080409/ppc64/start.S
--- dietlibc-0.31.20080409/ppc64/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/ppc64/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/ppc64/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -58,6 +58,12 @@ _start:
oris 14,14,environ at ha
std 5,environ at l(14)
@@ -668,7 +679,7 @@
mr 6,7
diff -up dietlibc-0.31.20080409/x86_64/start.S.pagesize dietlibc-0.31.20080409/x86_64/start.S
--- dietlibc-0.31.20080409/x86_64/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/x86_64/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/x86_64/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -12,12 +12,23 @@ _start:
leaq 8(%rsi,%rdi,8),%rdx /* %rdx = envp = (8*rdi)+%rsi+8 */
@@ -695,7 +706,7 @@
pushq %rdi /* save reg args */
diff -up dietlibc-0.31.20080409/s390/start.S.pagesize dietlibc-0.31.20080409/s390/start.S
--- dietlibc-0.31.20080409/s390/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/s390/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/s390/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -30,6 +30,11 @@ _start:
l %r1,8(%r13)
st %r4,0(%r1)
@@ -710,7 +721,7 @@
basr %r14,%r1
diff -up dietlibc-0.31.20080409/dynlinker/ldso_start.S.pagesize dietlibc-0.31.20080409/dynlinker/ldso_start.S
--- dietlibc-0.31.20080409/dynlinker/ldso_start.S.pagesize 2006-10-13 22:11:13.000000000 +0200
-+++ dietlibc-0.31.20080409/dynlinker/ldso_start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/dynlinker/ldso_start.S 2008-04-13 18:57:47.000000000 +0200
@@ -86,6 +86,15 @@ __environ:
.long 0
#endif
@@ -729,7 +740,7 @@
.long 0
diff -up dietlibc-0.31.20080409/mips/start.S.pagesize dietlibc-0.31.20080409/mips/start.S
--- dietlibc-0.31.20080409/mips/start.S.pagesize 2006-04-04 07:35:14.000000000 +0200
-+++ dietlibc-0.31.20080409/mips/start.S 2008-04-13 16:03:45.000000000 +0200
++++ dietlibc-0.31.20080409/mips/start.S 2008-04-13 18:57:47.000000000 +0200
@@ -47,6 +47,9 @@ __start:
#endif
add $a2, $a2, $a1
More information about the fedora-extras-commits
mailing list