- whitespace cleanups

- use gnu-style - added __pure attribute to __get_elf_aux_value()
2008-04-13 14:14:48 +00:00 · 2008-04-13 14:14:48 +00:00 · 1fee7d679b
commit 1fee7d679b
parent 25b8a8926a
1 changed files with 112 additions and 112 deletions
--- a/dietlibc-0.31-pagesize.patch
+++ b/dietlibc-0.31-pagesize.patch
@ -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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/lib/mmap64.c	2008-04-13 16:03:45.000000000 +0200
@@ -4,16 +4,18 @@
 #include <syscalls.h>
 #include <errno.h>
@ -24,7 +24,7 @@ diff -up dietlibc-0.31.20080409/lib/mmap64.c.pagesize dietlibc-0.31.20080409/lib
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/lib/readdir64.c	2008-04-13 16:03:45.000000000 +0200
@@ -14,7 +14,7 @@
 #ifndef WANT_LARGEFILE_BACKCOMPAT
 struct dirent64* readdir64(DIR *d) {
@ -54,7 +54,7 @@ diff -up dietlibc-0.31.20080409/lib/readdir64.c.pagesize dietlibc-0.31.20080409/
 	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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/lib/opendir.c	2008-04-13 16:03:45.000000000 +0200
@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <fcntl.h>
@ -75,7 +75,7 @@ diff -up dietlibc-0.31.20080409/lib/opendir.c.pagesize dietlibc-0.31.20080409/li
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/lib/readdir.c	2008-04-13 16:03:45.000000000 +0200
@@ -5,7 +5,7 @@
 
 struct dirent* readdir(DIR *d) {
@ -87,7 +87,7 @@ diff -up dietlibc-0.31.20080409/lib/readdir.c.pagesize dietlibc-0.31.20080409/li
   }
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/lib/closedir.c	2008-04-13 16:03:45.000000000 +0200
@@ -4,8 +4,10 @@
 #include <dirent.h>
 #include <stdlib.h>
@ -102,7 +102,7 @@ diff -up dietlibc-0.31.20080409/lib/closedir.c.pagesize dietlibc-0.31.20080409/l
 }
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/lib/alloc.c	2008-04-13 16:03:45.000000000 +0200
@@ -18,8 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
@ -124,7 +124,7 @@ diff -up dietlibc-0.31.20080409/lib/alloc.c.pagesize dietlibc-0.31.20080409/lib/
 /* a simple mmap :) */
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/ppc/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -31,6 +31,12 @@ _start:
 	lis	14,environ@ha
 	stw	5,environ@l(14)
@ -140,7 +140,7 @@ diff -up dietlibc-0.31.20080409/ppc/start.S.pagesize dietlibc-0.31.20080409/ppc/
 	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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/dietfeatures.h	2008-04-13 16:03:45.000000000 +0200
@@ -126,6 +126,16 @@
 /* #define WANT_SSP_XOR */
 
@ -169,7 +169,7 @@ diff -up dietlibc-0.31.20080409/dietfeatures.h.pagesize dietlibc-0.31.20080409/d
 #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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/test/Makefile	2008-04-13 16:03:45.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 +181,7 @@ diff -up dietlibc-0.31.20080409/test/Makefile.pagesize dietlibc-0.31.20080409/te
 
 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-12 20:19:28.000000000 +0200
+++ dietlibc-0.31.20080409/test/sysconf.c	2008-04-13 16:09:57.000000000 +0200
@@ -0,0 +1,80 @@
 +#include <unistd.h>
 +#include <stdio.h>
@ -193,79 +193,79 @@ diff -up /dev/null dietlibc-0.31.20080409/test/sysconf.c
 +
 +static long exec_getconf(char const *var)
 +{
-+	char	buf[128];
-+	pid_t	pid;
-+	int	fd[2];
-+	int	status;
-+	ssize_t	l;
+  char	buf[128];
+  pid_t	pid;
+  int	fd[2];
+  int	status;
+  ssize_t	l;
 +
-+	if (pipe(fd)<0 || (pid = fork())<0)
-+		abort();
+  if (pipe(fd)<0 || (pid = fork())<0)
+    abort();
 +
-+	if (pid==0) {
-+		close(fd[0]);
-+		
-+		if (fd[1]!=1) {
-+			dup2(fd[1], 1);
-+			close(fd[1]);
-+		}
+  if (pid==0) {
+    close(fd[0]);
 +
-+		execlp("getconf", "getconf", var, NULL);
-+		_exit(1);
-+	}
+    if (fd[1]!=1) {
+      dup2(fd[1], 1);
+      close(fd[1]);
+    }
 +
-+	close(fd[1]);
-+	l = read(fd[0], buf, sizeof(buf)-1);
-+	if (l<0) {
-+		perror("read()");
-+		goto err;
-+	} else if (l==sizeof(buf)-1)
-+		goto err;
-+	close(fd[0]);
+    execlp("getconf", "getconf", var, NULL);
+    _exit(1);
+  }
 +
-+	buf[l] = '\0';
-+	
-+	if (waitpid(pid, &status, 0)<0)
-+		goto err;
+  close(fd[1]);
+  l = read(fd[0], buf, sizeof(buf)-1);
+  if (l<0) {
+    perror("read()");
+    goto err;
+  } else if (l==sizeof(buf)-1)
+    goto err;
+  close(fd[0]);
 +
-+	if (!WIFEXITED(status) || WEXITSTATUS(status)!=0)
-+		goto err;
+  buf[l] = '\0';
 +
-+	return strtol(buf, NULL, 10);
+  if (waitpid(pid, &status, 0)<0)
+    goto err;
 +
-+err:
-+	kill(pid, SIGKILL);
-+	abort();	
+  if (!WIFEXITED(status) || WEXITSTATUS(status)!=0)
+    goto err;
+
+  return strtol(buf, NULL, 10);
+
+ err:
+  kill(pid, SIGKILL);
+  abort();
 +}
 +
 +static unsigned int do_check(char const *var, long exp)
 +{
-+	long	cur = exec_getconf(var);
+  long	cur = exec_getconf(var);
 +
-+	if (cur!=exp) {
-+		fprintf(stderr, "%s mismatch: got %ld, expected %ld\n",
-+			cur, exp);
-+		return 1;
-+	}
+  if (cur!=exp) {
+    fprintf(stderr, "%s mismatch: got %ld, expected %ld\n",
+	    cur, exp);
+    return 1;
+  }
 +
-+	return 0;
+  return 0;
 +}
 +
 +int main(int argc, char *argv[])
 +{
-+	unsigned int	err = 0;
+  unsigned int	err = 0;
 +
-+	assert(sysconf(_SC_PAGESIZE) == __DIET_PAGE_SIZE);
-+	assert(__DIET_PAGE_SIZE == (1<<__DIET_PAGE_SHIFT));
+  assert(sysconf(_SC_PAGESIZE) == __DIET_PAGE_SIZE);
+  assert(__DIET_PAGE_SIZE == (1<<__DIET_PAGE_SHIFT));
 +
-+	err += do_check("PAGE_SIZE", sysconf(_SC_PAGESIZE));
-+	err += do_check("CLK_TCK",   sysconf(_SC_CLK_TCK));
+  err += do_check("PAGE_SIZE", sysconf(_SC_PAGESIZE));
+  err += do_check("CLK_TCK",   sysconf(_SC_CLK_TCK));
 +
-+	return err;
+  return err;
 +}
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/test/runtests.sh	2008-04-13 16:03:45.000000000 +0200
@@ -1,6 +1,6 @@
 SUBDIRS="dirent inet stdio string stdlib time"
 
@ -276,7 +276,7 @@ diff -up dietlibc-0.31.20080409/test/runtests.sh.pagesize dietlibc-0.31.20080409
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/sparc64/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -25,6 +25,11 @@ _start:
 	or	%o3, %lo(environ), %o3
 	stx	%o2, [%o3]
@ -291,7 +291,7 @@ diff -up dietlibc-0.31.20080409/sparc64/start.S.pagesize dietlibc-0.31.20080409/
    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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/libcruft/sysconf.c	2008-04-13 16:08:03.000000000 +0200
@@ -3,6 +3,8 @@
 #include <limits.h>
 #include <sys/resource.h>
@ -306,11 +306,11 @@ diff -up dietlibc-0.31.20080409/libcruft/sysconf.c.pagesize dietlibc-0.31.200804
     }
   case _SC_CLK_TCK:
 +#ifdef WANT_ELFINFO
-+  {
-+    elf_addr_t	*v = __get_elf_aux_value(AT_CLKTCK);
-+    if (v)
-+	    return *v;
-+  }
+    {
+      elf_addr_t	*v = __get_elf_aux_value(AT_CLKTCK);
+      if (v)
+	return *v;
+    }
 +#endif
 +
 #ifdef __alpha__
@ -331,36 +331,36 @@ diff -up dietlibc-0.31.20080409/libcruft/sysconf.c.pagesize dietlibc-0.31.200804
     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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/libcruft/__get_elf_aux_value.c	2008-04-13 16:06:57.000000000 +0200
@@ -0,0 +1,25 @@
 +#include <stdlib.h>
 +#include "../dietelfinfo.h"
 +
 +elf_addr_t *__get_elf_aux_value(unsigned int tag)
 +{
-+	extern char **	__elfinfo;
-+	elf_addr_t	*aux_ptr;
-+	char **		tmp;
+  extern char **	__elfinfo;
+  elf_addr_t		*aux_ptr;
+  char **		tmp;
 +
-+	/* External symbol points to 'environ' after startup. Now, go the end
-+	 * of 'environ'; the auxiliary ELF table is located immediately after
-+	 * this position */
+  /* External symbol points to 'environ' after startup. Now, go the end
+   * of 'environ'; the auxiliary ELF table is located immediately after
+   * this position */
 +
-+	/* operate on tmp instead of __elfinfo to be thread safe */
-+	tmp = __elfinfo;
-+	while (*tmp)
-+		++tmp;
-+	__elfinfo = tmp;
+  /* operate on tmp instead of __elfinfo to be thread safe */
+  tmp = __elfinfo;
+  while (*tmp)
+    ++tmp;
+  __elfinfo = tmp;
 +
-+	for (aux_ptr = (elf_addr_t *)(tmp+1); aux_ptr[0]!=AT_NULL; aux_ptr += 2)
-+		if (aux_ptr[0]==tag)
-+			return aux_ptr+1;
+  for (aux_ptr = (elf_addr_t *)(tmp+1); aux_ptr[0]!=AT_NULL; aux_ptr += 2)
+    if (aux_ptr[0]==tag)
+      return aux_ptr+1;
 +
-+	return NULL;
+  return NULL;
 +}
 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-12 20:15:33.000000000 +0200
+++ dietlibc-0.31.20080409/libcruft/getpagesize.c	2008-04-13 16:07:23.000000000 +0200
@@ -2,14 +2,25 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
@ -375,19 +375,19 @@ diff -up dietlibc-0.31.20080409/libcruft/getpagesize.c.pagesize dietlibc-0.31.20
 size_t __libc_getpagesize(void) {
 -  return PAGE_SIZE;
 +#ifdef WANT_DYN_PAGESIZE
-+	static size_t	pgsz;
+  static size_t	pgsz;
 +
-+	if (__unlikely(pgsz==0)) {
-+		elf_addr_t	*v = __get_elf_aux_value(AT_PAGESZ);
-+		if (__likely(v))
-+			pgsz = *v;
-+		else
-+			pgsz = __DIET_PAGE_SIZE_PREDEF;
-+	}
+  if (__unlikely(pgsz==0)) {
+    elf_addr_t	*v = __get_elf_aux_value(AT_PAGESZ);
+    if (__likely(v))
+      pgsz = *v;
+    else
+      pgsz = __DIET_PAGE_SIZE_PREDEF;
+  }
 +
-+	return pgsz;
+  return pgsz;
 +#else
-+	return __DIET_PAGE_SIZE_PREDEF;
+  return __DIET_PAGE_SIZE_PREDEF;
 +#endif
 }
 
@ -395,7 +395,7 @@ diff -up dietlibc-0.31.20080409/libcruft/getpagesize.c.pagesize dietlibc-0.31.20
 -
 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-12 20:22:45.000000000 +0200
+++ dietlibc-0.31.20080409/dietpagesize.h	2008-04-13 16:03:45.000000000 +0200
@@ -0,0 +1,31 @@
 +#ifndef H_DIETLIBC_DIETPAGESIZE_H
 +#define H_DIETLIBC_DIETPAGESIZE_H
@ -430,7 +430,7 @@ diff -up /dev/null dietlibc-0.31.20080409/dietpagesize.h
 +#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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/s390x/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -26,6 +26,11 @@ _start:
 	larl	%r13,environ
 	stg	%r4,0(%r13)
@ -445,7 +445,7 @@ diff -up dietlibc-0.31.20080409/s390x/start.S.pagesize dietlibc-0.31.20080409/s3
 	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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/dietelfinfo.h	2008-04-13 16:04:33.000000000 +0200
@@ -0,0 +1,9 @@
 +#include "dietfeatures.h"
 +
@ -454,11 +454,11 @@ diff -up /dev/null dietlibc-0.31.20080409/dietelfinfo.h
 +#include <linux/elf.h>
 +
 +elf_addr_t *	__get_elf_aux_value(unsigned int tag)
-+	__attribute__((__visibility__("hidden"),__const__));
+	__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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/ia64/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -40,6 +40,11 @@ _start:
 	;;
 	st8  [r14] = out2           /* store envp in environ */
@ -473,7 +473,7 @@ diff -up dietlibc-0.31.20080409/ia64/start.S.pagesize dietlibc-0.31.20080409/ia6
 	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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/i386/start.S	2008-04-13 16:03:45.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 +487,7 @@ diff -up dietlibc-0.31.20080409/i386/start.S.pagesize dietlibc-0.31.20080409/i38
 	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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/dietdirent.h	2008-04-13 16:03:45.000000000 +0200
@@ -1,8 +1,12 @@
 #include <sys/shm.h>
 
@ -504,7 +504,7 @@ diff -up dietlibc-0.31.20080409/dietdirent.h.pagesize dietlibc-0.31.20080409/die
 +#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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/alpha/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -24,6 +24,10 @@ _start:
 
 	stq	$18, environ
@ -518,7 +518,7 @@ diff -up dietlibc-0.31.20080409/alpha/start.S.pagesize dietlibc-0.31.20080409/al
 	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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/syscalls.s/environ.S	2008-04-13 16:03:45.000000000 +0200
@@ -1,6 +1,7 @@
 .section ".bss"
 .align 8
@ -552,7 +552,7 @@ diff -up dietlibc-0.31.20080409/syscalls.s/environ.S.pagesize dietlibc-0.31.2008
 +#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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/arm/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -23,11 +23,15 @@ _start:
 #ifdef __DYN_LIB
 	ldr	sl, .L4
@ -579,7 +579,7 @@ diff -up dietlibc-0.31.20080409/arm/start.S.pagesize dietlibc-0.31.20080409/arm/
 -
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/parisc/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -34,6 +34,11 @@ _start:
 	ldil LP%environ, %r19
 	ldo RP%environ(%r19), %r19
@ -594,7 +594,7 @@ diff -up dietlibc-0.31.20080409/parisc/start.S.pagesize dietlibc-0.31.20080409/p
 
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/include/sys/shm.h	2008-04-13 16:03:45.000000000 +0200
@@ -60,15 +60,6 @@ struct shm_info {
   unsigned long swap_successes;
 };
@ -613,7 +613,7 @@ diff -up dietlibc-0.31.20080409/include/sys/shm.h.pagesize dietlibc-0.31.2008040
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/sparc/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -25,6 +25,11 @@ _start:
 	or	%o3, %lo(environ), %o3
 	st	%o2, [%o3]
@ -628,7 +628,7 @@ diff -up dietlibc-0.31.20080409/sparc/start.S.pagesize dietlibc-0.31.20080409/sp
    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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/sparc/shmat.c	2008-04-13 16:03:45.000000000 +0200
@@ -3,17 +3,15 @@
 #include <sys/shm.h>
 #include <unistd.h>
@ -652,7 +652,7 @@ diff -up dietlibc-0.31.20080409/sparc/shmat.c.pagesize dietlibc-0.31.20080409/sp
 }
 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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/ppc64/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -58,6 +58,12 @@ _start:
 	oris	14,14,environ@ha
 	std	5,environ@l(14)
@ -668,7 +668,7 @@ diff -up dietlibc-0.31.20080409/ppc64/start.S.pagesize dietlibc-0.31.20080409/pp
 	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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/x86_64/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -12,12 +12,23 @@ _start:
 	
 	leaq	8(%rsi,%rdi,8),%rdx	/* %rdx = envp = (8*rdi)+%rsi+8 */
@ -695,7 +695,7 @@ diff -up dietlibc-0.31.20080409/x86_64/start.S.pagesize dietlibc-0.31.20080409/x
 	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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/s390/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -30,6 +30,11 @@ _start:
 	l	%r1,8(%r13)
 	st	%r4,0(%r1)
@ -710,7 +710,7 @@ diff -up dietlibc-0.31.20080409/s390/start.S.pagesize dietlibc-0.31.20080409/s39
 	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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/dynlinker/ldso_start.S	2008-04-13 16:03:45.000000000 +0200
@@ -86,6 +86,15 @@ __environ:
 	.long 0
 #endif
@ -729,7 +729,7 @@ diff -up dietlibc-0.31.20080409/dynlinker/ldso_start.S.pagesize dietlibc-0.31.20
 	.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-12 20:13:10.000000000 +0200
+++ dietlibc-0.31.20080409/mips/start.S	2008-04-13 16:03:45.000000000 +0200
@@ -47,6 +47,9 @@ __start:
 #endif
 	add	$a2, $a2, $a1