rpms/dietlibc/F-8 dietlibc-0.31-pagesize.patch,1.3,1.4
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sat Jun 21 14:00:14 UTC 2008
Author: ensc
Update of /cvs/extras/rpms/dietlibc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24994
Modified Files:
dietlibc-0.31-pagesize.patch
Log Message:
added sanity check to detect broken headers at compile time
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dietlibc-0.31-pagesize.patch 21 Jun 2008 13:54:38 -0000 1.3
+++ dietlibc-0.31-pagesize.patch 21 Jun 2008 13:59:14 -0000 1.4
@@ -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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/lib/mmap64.c 2008-04-13 19:57:13.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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/lib/readdir64.c 2008-04-13 19:57:13.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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/lib/opendir.c 2008-04-13 19:57:13.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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/lib/readdir.c 2008-04-13 19:57:13.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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/lib/closedir.c 2008-04-13 19:57:13.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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/lib/alloc.c 2008-04-13 19:57:13.000000000 +0200
@@ -18,8 +18,7 @@
#include <stdlib.h>
#include <string.h>
@@ -135,7 +135,7 @@
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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/ppc/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -31,6 +31,12 @@ _start:
lis 14,environ at ha
stw 5,environ at l(14)
@@ -151,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/dietfeatures.h 2008-04-13 19:57:13.000000000 +0200
@@ -126,6 +126,16 @@
/* #define WANT_SSP_XOR */
@@ -180,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/test/Makefile 2008-04-13 19:57:13.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 \
@@ -192,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/test/sysconf.c 2008-04-13 19:57:13.000000000 +0200
@@ -0,0 +1,80 @@
+#include <unistd.h>
+#include <stdio.h>
@@ -276,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/test/runtests.sh 2008-04-13 19:57:13.000000000 +0200
@@ -1,6 +1,6 @@
SUBDIRS="dirent inet stdio string stdlib time"
@@ -287,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/sparc64/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -25,6 +25,11 @@ _start:
or %o3, %lo(environ), %o3
stx %o2, [%o3]
@@ -302,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/libcruft/sysconf.c 2008-04-13 19:57:13.000000000 +0200
@@ -3,6 +3,8 @@
#include <limits.h>
#include <sys/resource.h>
@@ -342,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/libcruft/__get_elf_aux_value.c 2008-04-13 20:06:45.000000000 +0200
@@ -0,0 +1,25 @@
+#include <stdlib.h>
+#include "../dietelfinfo.h"
@@ -371,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/libcruft/getpagesize.c 2008-04-13 19:57:13.000000000 +0200
@@ -2,14 +2,25 @@
#include <sys/ipc.h>
#include <sys/shm.h>
@@ -406,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/dietpagesize.h 2008-04-13 19:57:13.000000000 +0200
@@ -0,0 +1,31 @@
+#ifndef H_DIETLIBC_DIETPAGESIZE_H
+#define H_DIETLIBC_DIETPAGESIZE_H
@@ -441,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/s390x/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -26,6 +26,11 @@ _start:
larl %r13,environ
stg %r4,0(%r13)
@@ -456,20 +456,26 @@
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 18:57:47.000000000 +0200
-@@ -0,0 +1,9 @@
++++ dietlibc-0.31.20080409/dietelfinfo.h 2008-04-13 20:11:55.000000000 +0200
+@@ -0,0 +1,15 @@
+#include "dietfeatures.h"
+
+#ifdef WANT_ELFINFO
+#include <linux/auxvec.h>
+#include <linux/elf.h>
+
++#if defined(__powerpc64__) || defined(__x86_64__)
++struct __diet_elf_sanity_check { int f : sizeof(elf_addr_t)==8; };
++#elif defined(__i386__) || defined(__arm__) || defined(__powerpc__)
++struct __diet_elf_sanity_check { int f : sizeof(elf_addr_t)==4; };
++#endif
++
+elf_addr_t * __get_elf_aux_value(unsigned int tag)
+ __attribute__((__visibility__("hidden"),__const__)) __pure;
+#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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/ia64/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -40,6 +40,11 @@ _start:
;;
st8 [r14] = out2 /* store envp in environ */
@@ -484,7 +490,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/i386/start.S 2008-04-13 19:57:13.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 */
@@ -498,7 +504,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/dietdirent.h 2008-04-13 19:57:13.000000000 +0200
@@ -1,8 +1,12 @@
#include <sys/shm.h>
@@ -515,7 +521,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/alpha/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -24,6 +24,10 @@ _start:
stq $18, environ
@@ -529,7 +535,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/syscalls.s/environ.S 2008-04-13 19:57:13.000000000 +0200
@@ -1,6 +1,7 @@
.section ".bss"
.align 8
@@ -563,7 +569,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/arm/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -23,11 +23,15 @@ _start:
#ifdef __DYN_LIB
ldr sl, .L4
@@ -590,7 +596,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/parisc/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -34,6 +34,11 @@ _start:
ldil LP%environ, %r19
ldo RP%environ(%r19), %r19
@@ -605,7 +611,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/include/sys/shm.h 2008-04-13 19:57:13.000000000 +0200
@@ -60,15 +60,6 @@ struct shm_info {
unsigned long swap_successes;
};
@@ -624,7 +630,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/sparc/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -25,6 +25,11 @@ _start:
or %o3, %lo(environ), %o3
st %o2, [%o3]
@@ -639,7 +645,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/sparc/shmat.c 2008-04-13 19:57:13.000000000 +0200
@@ -3,17 +3,15 @@
#include <sys/shm.h>
#include <unistd.h>
@@ -663,7 +669,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/ppc64/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -58,6 +58,12 @@ _start:
oris 14,14,environ at ha
std 5,environ at l(14)
@@ -679,7 +685,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/x86_64/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -12,12 +12,23 @@ _start:
leaq 8(%rsi,%rdi,8),%rdx /* %rdx = envp = (8*rdi)+%rsi+8 */
@@ -706,7 +712,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/s390/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -30,6 +30,11 @@ _start:
l %r1,8(%r13)
st %r4,0(%r1)
@@ -721,7 +727,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/dynlinker/ldso_start.S 2008-04-13 19:57:13.000000000 +0200
@@ -86,6 +86,15 @@ __environ:
.long 0
#endif
@@ -740,7 +746,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 18:57:47.000000000 +0200
++++ dietlibc-0.31.20080409/mips/start.S 2008-04-13 19:57:13.000000000 +0200
@@ -47,6 +47,9 @@ __start:
#endif
add $a2, $a2, $a1
More information about the fedora-extras-commits
mailing list