lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

Rename __WORDSIZE_COMPAT32 to __WORDSIZE_TIME64_COMPAT32

Browse Source
This commit is contained in:
H.J. Lu
2012-05-21 13:39:55 -07:00
parent d8d1017e5e
commit 20c07380db
9 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@@ -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> 2012-05-21 Andreas Jaeger <aj@suse.de>
* sysdeps/i386/i686/multiarch/wcschr-c.c: Redefine libc_hidden_def * sysdeps/i386/i686/multiarch/wcschr-c.c: Redefine libc_hidden_def

7
sysdeps/gnu/bits/utmp.h
View File

@@ -1,6 +1,5 @@
/* The `struct utmp' type, describing entries in the utmp file. GNU version. /* The `struct utmp' type, describing entries in the utmp file. GNU version.
Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002 Copyright (C) 1993-2012 Free Software Foundation, Inc.
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -36,7 +35,7 @@
previous logins. */ previous logins. */
struct lastlog struct lastlog
{ {
#if __WORDSIZE == 64 && defined __WORDSIZE_COMPAT32 #ifdef __WORDSIZE_TIME64_COMPAT32
int32_t ll_time; int32_t ll_time;
#else #else
__time_t ll_time; __time_t ll_time;
@@ -69,7 +68,7 @@ struct utmp
/* The ut_session and ut_tv fields must be the same size when compiled /* 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 32- and 64-bit. This allows data files and shared memory to be
shared between 32- and 64-bit applications. */ 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. */ int32_t ut_session; /* Session ID, used for windowing. */
struct struct
{ {

4
sysdeps/gnu/bits/utmpx.h
View File

@@ -1,5 +1,5 @@
/* Structures and definitions for the user accounting database. GNU version. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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 /* 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 32- and 64-bit. This allows files and shared memory to be shared
between 32- and 64-bit applications. */ 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. */ __int32_t ut_session; /* Session ID, used for windowing. */
struct struct
{ {

2
sysdeps/powerpc/powerpc32/bits/wordsize.h
View File

@@ -2,7 +2,7 @@
#if defined __powerpc64__ #if defined __powerpc64__
# define __WORDSIZE 64 # define __WORDSIZE 64
# define __WORDSIZE_COMPAT32 1 # define __WORDSIZE_TIME64_COMPAT32 1
#else #else
# define __WORDSIZE 32 # define __WORDSIZE 32
#endif #endif

2
sysdeps/powerpc/powerpc64/bits/wordsize.h
View File

@@ -2,7 +2,7 @@
#if defined __powerpc64__ #if defined __powerpc64__
# define __WORDSIZE 64 # define __WORDSIZE 64
# define __WORDSIZE_COMPAT32 1 # define __WORDSIZE_TIME64_COMPAT32 1
#else #else
# define __WORDSIZE 32 # define __WORDSIZE 32
#endif #endif

2
sysdeps/sparc/sparc32/bits/wordsize.h
View File

@@ -2,7 +2,7 @@
#if defined __arch64__ || defined __sparcv9 #if defined __arch64__ || defined __sparcv9
# define __WORDSIZE 64 # define __WORDSIZE 64
# define __WORDSIZE_COMPAT32 1 # define __WORDSIZE_TIME64_COMPAT32 1
#else #else
# define __WORDSIZE 32 # define __WORDSIZE 32
#endif #endif

2
sysdeps/sparc/sparc64/bits/wordsize.h
View File

@@ -2,7 +2,7 @@
#if defined __arch64__ || defined __sparcv9 #if defined __arch64__ || defined __sparcv9
# define __WORDSIZE 64 # define __WORDSIZE 64
# define __WORDSIZE_COMPAT32 1 # define __WORDSIZE_TIME64_COMPAT32 1
#else #else
# define __WORDSIZE 32 # define __WORDSIZE 32
#endif #endif

2
sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h
View File

@@ -2,7 +2,7 @@
#if defined __powerpc64__ #if defined __powerpc64__
# define __WORDSIZE 64 # define __WORDSIZE 64
# define __WORDSIZE_COMPAT32 1 # define __WORDSIZE_TIME64_COMPAT32 1
#else #else
# define __WORDSIZE 32 # define __WORDSIZE 32
#endif #endif

2
sysdeps/x86_64/bits/wordsize.h
View File

@@ -2,12 +2,12 @@
#if defined __x86_64__ && !defined __ILP32__ #if defined __x86_64__ && !defined __ILP32__
# define __WORDSIZE 64 # define __WORDSIZE 64
# define __WORDSIZE_COMPAT32 1
#else #else
# define __WORDSIZE 32 # define __WORDSIZE 32
#endif #endif
#ifdef __x86_64__ #ifdef __x86_64__
# define __WORDSIZE_TIME64_COMPAT32 1
/* Both x86-64 and x32 use the 64-bit system call interface. */ /* Both x86-64 and x32 use the 64-bit system call interface. */
# define __SYSCALL_WORDSIZE 64 # define __SYSCALL_WORDSIZE 64
#endif #endif