aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-20 10:32:08 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-20 10:32:08 +0000
commit48f936a240d666d8adaa342abb7c289dafb1ec03 (patch)
tree4a2e28d5605f6910593af47cba7de20f6a8f70e8
parent1561bf636d195795688e81b19fd42cdc2f5e6975 (diff)
downloadglibc-48f936a240d666d8adaa342abb7c289dafb1ec03.tar
glibc-48f936a240d666d8adaa342abb7c289dafb1ec03.tar.gz
glibc-48f936a240d666d8adaa342abb7c289dafb1ec03.tar.bz2
glibc-48f936a240d666d8adaa342abb7c289dafb1ec03.zip
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>
Diffstat
-rw-r--r--ChangeLog18
-rw-r--r--locale/programs/ld-measurement.c2
-rw-r--r--nptl/Banner2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/shm.h1
-rw-r--r--sysdeps/unix/sysv/linux/bits/shm.h1
-rw-r--r--sysdeps/unix/sysv/linux/hppa/bits/shm.h1
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/shm.h1
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/shm.h1
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/bits/shm.h1
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/shm.h1
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/shm.h1
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/bits/shm.h1
12 files changed, 29 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 227655be5f..81056fb20f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
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]:
Redefine _IO_flockifle and _IO_funlockfile as inlines.
diff --git a/locale/programs/ld-measurement.c b/locale/programs/ld-measurement.c
index 2aa75b47dc..e3ec90199e 100644
--- 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 60acf42c6a..69e4cc92ab 100644
--- 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 ae51e75452..418426511c 100644
--- 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 1368df02e0..6d5c88d596 100644
--- 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 a07213caa8..1c022fda83 100644
--- 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 2985d88fc9..078345d7e6 100644
--- 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 85b286e9de..a512afeddf 100644
--- 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 5316f0985b..38379ace79 100644
--- 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 44e0adcfa8..682e24e8b2 100644
--- 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 c85b07a671..144f311740 100644
--- 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 142bf9073d..005d643bbf 100644
--- 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
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 05:48:51 +0000