Rename __WORDSIZE_COMPAT32 to __WORDSIZE_TIME64_COMPAT32

diff --git a/ChangeLog b/ChangeLog
index dbf2fa289f0a1b4e15bc979495abb1e6a8e3322a..f753baa5e9e4f9960bffe925ef4256d688ea5c8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-05-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/gnu/bits/utmp.h (struct lastlog): Check
+       [__WORDSIZE_TIME64_COMPAT32] instead of
+       [__WORDSIZE == 64 && __WORDSIZE_COMPAT32].
+       (struct utmp): Likewise.
+       * sysdeps/gnu/bits/utmpx.h (struct utmpx): Likewise.
+       * sysdeps/powerpc/powerpc32/bits/wordsize.h (__WORDSIZE_COMPAT32):
+       Renamed to ...
+       (__WORDSIZE_TIME64_COMPAT32): This.
+       * sysdeps/powerpc/powerpc64/bits/wordsize.h: Likewise.
+       * sysdeps/sparc/sparc32/bits/wordsize.h: Likewise.
+       * sysdeps/sparc/sparc64/bits/wordsize.h: Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h: Likewise.
+       * sysdeps/x86_64/bits/wordsize.h (__WORDSIZE_COMPAT32): Removed.
+       (__WORDSIZE_TIME64_COMPAT32): New macro.
+
 2012-05-21  Andreas Jaeger  <aj@suse.de>
 
        * sysdeps/i386/i686/multiarch/wcschr-c.c: Redefine libc_hidden_def

diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h
index c13380ab8e88027ee986e557d1fdd6711b1b0e9e..aed2750bba128ab1a41c841e113478a81ac76d22 100644 (file)
--- a/sysdeps/gnu/bits/utmp.h
+++ b/sysdeps/gnu/bits/utmp.h
@@ -1,6 +1,5 @@
 /* The `struct utmp' type, describing entries in the utmp file.  GNU version.
-   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 1993-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
@@ -36,7 +35,7 @@
    previous logins.  */
 struct lastlog
   {
-#if __WORDSIZE == 64 && defined __WORDSIZE_COMPAT32
+#ifdef __WORDSIZE_TIME64_COMPAT32
     int32_t ll_time;
 #else
     __time_t ll_time;
@@ -69,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.  */
-#if __WORDSIZE == 64 && defined __WORDSIZE_COMPAT32
+#ifdef __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 87626f085a01c4f15d0e24a123e76e2e36377c6e..f8716ca124dba431e2ab99356397c24e23247ec0 100644 (file)
--- a/sysdeps/gnu/bits/utmpx.h
+++ b/sysdeps/gnu/bits/utmpx.h
@@ -1,5 +1,5 @@
 /* Structures and definitions for the user accounting database.  GNU version.
-   Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997-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
@@ -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.  */
-#if __WORDSIZE == 64 && defined __WORDSIZE_COMPAT32
+#ifdef __WORDSIZE_TIME64_COMPAT32
   __int32_t ut_session;                /* Session ID, used for windowing.  */
   struct
   {

diff --git a/sysdeps/powerpc/powerpc32/bits/wordsize.h b/sysdeps/powerpc/powerpc32/bits/wordsize.h
index 1a79c86364f9d75e915c97b9f592452282c119e5..f31ac9ab083a17cf684a90f6e278a67e0a7da698 100644 (file)
--- a/sysdeps/powerpc/powerpc32/bits/wordsize.h
+++ b/sysdeps/powerpc/powerpc32/bits/wordsize.h
@@ -2,7 +2,7 @@
 
 #if defined __powerpc64__
 # define __WORDSIZE    64
-# define __WORDSIZE_COMPAT32   1
+# define __WORDSIZE_TIME64_COMPAT32    1
 #else
 # define __WORDSIZE    32
 #endif

diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h b/sysdeps/powerpc/powerpc64/bits/wordsize.h
index 1a79c86364f9d75e915c97b9f592452282c119e5..f31ac9ab083a17cf684a90f6e278a67e0a7da698 100644 (file)
--- a/sysdeps/powerpc/powerpc64/bits/wordsize.h
+++ b/sysdeps/powerpc/powerpc64/bits/wordsize.h
@@ -2,7 +2,7 @@
 
 #if defined __powerpc64__
 # define __WORDSIZE    64
-# define __WORDSIZE_COMPAT32   1
+# define __WORDSIZE_TIME64_COMPAT32    1
 #else
 # define __WORDSIZE    32
 #endif

diff --git a/sysdeps/sparc/sparc32/bits/wordsize.h b/sysdeps/sparc/sparc32/bits/wordsize.h
index 0dee88b284297143b3aee031bfae98811b1ea6d3..d8fd1a513dc9c2eec4e7e6398231c40d3db12123 100644 (file)
--- a/sysdeps/sparc/sparc32/bits/wordsize.h
+++ b/sysdeps/sparc/sparc32/bits/wordsize.h
@@ -2,7 +2,7 @@
 
 #if defined __arch64__ || defined __sparcv9
 # define __WORDSIZE    64
-# define __WORDSIZE_COMPAT32   1
+# define __WORDSIZE_TIME64_COMPAT32    1
 #else
 # define __WORDSIZE    32
 #endif

diff --git a/sysdeps/sparc/sparc64/bits/wordsize.h b/sysdeps/sparc/sparc64/bits/wordsize.h
index 0dee88b284297143b3aee031bfae98811b1ea6d3..d8fd1a513dc9c2eec4e7e6398231c40d3db12123 100644 (file)
--- a/sysdeps/sparc/sparc64/bits/wordsize.h
+++ b/sysdeps/sparc/sparc64/bits/wordsize.h
@@ -2,7 +2,7 @@
 
 #if defined __arch64__ || defined __sparcv9
 # define __WORDSIZE    64
-# define __WORDSIZE_COMPAT32   1
+# define __WORDSIZE_TIME64_COMPAT32    1
 #else
 # define __WORDSIZE    32
 #endif

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
index cf934234f18a667a5f9b66667c46c67243c92c3a..3e8a1e0a15f409ce26588146119a5ce9d7138b3f 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
@@ -2,7 +2,7 @@
 
 #if defined __powerpc64__
 # define __WORDSIZE    64
-# define __WORDSIZE_COMPAT32   1
+# define __WORDSIZE_TIME64_COMPAT32    1
 #else
 # define __WORDSIZE    32
 #endif

diff --git a/sysdeps/x86_64/bits/wordsize.h b/sysdeps/x86_64/bits/wordsize.h
index e4d5fe71ef968a6b5d63aa8924de18019833bfcd..e25af287e8a36194813ef383defb8044546b2fde 100644 (file)
--- a/sysdeps/x86_64/bits/wordsize.h
+++ b/sysdeps/x86_64/bits/wordsize.h
@@ -2,12 +2,12 @@
 
 #if defined __x86_64__ && !defined __ILP32__
 # define __WORDSIZE    64
-# define __WORDSIZE_COMPAT32   1
 #else
 # define __WORDSIZE    32
 #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
 #endif