This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-927-g5762f7a
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 May 2012 18:49:06 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-927-g5762f7a
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5762f7aeff67505c9f939f47ef7df18d813f4c04 (commit)
via a26b68566485e96ef8f8bdc71d229d4c6d709ad5 (commit)
via cb2b9ef758924cb55ea2fcdd09c08158bd7c5e5d (commit)
from 34683bb01bd2c65e1d124bf54e13f3c54779efd0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5762f7aeff67505c9f939f47ef7df18d813f4c04
commit 5762f7aeff67505c9f939f47ef7df18d813f4c04
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed May 16 11:48:54 2012 -0700
Add x32 support to x86_64/bits/shm.h
diff --git a/ChangeLog b/ChangeLog
index efdbdd5..28ca2d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/unix/sysv/linux/x86_64/bits/shm.h (shmatt_t): Use
+ __syscall_ulong_t.
+ (shmid_ds): Add __unused1 and __unused2 only if __x86_64__ isn't
+ defined. Use __syscall_ulong_t.
+ (shminfo): Use __syscall_ulong_t.
+ (shm_info): Likewise.
+
+2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/unix/sysv/linux/x86_64/bits/sem.h (semid_ds): Use
__syscall_ulong_t.
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
index d95d544..cba25ed 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/shm.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 2000, 2002, 2004, 2009
- Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -44,7 +43,7 @@ extern int __getpagesize (void) __THROW __attribute__ ((__const__));
/* Type to count number of attaches. */
-typedef unsigned long int shmatt_t;
+typedef __syscall_ulong_t shmatt_t;
/* Data structure describing a shared memory segment. */
struct shmid_ds
@@ -52,22 +51,22 @@ struct shmid_ds
struct ipc_perm shm_perm; /* operation permission struct */
size_t shm_segsz; /* size of segment in bytes */
__time_t shm_atime; /* time of last shmat() */
-#if __WORDSIZE == 32
+#ifndef __x86_64__
unsigned long int __unused1;
#endif
__time_t shm_dtime; /* time of last shmdt() */
-#if __WORDSIZE == 32
+#ifndef __x86_64__
unsigned long int __unused2;
#endif
__time_t shm_ctime; /* time of last change by shmctl() */
-#if __WORDSIZE == 32
+#ifndef __x86_64__
unsigned long int __unused3;
#endif
__pid_t shm_cpid; /* pid of creator */
__pid_t shm_lpid; /* pid of last shmop */
shmatt_t shm_nattch; /* number of current attaches */
- unsigned long int __unused4;
- unsigned long int __unused5;
+ __syscall_ulong_t __unused4;
+ __syscall_ulong_t __unused5;
};
#ifdef __USE_MISC
@@ -84,25 +83,25 @@ struct shmid_ds
struct shminfo
{
- unsigned long int shmmax;
- unsigned long int shmmin;
- unsigned long int shmmni;
- unsigned long int shmseg;
- unsigned long int shmall;
- unsigned long int __unused1;
- unsigned long int __unused2;
- unsigned long int __unused3;
- unsigned long int __unused4;
+ __syscall_ulong_t shmmax;
+ __syscall_ulong_t shmmin;
+ __syscall_ulong_t shmmni;
+ __syscall_ulong_t shmseg;
+ __syscall_ulong_t shmall;
+ __syscall_ulong_t __unused1;
+ __syscall_ulong_t __unused2;
+ __syscall_ulong_t __unused3;
+ __syscall_ulong_t __unused4;
};
struct shm_info
{
int used_ids;
- unsigned long int shm_tot; /* total allocated shm */
- unsigned long int shm_rss; /* total resident shm */
- unsigned long int shm_swp; /* total swapped shm */
- unsigned long int swap_attempts;
- unsigned long int swap_successes;
+ __syscall_ulong_t shm_tot; /* total allocated shm */
+ __syscall_ulong_t shm_rss; /* total resident shm */
+ __syscall_ulong_t shm_swp; /* total swapped shm */
+ __syscall_ulong_t swap_attempts;
+ __syscall_ulong_t swap_successes;
};
#endif /* __USE_MISC */
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a26b68566485e96ef8f8bdc71d229d4c6d709ad5
commit a26b68566485e96ef8f8bdc71d229d4c6d709ad5
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed May 16 11:47:22 2012 -0700
Add x32 support to x86_64/bits/sem.h
diff --git a/ChangeLog b/ChangeLog
index 2c13f35..efdbdd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/unix/sysv/linux/x86_64/bits/sem.h (semid_ds): Use
+ __syscall_ulong_t.
+
+2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/unix/sysv/linux/x86_64/bits/msq.h: Don't include
<bits/wordsize.h>.
(msgqnum_t): Use __syscall_ulong_t.
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
index f5831d7..92bbcef 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -39,12 +39,12 @@ struct semid_ds
{
struct ipc_perm sem_perm; /* operation permission struct */
__time_t sem_otime; /* last semop() time */
- unsigned long int __unused1;
+ __syscall_ulong_t __unused1;
__time_t sem_ctime; /* last time changed by semctl() */
- unsigned long int __unused2;
- unsigned long int sem_nsems; /* number of semaphores in set */
- unsigned long int __unused3;
- unsigned long int __unused4;
+ __syscall_ulong_t __unused2;
+ __syscall_ulong_t sem_nsems; /* number of semaphores in set */
+ __syscall_ulong_t __unused3;
+ __syscall_ulong_t __unused4;
};
/* The user should define a union like the following to use it for arguments
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cb2b9ef758924cb55ea2fcdd09c08158bd7c5e5d
commit cb2b9ef758924cb55ea2fcdd09c08158bd7c5e5d
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed May 16 11:45:19 2012 -0700
Add x32 support to x86_64/bits/msq.h
diff --git a/ChangeLog b/ChangeLog
index f395055..2c13f35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/unix/sysv/linux/x86_64/bits/msq.h: Don't include
+ <bits/wordsize.h>.
+ (msgqnum_t): Use __syscall_ulong_t.
+ (msglen_t): Likewise.
+ (msqid_ds): Check __x86_64__ instead of __WORDSIZE. Use
+ __syscall_ulong_t.
+
+2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/unix/sysv/linux/x86_64/bits/a.out.h: Don't include
<bits/wordsize.h>. Check __x86_64__ instead of __WORDSIZE.
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/msq.h b/sysdeps/unix/sysv/linux/x86_64/bits/msq.h
index 8389107..7f23500 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/msq.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,6 @@
#endif
#include <bits/types.h>
-#include <bits/wordsize.h>
/* Define options for message queue functions. */
#define MSG_NOERROR 010000 /* no error if message is too big */
@@ -29,8 +28,8 @@
#endif
/* Types used in the structure definition. */
-typedef unsigned long int msgqnum_t;
-typedef unsigned long int msglen_t;
+typedef __syscall_ulong_t msgqnum_t;
+typedef __syscall_ulong_t msglen_t;
/* Structure of record for one message inside the kernel.
The type `struct msg' is opaque. */
@@ -38,24 +37,24 @@ struct msqid_ds
{
struct ipc_perm msg_perm; /* structure describing operation permission */
__time_t msg_stime; /* time of last msgsnd command */
-#if __WORDSIZE == 32
+#ifndef __x86_64__
unsigned long int __unused1;
#endif
__time_t msg_rtime; /* time of last msgrcv command */
-#if __WORDSIZE == 32
+#ifndef __x86_64__
unsigned long int __unused2;
#endif
__time_t msg_ctime; /* time of last change */
-#if __WORDSIZE == 32
+#ifndef __x86_64__
unsigned long int __unused3;
#endif
- unsigned long int __msg_cbytes; /* current number of bytes on queue */
+ __syscall_ulong_t __msg_cbytes; /* current number of bytes on queue */
msgqnum_t msg_qnum; /* number of messages currently on queue */
msglen_t msg_qbytes; /* max number of bytes allowed on queue */
__pid_t msg_lspid; /* pid of last msgsnd() */
__pid_t msg_lrpid; /* pid of last msgrcv() */
- unsigned long int __unused4;
- unsigned long int __unused5;
+ __syscall_ulong_t __unused4;
+ __syscall_ulong_t __unused5;
};
#ifdef __USE_MISC
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 23 +++++++++++++++
sysdeps/unix/sysv/linux/x86_64/bits/msq.h | 19 ++++++-------
sysdeps/unix/sysv/linux/x86_64/bits/sem.h | 12 ++++----
sysdeps/unix/sysv/linux/x86_64/bits/shm.h | 43 ++++++++++++++---------------
4 files changed, 59 insertions(+), 38 deletions(-)
hooks/post-receive
--
GNU C Library master sources