This is the mail archive of the glibc-cvs@sourceware.org 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]

GNU C Library master sources branch master updated. glibc-2.24-332-gd060cd0


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  d060cd002dab2c5800a3e47d4d5e63814775e958 (commit)
      from  95e431cc73c2df3bc606107d6f79c4683bd61102 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d060cd002dab2c5800a3e47d4d5e63814775e958

commit d060cd002dab2c5800a3e47d4d5e63814775e958
Author: Steve Ellcey <sellcey@caviumnetworks.com>
Date:   Fri Nov 4 09:37:44 2016 -0700

    Define wordsize.h macros everywhere
    
    	* bits/wordsize.h: Add documentation.
    	* sysdeps/aarch64/bits/wordsize.h : New file
    	* sysdeps/generic/stdint.h (PTRDIFF_MIN, PTRDIFF_MAX): Update
    	definitions.
    	(SIZE_MAX): Change ifdef to if in __WORDSIZE32_SIZE_ULONG check.
    	* sysdeps/gnu/bits/utmp.h (__WORDSIZE_TIME64_COMPAT32): Check
    	with #if instead of #ifdef.
    	* sysdeps/gnu/bits/utmpx.h (__WORDSIZE_TIME64_COMPAT32): Ditto.
    	* sysdeps/mips/bits/wordsize.h (__WORDSIZE32_SIZE_ULONG,
    	__WORDSIZE32_PTRDIFF_LONG, __WORDSIZE_TIME64_COMPAT32):
    	Add or change defines.
    	* sysdeps/powerpc/powerpc32/bits/wordsize.h: Likewise.
    	* sysdeps/powerpc/powerpc64/bits/wordsize.h: Likewise.
    	* sysdeps/s390/s390-32/bits/wordsize.h: Likewise.
    	* sysdeps/s390/s390-64/bits/wordsize.h: Likewise.
    	* sysdeps/sparc/sparc32/bits/wordsize.h: Likewise.
    	* sysdeps/sparc/sparc64/bits/wordsize.h: Likewise.
    	* sysdeps/tile/tilegx/bits/wordsize.h: Likewise.
    	* sysdeps/tile/tilepro/bits/wordsize.h: Likewise.
    	* sysdeps/unix/sysv/linux/alpha/bits/wordsize.h: Likewise.
    	* sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h: Likewise.
    	* sysdeps/unix/sysv/linux/sparc/bits/wordsize.h: Likewise.
    	* sysdeps/wordsize-32/bits/wordsize.h: Likewise.
    	* sysdeps/wordsize-64/bits/wordsize.h: Likewise.
    	* sysdeps/x86/bits/wordsize.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index dd5a7f9..8f84ac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2016-11-04  Yury Norov  <ynorov@caviumnetworks.com>
+	    Steve Ellcey  <sellcey@caviumnetworks.com>
+
+	* bits/wordsize.h: Add documentation.
+	* sysdeps/aarch64/bits/wordsize.h : New file
+	* sysdeps/generic/stdint.h (PTRDIFF_MIN, PTRDIFF_MAX): Update
+	definitions.
+	(SIZE_MAX): Change ifdef to if in __WORDSIZE32_SIZE_ULONG check.
+	* sysdeps/gnu/bits/utmp.h (__WORDSIZE_TIME64_COMPAT32): Check
+	with #if instead of #ifdef.
+	* sysdeps/gnu/bits/utmpx.h (__WORDSIZE_TIME64_COMPAT32): Ditto.
+	* sysdeps/mips/bits/wordsize.h (__WORDSIZE32_SIZE_ULONG,
+	__WORDSIZE32_PTRDIFF_LONG, __WORDSIZE_TIME64_COMPAT32):
+	Add or change defines.
+	* sysdeps/powerpc/powerpc32/bits/wordsize.h: Likewise.
+	* sysdeps/powerpc/powerpc64/bits/wordsize.h: Likewise.
+	* sysdeps/s390/s390-32/bits/wordsize.h: Likewise.
+	* sysdeps/s390/s390-64/bits/wordsize.h: Likewise.
+	* sysdeps/sparc/sparc32/bits/wordsize.h: Likewise.
+	* sysdeps/sparc/sparc64/bits/wordsize.h: Likewise.
+	* sysdeps/tile/tilegx/bits/wordsize.h: Likewise.
+	* sysdeps/tile/tilepro/bits/wordsize.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/wordsize.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/wordsize.h: Likewise.
+	* sysdeps/wordsize-32/bits/wordsize.h: Likewise.
+	* sysdeps/wordsize-64/bits/wordsize.h: Likewise.
+	* sysdeps/x86/bits/wordsize.h: Likewise.
+
 2016-11-04  Wilco Dijkstra  <wdijkstr@arm.com>
 	    Kevin Petit  <kevin.petit@arm.com>
 
diff --git a/bits/wordsize.h b/bits/wordsize.h
index 9ef0e85..14edae3 100644
--- a/bits/wordsize.h
+++ b/bits/wordsize.h
@@ -1 +1,27 @@
 #error "This file must be written based on the data type sizes of the target"
+
+/* The following entries are a template for what defines should be in the
+   wordsize.h header file for a target.  */
+
+/* Size in bits of the 'long int' and pointer types.  */
+#define __WORDSIZE
+
+/* This should be set to 1 if __WORDSIZE is 32 and size_t is type
+   'unsigned long' instead of type 'unsigned int'.  This will ensure
+   that SIZE_MAX is defined as an unsigned long constant instead of an
+   unsigned int constant.  Set to 0 if __WORDSIZE is 32 and size_t is
+   'unsigned int' and leave undefined if __WORDSIZE is 64.  */
+#define __WORDSIZE32_SIZE_ULONG
+
+/* This should be set to 1 if __WORDSIZE is 32 and ptrdiff_t is type 'long'
+   instead of type 'int'.  This will ensure that PTRDIFF_MIN and PTRDIFF_MAX
+   are defined as long constants instead of int constants.  Set to 0 if
+   __WORDSIZE is 32 and ptrdiff_t is type 'int' and leave undefined if
+   __WORDSIZE is 64.  */
+#define __WORDSIZE32_PTRDIFF_LONG
+
+/* Set to 1 in order to force time types to be 32 bits instead of 64 bits in
+   struct lastlog and struct utmp{,x} on 64-bit ports.  This may be done in
+   order to make 64-bit ports compatible with 32-bit ports.  Set to 0 for
+   64-bit ports where the time types are 64-bits or for any 32-bit ports.  */
+#define __WORDSIZE_TIME64_COMPAT32
diff --git a/sysdeps/wordsize-32/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h
similarity index 70%
copy from sysdeps/wordsize-32/bits/wordsize.h
copy to sysdeps/aarch64/bits/wordsize.h
index 2aa16bc..eadbb48 100644
--- a/sysdeps/wordsize-32/bits/wordsize.h
+++ b/sysdeps/aarch64/bits/wordsize.h
@@ -1,4 +1,6 @@
-/* Copyright (C) 1999-2016 Free Software Foundation, Inc.
+/* Determine the wordsize from the preprocessor defines.
+
+   Copyright (C) 2016 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
@@ -15,4 +17,12 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#define __WORDSIZE	32
+#ifdef __LP64__
+# define __WORDSIZE			64
+#else
+# define __WORDSIZE			32
+# define __WORDSIZE32_SIZE_ULONG	1
+# define __WORDSIZE32_PTRDIFF_LONG	1
+#endif
+
+#define __WORDSIZE_TIME64_COMPAT32	0
diff --git a/sysdeps/generic/stdint.h b/sysdeps/generic/stdint.h
index 5428dbc..8e4347c 100644
--- a/sysdeps/generic/stdint.h
+++ b/sysdeps/generic/stdint.h
@@ -249,8 +249,13 @@ typedef unsigned long long int	uintmax_t;
 #  define PTRDIFF_MIN		(-9223372036854775807L-1)
 #  define PTRDIFF_MAX		(9223372036854775807L)
 # else
-#  define PTRDIFF_MIN		(-2147483647-1)
-#  define PTRDIFF_MAX		(2147483647)
+#  if __WORDSIZE32_PTRDIFF_LONG
+#   define PTRDIFF_MIN		(-2147483647L-1)
+#   define PTRDIFF_MAX		(2147483647L)
+#  else
+#   define PTRDIFF_MIN		(-2147483647-1)
+#   define PTRDIFF_MAX		(2147483647)
+#  endif
 # endif
 
 /* Limits of `sig_atomic_t'.  */
@@ -261,7 +266,7 @@ typedef unsigned long long int	uintmax_t;
 # if __WORDSIZE == 64
 #  define SIZE_MAX		(18446744073709551615UL)
 # else
-#  ifdef __WORDSIZE32_SIZE_ULONG
+#  if __WORDSIZE32_SIZE_ULONG
 #   define SIZE_MAX		(4294967295UL)
 #  else
 #   define SIZE_MAX		(4294967295U)
diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h
index 2a1ffcb..bce1a7b 100644
--- a/sysdeps/gnu/bits/utmp.h
+++ b/sysdeps/gnu/bits/utmp.h
@@ -35,7 +35,7 @@
    previous logins.  */
 struct lastlog
   {
-#ifdef __WORDSIZE_TIME64_COMPAT32
+#if __WORDSIZE_TIME64_COMPAT32
     int32_t ll_time;
 #else
     __time_t ll_time;
@@ -68,7 +68,7 @@ struct utmp
 /* The ut_session and ut_tv fields must be the same size when compiled
    32- and 64-bit.  This allows data files and shared memory to be
    shared between 32- and 64-bit applications.  */
-#ifdef __WORDSIZE_TIME64_COMPAT32
+#if __WORDSIZE_TIME64_COMPAT32
   int32_t ut_session;		/* Session ID, used for windowing.  */
   struct
   {
diff --git a/sysdeps/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h
index b41548b..a438660 100644
--- a/sysdeps/gnu/bits/utmpx.h
+++ b/sysdeps/gnu/bits/utmpx.h
@@ -66,7 +66,7 @@ struct utmpx
 /* The fields ut_session and ut_tv must be the same size when compiled
    32- and 64-bit.  This allows files and shared memory to be shared
    between 32- and 64-bit applications.  */
-#ifdef __WORDSIZE_TIME64_COMPAT32
+#if __WORDSIZE_TIME64_COMPAT32
   __int32_t ut_session;		/* Session ID, used for windowing.  */
   struct
   {
diff --git a/sysdeps/mips/bits/wordsize.h b/sysdeps/mips/bits/wordsize.h
index bc90435..7a3546b 100644
--- a/sysdeps/mips/bits/wordsize.h
+++ b/sysdeps/mips/bits/wordsize.h
@@ -17,7 +17,15 @@
 
 #include <sgidefs.h>
 
-#define __WORDSIZE	_MIPS_SZPTR
+#define __WORDSIZE			_MIPS_SZPTR
+
 #if _MIPS_SIM == _ABI64
 # define __WORDSIZE_TIME64_COMPAT32	1
+#else
+# define __WORDSIZE_TIME64_COMPAT32	0
+#endif
+
+#if __WORDSIZE == 32
+#define __WORDSIZE32_SIZE_ULONG		0
+#define __WORDSIZE32_PTRDIFF_LONG	0
 #endif
diff --git a/sysdeps/powerpc/powerpc32/bits/wordsize.h b/sysdeps/powerpc/powerpc32/bits/wordsize.h
index f31ac9a..04ca9de 100644
--- a/sysdeps/powerpc/powerpc32/bits/wordsize.h
+++ b/sysdeps/powerpc/powerpc32/bits/wordsize.h
@@ -5,4 +5,7 @@
 # define __WORDSIZE_TIME64_COMPAT32	1
 #else
 # define __WORDSIZE	32
+# define __WORDSIZE_TIME64_COMPAT32	0
+# define __WORDSIZE32_SIZE_ULONG	0
+# define __WORDSIZE32_PTRDIFF_LONG	0
 #endif
diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h b/sysdeps/powerpc/powerpc64/bits/wordsize.h
index f31ac9a..04ca9de 100644
--- a/sysdeps/powerpc/powerpc64/bits/wordsize.h
+++ b/sysdeps/powerpc/powerpc64/bits/wordsize.h
@@ -5,4 +5,7 @@
 # define __WORDSIZE_TIME64_COMPAT32	1
 #else
 # define __WORDSIZE	32
+# define __WORDSIZE_TIME64_COMPAT32	0
+# define __WORDSIZE32_SIZE_ULONG	0
+# define __WORDSIZE32_PTRDIFF_LONG	0
 #endif
diff --git a/sysdeps/s390/s390-32/bits/wordsize.h b/sysdeps/s390/s390-32/bits/wordsize.h
index da791fa..c7a5fbf 100644
--- a/sysdeps/s390/s390-32/bits/wordsize.h
+++ b/sysdeps/s390/s390-32/bits/wordsize.h
@@ -5,8 +5,11 @@
 #else
 # define __WORDSIZE	32
 # define __WORDSIZE32_SIZE_ULONG       1
+# define __WORDSIZE32_PTRDIFF_LONG      0
 #endif
 
+#define __WORDSIZE_TIME64_COMPAT32     0
+
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
 
 /* Signal that we didn't used to have a `long double'. The changes all
diff --git a/sysdeps/s390/s390-64/bits/wordsize.h b/sysdeps/s390/s390-64/bits/wordsize.h
index da791fa..31e0ec6 100644
--- a/sysdeps/s390/s390-64/bits/wordsize.h
+++ b/sysdeps/s390/s390-64/bits/wordsize.h
@@ -5,8 +5,11 @@
 #else
 # define __WORDSIZE	32
 # define __WORDSIZE32_SIZE_ULONG       1
+# define __WORDSIZE32_PTRDIFF_LONG     0
 #endif
 
+#define __WORDSIZE_TIME64_COMPAT32     0
+
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
 
 /* Signal that we didn't used to have a `long double'. The changes all
diff --git a/sysdeps/sparc/sparc32/bits/wordsize.h b/sysdeps/sparc/sparc32/bits/wordsize.h
index d8fd1a5..2f66f10 100644
--- a/sysdeps/sparc/sparc32/bits/wordsize.h
+++ b/sysdeps/sparc/sparc32/bits/wordsize.h
@@ -5,4 +5,7 @@
 # define __WORDSIZE_TIME64_COMPAT32	1
 #else
 # define __WORDSIZE	32
+# define __WORDSIZE_TIME64_COMPAT32	0
+# define __WORDSIZE32_SIZE_ULONG	0
+# define __WORDSIZE32_PTRDIFF_LONG	0
 #endif
diff --git a/sysdeps/sparc/sparc64/bits/wordsize.h b/sysdeps/sparc/sparc64/bits/wordsize.h
index d8fd1a5..2f66f10 100644
--- a/sysdeps/sparc/sparc64/bits/wordsize.h
+++ b/sysdeps/sparc/sparc64/bits/wordsize.h
@@ -5,4 +5,7 @@
 # define __WORDSIZE_TIME64_COMPAT32	1
 #else
 # define __WORDSIZE	32
+# define __WORDSIZE_TIME64_COMPAT32	0
+# define __WORDSIZE32_SIZE_ULONG	0
+# define __WORDSIZE32_PTRDIFF_LONG	0
 #endif
diff --git a/sysdeps/tile/tilegx/bits/wordsize.h b/sysdeps/tile/tilegx/bits/wordsize.h
index 5d4e4b4..9dc4da5 100644
--- a/sysdeps/tile/tilegx/bits/wordsize.h
+++ b/sysdeps/tile/tilegx/bits/wordsize.h
@@ -5,4 +5,7 @@
 # define __WORDSIZE_TIME64_COMPAT32	1
 #else
 # define __WORDSIZE	32
+# define __WORDSIZE_TIME64_COMPAT32	0
+# define __WORDSIZE32_SIZE_ULONG	0
+# define __WORDSIZE32_PTRDIFF_LONG	0
 #endif
diff --git a/sysdeps/tile/tilepro/bits/wordsize.h b/sysdeps/tile/tilepro/bits/wordsize.h
index da587a2..8281538 100644
--- a/sysdeps/tile/tilepro/bits/wordsize.h
+++ b/sysdeps/tile/tilepro/bits/wordsize.h
@@ -1,3 +1,4 @@
 /* Determine the wordsize from the preprocessor defines.  */
 
-#define __WORDSIZE	32
+#define __WORDSIZE			32
+#define __WORDSIZE_TIME64_COMPAT32	0
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h b/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h
index 51fc433..f0961f6 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h
@@ -16,6 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #define __WORDSIZE	64
+#define __WORDSIZE_TIME64_COMPAT32	0
 
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
index 3e8a1e0..109f08c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
@@ -5,6 +5,9 @@
 # define __WORDSIZE_TIME64_COMPAT32	1
 #else
 # define __WORDSIZE	32
+# define __WORDSIZE_TIME64_COMPAT32	0
+# define __WORDSIZE32_SIZE_ULONG	0
+# define __WORDSIZE32_PTRDIFF_LONG	0
 #endif
 
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h
index 2d958d2..76d6579 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h
@@ -4,6 +4,8 @@
 # define __WORDSIZE	64
 #else
 # define __WORDSIZE	32
+# define __WORDSIZE32_SIZE_ULONG	0
+# define __WORDSIZE32_PTRDIFF_LONG	0
 #endif
 
 #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
diff --git a/sysdeps/wordsize-32/bits/wordsize.h b/sysdeps/wordsize-32/bits/wordsize.h
index 2aa16bc..a251f3a 100644
--- a/sysdeps/wordsize-32/bits/wordsize.h
+++ b/sysdeps/wordsize-32/bits/wordsize.h
@@ -15,4 +15,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#define __WORDSIZE	32
+#define __WORDSIZE			32
+#define __WORDSIZE_TIME64_COMPAT32	0
+#define __WORDSIZE32_SIZE_ULONG		0
+#define __WORDSIZE32_PTRDIFF_LONG	0
diff --git a/sysdeps/wordsize-64/bits/wordsize.h b/sysdeps/wordsize-64/bits/wordsize.h
index 0944f9e..8b5c502 100644
--- a/sysdeps/wordsize-64/bits/wordsize.h
+++ b/sysdeps/wordsize-64/bits/wordsize.h
@@ -15,4 +15,5 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#define __WORDSIZE	64
+#define __WORDSIZE			64
+#define __WORDSIZE_TIME64_COMPAT32	0
diff --git a/sysdeps/x86/bits/wordsize.h b/sysdeps/x86/bits/wordsize.h
index e25af28..70f652b 100644
--- a/sysdeps/x86/bits/wordsize.h
+++ b/sysdeps/x86/bits/wordsize.h
@@ -4,10 +4,14 @@
 # define __WORDSIZE	64
 #else
 # define __WORDSIZE	32
+#define __WORDSIZE32_SIZE_ULONG		0
+#define __WORDSIZE32_PTRDIFF_LONG	0
 #endif
 
 #ifdef __x86_64__
 # define __WORDSIZE_TIME64_COMPAT32	1
 /* Both x86-64 and x32 use the 64-bit system call interface.  */
 # define __SYSCALL_WORDSIZE		64
+#else
+# define __WORDSIZE_TIME64_COMPAT32	0
 #endif

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   29 ++++++++++++++++++++
 bits/wordsize.h                                    |   26 +++++++++++++++++
 .../strcspn-ppc64.c => aarch64/bits/wordsize.h}    |   16 ++++++-----
 sysdeps/generic/stdint.h                           |   11 +++++--
 sysdeps/gnu/bits/utmp.h                            |    4 +-
 sysdeps/gnu/bits/utmpx.h                           |    2 +-
 sysdeps/mips/bits/wordsize.h                       |   10 ++++++-
 sysdeps/powerpc/powerpc32/bits/wordsize.h          |    3 ++
 sysdeps/powerpc/powerpc64/bits/wordsize.h          |    3 ++
 sysdeps/s390/s390-32/bits/wordsize.h               |    3 ++
 sysdeps/s390/s390-64/bits/wordsize.h               |    3 ++
 sysdeps/sparc/sparc32/bits/wordsize.h              |    3 ++
 sysdeps/sparc/sparc64/bits/wordsize.h              |    3 ++
 sysdeps/tile/tilegx/bits/wordsize.h                |    3 ++
 sysdeps/tile/tilepro/bits/wordsize.h               |    3 +-
 sysdeps/unix/sysv/linux/alpha/bits/wordsize.h      |    1 +
 sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h    |    3 ++
 sysdeps/unix/sysv/linux/sparc/bits/wordsize.h      |    2 +
 sysdeps/wordsize-32/bits/wordsize.h                |    5 +++-
 sysdeps/wordsize-64/bits/wordsize.h                |    3 +-
 sysdeps/x86/bits/wordsize.h                        |    4 +++
 21 files changed, 123 insertions(+), 17 deletions(-)
 copy sysdeps/{powerpc/powerpc64/multiarch/strcspn-ppc64.c => aarch64/bits/wordsize.h} (76%)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]