This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
[PATCH] patches for glibc-2-2-branch

From: Art Haas <ahaas at neosoft dot com>
To: libc-alpha at sources dot redhat dot com
Date: Mon, 18 Mar 2002 08:13:02 -0600
Subject: [PATCH] patches for glibc-2-2-branch
Hi.

The following two patches are needed on the glibc-2-2-branch
for the testsuite to run without failure. The 'tst-fmon.data'
patch was taken from the main branch, and is needed because
the currencies are all euros. As for the 'stat.h' patch, it
was taken from the following e-mail by Jakub Jelinek ...

http://sources.redhat.com/ml/libc-hacker/2002-02/msg00064.html

The start of the 'stat.h' thread is ...

http://sources.redhat.com/ml/libc-hacker/2002-02/msg00057.html

... and dealt with eradicating the following assertion failure
about the sizeof the stat structure.

--- libc/sysdeps/unix/sysv/linux/bits/stat.h.orig	Thu Feb  7 09:37:59 2002
+++ libc/sysdeps/unix/sysv/linux/bits/stat.h	Sun Mar 17 09:44:09 2002
@@ -36,7 +36,7 @@
 struct stat
   {
     __dev_t st_dev;			/* Device.  */
-    unsigned short int __pad1;
+    unsigned int __pad1;
 #ifndef __USE_FILE_OFFSET64
     __ino_t st_ino;			/* File serial number.	*/
 #else
@@ -47,7 +47,7 @@
     __uid_t st_uid;			/* User ID of the file's owner.	*/
     __gid_t st_gid;			/* Group ID of the file's group.*/
     __dev_t st_rdev;			/* Device number, if device.  */
-    unsigned short int __pad2;
+    unsigned int __pad2;
 #ifndef __USE_FILE_OFFSET64
     __off_t st_size;			/* Size of file, in bytes.  */
 #else
@@ -72,7 +72,7 @@
 #else
     __ino64_t st_ino;			/* File serial number.	*/
 #endif
-  } __attribute__ ((__packed__));
+  };
 
 #ifdef __USE_LARGEFILE64
 struct stat64
@@ -98,7 +98,7 @@
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int __unused3;
     __ino64_t st_ino;			/* File serial number.		*/
-  } __attribute__ ((__packed__));
+  };
 #endif
 
 /* Tell code we have these members.  */


===================================================================
RCS file: /cvs/glibc/libc/localedata/tst-fmon.data,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libc/localedata/tst-fmon.data	2001/07/06 04:55:34	1.9
+++ libc/localedata/tst-fmon.data	2002/03/01 05:20:48	1.10
@@ -1,5 +1,5 @@
 # Test data for test-strfmon, which checks it's implementation in glibc
-# Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
 #
@@ -45,48 +45,48 @@
 #
 # check both the german locale and strfmon with that data
 #
-de_DE.ISO-8859-1	%n	1.23		1,23 DM
-de_DE.ISO-8859-1	%n	-1.23		-1,23 DM
-de_DE.ISO-8859-1	%n	1234.56		1.234,56 DM
-de_DE.ISO-8859-1	%11n	123.45		  123,45 DM
-de_DE.ISO-8859-1	%11n	-123.45		 -123,45 DM
-de_DE.ISO-8859-1	%11n	3456.781	3.456,78 DM
-de_DE.ISO-8859-1	%^n	1234.56		1234,56 DM
-de_DE.ISO-8859-1	%+n	1234.56		1.234,56 DM
-de_DE.ISO-8859-1	%+n	-1234.56	-1.234,56 DM
-de_DE.ISO-8859-1	%(n	1234.56		1.234,56 DM
-de_DE.ISO-8859-1	%(n	-1234.56	(1.234,56 DM)
-de_DE.ISO-8859-1	%^n	1234.56		1234,56 DM
-de_DE.ISO-8859-1	%i	1.23		1,23 DEM
-de_DE.ISO-8859-1	%i	-1.23		-1,23 DEM
-de_DE.ISO-8859-1	%i	1234.56		1.234,56 DEM
-de_DE.ISO-8859-1	%^i	1234.56		1234,56 DEM
-de_DE.ISO-8859-1	%+i	1234.56		1.234,56 DEM
-de_DE.ISO-8859-1	%+i	-1234.56	-1.234,56 DEM
-de_DE.ISO-8859-1	%(i	1234.56		1.234,56 DEM
-de_DE.ISO-8859-1	%(i	-1234.56	(1.234,56 DEM)
-de_DE.ISO-8859-1	%^i	1234.56		1234,56 DEM
-de_DE.ISO-8859-1	%#5n	123.45		    123,45 DM
-de_DE.ISO-8859-1	%#5n	-123.45		-   123,45 DM
-de_DE.ISO-8859-1	%#5n	3456.781	  3.456,78 DM
-de_DE.ISO-8859-1	%=*#5n	123.45		 ***123,45 DM
-de_DE.ISO-8859-1	%=*#5n	-123.45		-***123,45 DM
-de_DE.ISO-8859-1	%=*#5n	3456.781	 *3.456,78 DM
-de_DE.ISO-8859-1	%=0#5n	123.45		 000123,45 DM
-de_DE.ISO-8859-1	%=0#5n	-123.45		-000123,45 DM
-de_DE.ISO-8859-1	%=0#5n	3456.781	 03.456,78 DM
-de_DE.ISO-8859-1	%^#5n	123.45		   123,45 DM
-de_DE.ISO-8859-1	%^#5n	-123.45		-  123,45 DM
-de_DE.ISO-8859-1	%^#5n	3456.781	  3456,78 DM
-de_DE.ISO-8859-1	%^#5.0n	123.45		   123 DM
-de_DE.ISO-8859-1	%^#5.0n	-123.45		-  123 DM
-de_DE.ISO-8859-1	%^#5.0n	3456.781	  3457 DM
-de_DE.ISO-8859-1	%^#5.4n	123.45		   123,4500 DM
-de_DE.ISO-8859-1	%^#5.4n	-123.45		-  123,4500 DM
-de_DE.ISO-8859-1	%^#5.4n	3456.781	  3456,7810 DM
-de_DE.ISO-8859-1	%(#5n	123.45		    123,45 DM
-de_DE.ISO-8859-1	%(#5n	-123.45		(   123,45 DM)
-de_DE.ISO-8859-1	%(#5n	3456.781	  3.456,78 DM
+de_DE.ISO-8859-1	%n	1.23		1,23 EUR
+de_DE.ISO-8859-1	%n	-1.23		-1,23 EUR
+de_DE.ISO-8859-1	%n	1234.56		1.234,56 EUR
+de_DE.ISO-8859-1	%12n	123.45		  123,45 EUR
+de_DE.ISO-8859-1	%12n	-123.45		 -123,45 EUR
+de_DE.ISO-8859-1	%12n	3456.781	3.456,78 EUR
+de_DE.ISO-8859-1	%^n	1234.56		1234,56 EUR
+de_DE.ISO-8859-1	%+n	1234.56		1.234,56 EUR
+de_DE.ISO-8859-1	%+n	-1234.56	-1.234,56 EUR
+de_DE.ISO-8859-1	%(n	1234.56		1.234,56 EUR
+de_DE.ISO-8859-1	%(n	-1234.56	(1.234,56 EUR)
+de_DE.ISO-8859-1	%^n	1234.56		1234,56 EUR
+de_DE.ISO-8859-1	%i	1.23		1,23 EUR
+de_DE.ISO-8859-1	%i	-1.23		-1,23 EUR
+de_DE.ISO-8859-1	%i	1234.56		1.234,56 EUR
+de_DE.ISO-8859-1	%^i	1234.56		1234,56 EUR
+de_DE.ISO-8859-1	%+i	1234.56		1.234,56 EUR
+de_DE.ISO-8859-1	%+i	-1234.56	-1.234,56 EUR
+de_DE.ISO-8859-1	%(i	1234.56		1.234,56 EUR
+de_DE.ISO-8859-1	%(i	-1234.56	(1.234,56 EUR)
+de_DE.ISO-8859-1	%^i	1234.56		1234,56 EUR
+de_DE.ISO-8859-1	%#5n	123.45		    123,45 EUR
+de_DE.ISO-8859-1	%#5n	-123.45		-   123,45 EUR
+de_DE.ISO-8859-1	%#5n	3456.781	  3.456,78 EUR
+de_DE.ISO-8859-1	%=*#5n	123.45		 ***123,45 EUR
+de_DE.ISO-8859-1	%=*#5n	-123.45		-***123,45 EUR
+de_DE.ISO-8859-1	%=*#5n	3456.781	 *3.456,78 EUR
+de_DE.ISO-8859-1	%=0#5n	123.45		 000123,45 EUR
+de_DE.ISO-8859-1	%=0#5n	-123.45		-000123,45 EUR
+de_DE.ISO-8859-1	%=0#5n	3456.781	 03.456,78 EUR
+de_DE.ISO-8859-1	%^#5n	123.45		   123,45 EUR
+de_DE.ISO-8859-1	%^#5n	-123.45		-  123,45 EUR
+de_DE.ISO-8859-1	%^#5n	3456.781	  3456,78 EUR
+de_DE.ISO-8859-1	%^#5.0n	123.45		   123 EUR
+de_DE.ISO-8859-1	%^#5.0n	-123.45		-  123 EUR
+de_DE.ISO-8859-1	%^#5.0n	3456.781	  3457 EUR
+de_DE.ISO-8859-1	%^#5.4n	123.45		   123,4500 EUR
+de_DE.ISO-8859-1	%^#5.4n	-123.45		-  123,4500 EUR
+de_DE.ISO-8859-1	%^#5.4n	3456.781	  3456,7810 EUR
+de_DE.ISO-8859-1	%(#5n	123.45		    123,45 EUR
+de_DE.ISO-8859-1	%(#5n	-123.45		(   123,45 EUR)
+de_DE.ISO-8859-1	%(#5n	3456.781	  3.456,78 EUR
 de_DE.ISO-8859-1	%!(#5n	123.45		    123,45
 de_DE.ISO-8859-1	%!(#5n	-123.45		(   123,45)
 de_DE.ISO-8859-1	%!(#5n	3456.781	  3.456,78

My thanks to everyone working on glibc.
-- 
They that can give up essential liberty to obtain a little temporary
safety deserve neither liberty nor safety.
 -- Benjamin Franklin, Historical Review of Pennsylvania, 1759
Follow-Ups:
- Re: [PATCH] patches for glibc-2-2-branch
  - From: Andreas Jaeger
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]