Update.
* login/programs/utmpdump.c (print_entry): Cast tv_usec to long to match format string. * sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c (union semun): Add __old_buf. (__new_semctl): Shut up warning. * sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h (_dl_string_hwcap): Add __attribute__ ((always_inline)). 2003-08-26 Jakub Jelinek <jakub@redhat.com>
This commit is contained in:
parent
13b3edfc73
commit
a49daee2ef
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2003-08-26 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* login/programs/utmpdump.c (print_entry): Cast tv_usec to long
|
||||
to match format string.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c (union semun): Add
|
||||
__old_buf.
|
||||
(__new_semctl): Shut up warning.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h
|
||||
(_dl_string_hwcap): Add __attribute__ ((always_inline)).
|
||||
|
||||
2003-08-26 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* elf/ldconfig.c (search_dir): When checking for GNU-style .so
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* utmpdump - dump utmp-like files.
|
||||
Copyright (C) 1997, 2002 Free Software Foundation, Inc.
|
||||
Copyright (C) 1997, 2002, 2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
|
||||
|
||||
|
@ -28,16 +28,16 @@ static void
|
|||
print_entry (struct utmp *up)
|
||||
{
|
||||
/* Mixed 32-/64-bit systems may have timeval structs of different sixe
|
||||
but need struct utmp to be the same size. So in 64-bit up->ut_tv may
|
||||
but need struct utmp to be the same size. So in 64-bit up->ut_tv may
|
||||
not be a timeval but a struct of __int32_t's. This would cause a compile
|
||||
time warning and a formating error when 32-bit int is passed where
|
||||
a 64-bit long is expected. So copy up->up_tv to a temporary timeval.
|
||||
This is 32-/64-bit agnostic and expands the timeval fields to the
|
||||
This is 32-/64-bit agnostic and expands the timeval fields to the
|
||||
expected size as needed. */
|
||||
struct timeval temp_tv;
|
||||
temp_tv.tv_sec = up->ut_tv.tv_sec;
|
||||
temp_tv.tv_usec = up->ut_tv.tv_usec;
|
||||
|
||||
|
||||
(printf) (
|
||||
/* The format string. */
|
||||
#if _HAVE_UT_TYPE
|
||||
|
@ -74,7 +74,7 @@ print_entry (struct utmp *up)
|
|||
#endif
|
||||
#if _HAVE_UT_TV
|
||||
, 4 + ctime (&temp_tv.tv_sec)
|
||||
, temp_tv.tv_usec
|
||||
, (long int) temp_tv.tv_usec
|
||||
#else
|
||||
, 4 + ctime (&up->ut_time)
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* Linux/sparc32 version of processor capability information handling macros.
|
||||
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
|
||||
|
||||
|
@ -50,7 +50,7 @@ _dl_hwcap_string (int idx)
|
|||
};
|
||||
|
||||
static inline int
|
||||
__attribute__ ((unused))
|
||||
__attribute__ ((unused, always_inline))
|
||||
_dl_string_hwcap (const char *str)
|
||||
{
|
||||
int i;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* Semctl for architectures where word sized unions are passed indirectly
|
||||
Copyright (C) 1995, 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
|
||||
Copyright (C) 1995,1997,1998,2000,2002,2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
||||
|
||||
|
@ -49,6 +49,7 @@ union semun
|
|||
struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */
|
||||
unsigned short int *array; /* array for GETALL & SETALL */
|
||||
struct seminfo *__buf; /* buffer for IPC_INFO */
|
||||
struct __old_semid_ds *__old_buf;
|
||||
};
|
||||
|
||||
#include <bp-checks.h>
|
||||
|
@ -168,7 +169,7 @@ __new_semctl (int semid, int semnum, int cmd, ...)
|
|||
#endif
|
||||
|
||||
buf = arg.buf;
|
||||
arg.buf = (struct semid_ds *)&old;
|
||||
arg.__old_buf = &old;
|
||||
if (cmd == IPC_SET)
|
||||
{
|
||||
old.sem_perm.uid = buf->sem_perm.uid;
|
||||
|
|
Loading…
Reference in New Issue