From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 3 Mar 2003 19:08:31 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~1378
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca97fb53255da0a01195a1b43c0d9138a4b44f49;p=thirdparty%2Fglibc.git

Update.

	* elf/dl-load.c (struct filebuf): For 64-bit platforms use 640
	byte filebuf size.
---

diff --git a/ChangeLog b/ChangeLog
index fd2c88f9c71..6945433eaf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-03-03  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/dl-load.c (struct filebuf): For 64-bit platforms use 640
+	byte filebuf size.
+
 	* libio/fileops.c (_IO_new_file_fopen): Close stillborn descriptor
 	if ccs parameter isn't valid.  Reported by Andreas Schwab.
 
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 71a2ded8320..4559c08c05b 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <ldsodefs.h>
+#include <bits/wordsize.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -109,6 +110,11 @@ ELF_PREFERRED_ADDRESS_DATA;
 struct filebuf
 {
   ssize_t len;
+#ifdef __WORDSIZE == 32
+# define FILEBUF_SIZE 512
+#else
+# define FILEBUF_SIZE 640
+#endif
   char buf[512] __attribute__ ((aligned (__alignof (ElfW(Ehdr)))));
 };