Update.

	* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Define SHM_HUGETLB.
	* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/ia64/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/s390/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/shm.h: Likewise.
	Patch by William Lee Irwin <wli@holomorphy.com>.

2002-12-20  Andreas Schwab  <schwab@suse.de>

	* locale/programs/ld-measurement.c (measurement_output): Fix
	index calculation.

2002-12-20  Ulrich Drepper  <drepper@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 227655be5f79ac33afe217fa87152df637bba74c..81056fb20ff1a4f28278f89eccdf27e188348cd3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2002-12-20  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/alpha/bits/shm.h: Define SHM_HUGETLB.
+       * sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
+       * sysdeps/unix/sysv/linux/hppa/bits/shm.h: Likewise.
+       * sysdeps/unix/sysv/linux/ia64/bits/shm.h: Likewise.
+       * sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise.
+       * sysdeps/unix/sysv/linux/s390/bits/shm.h: Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
+       * sysdeps/unix/sysv/linux/x86_64/bits/shm.h: Likewise.
+       Patch by William Lee Irwin <wli@holomorphy.com>.
+
+2002-12-20  Andreas Schwab  <schwab@suse.de>
+
+       * locale/programs/ld-measurement.c (measurement_output): Fix
+       index calculation.
+
 2002-12-20  Ulrich Drepper  <drepper@redhat.com>
 
        * include/libio.h [_IO_MTSAFE_IO && _IO_lock_inexpensive]:

diff --git a/locale/programs/ld-measurement.c b/locale/programs/ld-measurement.c
index 2aa75b47dc088546d53ca3e6eaf28862401c6fb3..e3ec90199e9e32c9cace57cf0e0351f40950994b 100644 (file)
--- a/locale/programs/ld-measurement.c
+++ b/locale/programs/ld-measurement.c
@@ -143,7 +143,7 @@ measurement_output (struct localedef_t *locale,
   iov[cnt].iov_len = 1;
   ++cnt;
 
-  idx[cnt - 2] = iov[0].iov_len + iov[1].iov_len;
+  idx[cnt - 2] = idx[cnt - 3] + iov[cnt - 1].iov_len;
   iov[cnt].iov_base = (void *) charmap->code_set_name;
   iov[cnt].iov_len = strlen (iov[cnt].iov_base) + 1;
   ++cnt;

diff --git a/nptl/Banner b/nptl/Banner
index 60acf42c6a36a4cd45486d410db35e4759640154..69e4cc92ab21d99ffe0956dcb52af1a3dabc74fc 100644 (file)
--- a/nptl/Banner
+++ b/nptl/Banner
@@ -1 +1 @@
-nptl 0.12 by Ulrich Drepper
+nptl 0.13 by Ulrich Drepper

diff --git a/sysdeps/unix/sysv/linux/alpha/bits/shm.h b/sysdeps/unix/sysv/linux/alpha/bits/shm.h
index ae51e75452ca41a499937e4fedc2aff215b52169..418426511ccb53a747384c42b264a6d67b221750 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/shm.h
@@ -67,6 +67,7 @@ struct shmid_ds
 /* shm_mode upper byte flags */
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
+# define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
 
 struct shminfo
   {

diff --git a/sysdeps/unix/sysv/linux/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h
index 1368df02e0b214260fbf3301f64cc3a66ee4246a..6d5c88d596376bb0697e557a7b842485b2c6c10c 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/bits/shm.h
@@ -70,6 +70,7 @@ struct shmid_ds
 /* shm_mode upper byte flags */
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
+# define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
 
 struct shminfo
   {

diff --git a/sysdeps/unix/sysv/linux/hppa/bits/shm.h b/sysdeps/unix/sysv/linux/hppa/bits/shm.h
index a07213caa831121983045da95549858c6a1f3706..1c022fda83c9e505f328f57d6d6057e371f40bc5 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/shm.h
@@ -78,6 +78,7 @@ struct shmid_ds
 /* shm_mode upper byte flags */
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
+# define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
 
 struct shminfo
   {

diff --git a/sysdeps/unix/sysv/linux/ia64/bits/shm.h b/sysdeps/unix/sysv/linux/ia64/bits/shm.h
index 2985d88fc92edbbb3c074f2cfaa8e70ea37fe6e6..078345d7e6be68031e0c557487a4147ddb76d596 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/shm.h
@@ -63,6 +63,7 @@ struct shmid_ds
 /* shm_mode upper byte flags */
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
+# define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
 
 struct shminfo
   {

diff --git a/sysdeps/unix/sysv/linux/mips/bits/shm.h b/sysdeps/unix/sysv/linux/mips/bits/shm.h
index 85b286e9de5f6b9138a5a756d8bcf44904aac770..a512afeddfccbfd4f434efb0f90076359fd0b50b 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/shm.h
@@ -67,6 +67,7 @@ struct shmid_ds
 /* shm_mode upper byte flags */
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
+# define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
 
 struct shminfo
   {

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
index 5316f0985befce5a8a13004d39eee38bb96813f2..38379ace79cb904d8bc638fc32009aa113a47ab7 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
@@ -79,6 +79,7 @@ struct shmid_ds
 /* shm_mode upper byte flags */
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
+# define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
 
 struct shminfo
   {

diff --git a/sysdeps/unix/sysv/linux/s390/bits/shm.h b/sysdeps/unix/sysv/linux/s390/bits/shm.h
index 44e0adcfa816d960da6388efbe67cd4e9af39e18..682e24e8b2ae52252731d2c3322a3da9e20c1f30 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/shm.h
@@ -77,6 +77,7 @@ struct shmid_ds
 /* shm_mode upper byte flags */
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
+# define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
 
 struct shminfo
   {

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/shm.h b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
index c85b07a671f92a1ba358d12ea4ca3e28f3edf5d2..144f311740790b92e8e8d8054ffc67e2f3b0f4d5 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
@@ -77,6 +77,7 @@ struct shmid_ds
 /* shm_mode upper byte flags */
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
+# define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
 
 struct shminfo
   {

diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
index 142bf9073db9904af6c5b1e0d7dc335454647e1c..005d643bbf11e060c992c3330f4bb0b58a4720a9 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
@@ -76,6 +76,7 @@ struct shmid_ds
 /* shm_mode upper byte flags */
 # define SHM_DEST      01000   /* segment will be destroyed on last detach */
 # define SHM_LOCKED    02000   /* segment will not be swapped */
+# define SHM_HUGETLB   04000   /* segment is mapped via hugetlb */
 
 struct shminfo
   {