lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
2004-03-18  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Remove hwcap
	variable and weak_extern for _dl_hwcap.
	(_DL_HWCAP_TLS_MASK): Define.
	(HWCAP_CHECK): Fix checking of non-platform hwcap bits.  Use
	lib->osversion instead of cache_new->libs[middle].osversion.

	* stdio-common/asprintf.c: Remove USE_IN_LIBIO conditionals.
	* stdio-common/dprintf.c: Likewise.
	* stdio-common/fprintf.c: Likewise.
	* stdio-common/getline.c: Likewise.
	* stdio-common/getw.c: Likewise.
	* stdio-common/perror.c: Likewise.
	* stdio-common/printf-prs.c: Likewise.
	* stdio-common/printf.c: Likewise.
	* stdio-common/printf_size.c: Likewise.
	* stdio-common/psignal.c: Likewise.
	* stdio-common/putw.c: Likewise.
	* stdio-common/scanf.c: Likewise.
	* stdio-common/snprintf.c: Likewise.
	* stdio-common/sprintf.c: Likewise.
	* stdio-common/sscanf.c: Likewise.
	* stdio-common/tstgetln.c: Likewise.
	* stdio-common/vfprintf.c: Likewise.

2004-03-18  Paul Eggert  <eggert@cs.ucla.edu>

	* posix/getopt.h (__GNUC_PREREQ) [!defined __THROW]: Define
	if not defined, fixing a typo (it used to be defined if
	__GNUC__ was not defined).
This commit is contained in:
Ulrich Drepper
2004-03-19 00:37:59 +00:00
parent 439ff07be0
commit 14c3586351
21 changed files with 179 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ChangeLog
View File

@ -1,3 +1,35 @@
2004-03-18 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Remove hwcap
variable and weak_extern for _dl_hwcap.
(_DL_HWCAP_TLS_MASK): Define.
(HWCAP_CHECK): Fix checking of non-platform hwcap bits. Use
lib->osversion instead of cache_new->libs[middle].osversion.
* stdio-common/asprintf.c: Remove USE_IN_LIBIO conditionals.
* stdio-common/dprintf.c: Likewise.
* stdio-common/fprintf.c: Likewise.
* stdio-common/getline.c: Likewise.
* stdio-common/getw.c: Likewise.
* stdio-common/perror.c: Likewise.
* stdio-common/printf-prs.c: Likewise.
* stdio-common/printf.c: Likewise.
* stdio-common/printf_size.c: Likewise.
* stdio-common/psignal.c: Likewise.
* stdio-common/putw.c: Likewise.
* stdio-common/scanf.c: Likewise.
* stdio-common/snprintf.c: Likewise.
* stdio-common/sprintf.c: Likewise.
* stdio-common/sscanf.c: Likewise.
* stdio-common/tstgetln.c: Likewise.
* stdio-common/vfprintf.c: Likewise.
2004-03-18 Paul Eggert <eggert@cs.ucla.edu>
* posix/getopt.h (__GNUC_PREREQ) [!defined __THROW]: Define
if not defined, fixing a typo (it used to be defined if
__GNUC__ was not defined).
2004-03-18 Ulrich Drepper <drepper@redhat.com> 2004-03-18 Ulrich Drepper <drepper@redhat.com>
* posix/sched.h: Change sched_getaffinity and sched_setaffinity * posix/sched.h: Change sched_getaffinity and sched_setaffinity

23
nptl/ChangeLog
View File

@ -1,3 +1,26 @@
2004-03-18 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/internaltypes.h (struct pthread_attr): Add
cpusetsize field, remove next.
* sysdeps/pthread/pthread.h (pthread_getaffinity_np): Add new second
parameter for size of the CPU set.
(pthread_setaffinity_np): Likewise.
(pthread_attr_getaffinity_np): Likewise.
(pthread_attr_setaffinity_np): Likewise.
* sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c: Implement
interface change, keep compatibility code.
* sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c: Likewise.
* sysdeps/unix/sysv/linux/pthread_getaffinity.c: Likewise.
* sysdeps/unix/sysv/linux/pthread_setaffinity.c: Likewise.
* pthreadP.h: Remove hidden_proto for pthread_getaffinity_np. Declare
__pthread_getaffinity_np.
* Versions: Add version for changed interfaces.
* tst-attr3.c: Adjust test for interface change.
* pthread_getattr_np.c: Query the kernel about the affinity mask with
increasing buffer sizes.
* pthread_attr_destroy.c: Remove unused list handling.
* pthread_attr_init.c: Likewise.
2004-03-17 Roland McGrath <roland@redhat.com> 2004-03-17 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/timer_create.c (timer_create): Pass missing * sysdeps/unix/sysv/linux/timer_create.c (timer_create): Pass missing

2
posix/getopt.h
View File

@ -36,7 +36,7 @@
#endif #endif
#ifndef __THROW #ifndef __THROW
# ifndef __GNUC__ # ifndef __GNUC_PREREQ
# define __GNUC_PREREQ(maj, min) (0) # define __GNUC_PREREQ(maj, min) (0)
# endif # endif
# if defined __cplusplus && __GNUC_PREREQ (2,8) # if defined __cplusplus && __GNUC_PREREQ (2,8)

5
stdio-common/asprintf.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991, 1995, 1997, 1998, 2002 Free Software Foundation, Inc. /* Copyright (C) 1991, 1995, 1997, 1998, 2002, 2004
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
@ -19,10 +20,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#ifdef USE_IN_LIBIO
#include <libio/libioP.h> #include <libio/libioP.h>
#define vasprintf(s, f, a) _IO_vasprintf (s, f, a) #define vasprintf(s, f, a) _IO_vasprintf (s, f, a)
#endif
#undef __asprintf #undef __asprintf
/* Write formatted output from FORMAT to a string which is /* Write formatted output from FORMAT to a string which is

4
stdio-common/dprintf.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,95,97,98,2002 Free Software Foundation, Inc. /* Copyright (C) 1991,95,97,98,2002,2004 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
@ -19,10 +19,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#ifdef USE_IN_LIBIO
#include <libio/libioP.h> #include <libio/libioP.h>
#define vdprintf(d, f, a) _IO_vdprintf (d, f, a) #define vdprintf(d, f, a) _IO_vdprintf (d, f, a)
#endif
/* Write formatted output to D, according to the format string FORMAT. */ /* Write formatted output to D, according to the format string FORMAT. */
/* VARARGS2 */ /* VARARGS2 */

4
stdio-common/fprintf.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,97,2002 Free Software Foundation, Inc. /* Copyright (C) 1991,97,2002,2004 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,9 +36,7 @@ fprintf (FILE *stream, const char *format, ...)
} }
libc_hidden_def (fprintf) libc_hidden_def (fprintf)
#ifdef USE_IN_LIBIO
/* We define the function with the real name here. But deep down in /* We define the function with the real name here. But deep down in
libio the original function _IO_fprintf is also needed. So make libio the original function _IO_fprintf is also needed. So make
an alias. */ an alias. */
weak_alias (fprintf, _IO_fprintf) weak_alias (fprintf, _IO_fprintf)
#endif

5
stdio-common/getline.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc. /* Copyright (C) 1991, 1992, 1995, 1996, 1997, 2004
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
@ -21,12 +22,10 @@
#undef __getline #undef __getline
#ifdef USE_IN_LIBIO
#include "../libio/libioP.h" #include "../libio/libioP.h"
#undef ssize_t #undef ssize_t
#define ssize_t _IO_ssize_t #define ssize_t _IO_ssize_t
#define __getdelim _IO_getdelim #define __getdelim _IO_getdelim
#endif
/* Like getdelim, but always looks for a newline. */ /* Like getdelim, but always looks for a newline. */
ssize_t ssize_t

4
stdio-common/getw.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1997, 1998, 2002 Free Software Foundation, Inc. /* Copyright (C) 1991, 1997, 1998, 2002, 2004 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
@ -18,10 +18,8 @@
#include <stdio.h> #include <stdio.h>
#ifdef USE_IN_LIBIO
#include <libio/iolibio.h> #include <libio/iolibio.h>
#define fread(p, m, n, s) INTUSE(_IO_fread) (p, m, n, s) #define fread(p, m, n, s) INTUSE(_IO_fread) (p, m, n, s)
#endif
/* Read a word (int) from STREAM. */ /* Read a word (int) from STREAM. */
int int

6
stdio-common/perror.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991-1993,1997,1998,2000-2003 Free Software Foundation, Inc. /* Copyright (C) 1991-1993,1997,1998,2000-2004 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
@ -21,9 +21,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <wchar.h> #include <wchar.h>
#ifdef USE_IN_LIBIO
#include "libioP.h" #include "libioP.h"
#endif
static void static void
perror_internal (FILE *fp, const char *s, int errnum) perror_internal (FILE *fp, const char *s, int errnum)
@ -39,11 +37,9 @@ perror_internal (FILE *fp, const char *s, int errnum)
errstring = __strerror_r (errnum, buf, sizeof buf); errstring = __strerror_r (errnum, buf, sizeof buf);
#ifdef USE_IN_LIBIO
if (_IO_fwide (fp, 0) > 0) if (_IO_fwide (fp, 0) > 0)
(void) __fwprintf (fp, L"%s%s%s\n", s, colon, errstring); (void) __fwprintf (fp, L"%s%s%s\n", s, colon, errstring);
else else
#endif
(void) fprintf (fp, "%s%s%s\n", s, colon, errstring); (void) fprintf (fp, "%s%s%s\n", s, colon, errstring);
} }

21
stdio-common/printf-prs.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991,92,95,96,99,2000,2002,2003 Free Software Foundation, Inc. /* Copyright (C) 1991, 1992, 1995, 1996, 1999, 2000, 2002, 2003, 2004
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
@ -34,20 +35,11 @@
# define ISASCII(Ch) isascii (Ch) # define ISASCII(Ch) isascii (Ch)
# define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St) # define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St)
# ifdef USE_IN_LIBIO
# define PUT(F, S, N) _IO_sputn (F, S, N) # define PUT(F, S, N) _IO_sputn (F, S, N)
# define PAD(Padchar) \ # define PAD(Padchar) \
if (width > 0) \ if (width > 0) \
done += INTUSE(_IO_padn) (s, Padchar, width) done += INTUSE(_IO_padn) (s, Padchar, width)
#else #else
# define PUTC(C, F) putc (C, F)
ssize_t __printf_pad __P ((FILE *, char pad, size_t n));
# define PAD(Padchar) \
if (width > 0) \
{ if (__printf_pad (s, Padchar, width) == -1) \
return -1; else done += width; }
# endif
#else
# define vfprintf vfwprintf # define vfprintf vfwprintf
# define CHAR_T wchar_t # define CHAR_T wchar_t
# define UCHAR_T uwchar_t # define UCHAR_T uwchar_t
@ -55,19 +47,10 @@ ssize_t __printf_pad __P ((FILE *, char pad, size_t n));
# define L_(Str) L##Str # define L_(Str) L##Str
# define ISDIGIT(Ch) iswdigit (Ch) # define ISDIGIT(Ch) iswdigit (Ch)
# ifdef USE_IN_LIBIO
# define PUT(F, S, N) _IO_sputn (F, S, N) # define PUT(F, S, N) _IO_sputn (F, S, N)
# define PAD(Padchar) \ # define PAD(Padchar) \
if (width > 0) \ if (width > 0) \
done += _IO_wpadn (s, Padchar, width) done += _IO_wpadn (s, Padchar, width)
# else
# define PUTC(C, F) wputc (C, F)
ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n));
# define PAD(Padchar) \
if (width > 0) \
{ if (__wprintf_pad (s, Padchar, width) == -1) \
return -1; else done += width; }
# endif
#endif #endif
#define DONT_NEED_READ_INT #define DONT_NEED_READ_INT

5
stdio-common/printf.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. /* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004
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,8 +37,6 @@ printf (const char *format, ...)
return done; return done;
} }
#ifdef USE_IN_LIBIO
#undef _IO_printf #undef _IO_printf
/* This is for libg++. */ /* This is for libg++. */
strong_alias (printf, _IO_printf); strong_alias (printf, _IO_printf);
#endif

10
stdio-common/printf_size.c
View File

@ -23,16 +23,11 @@
#include <ieee754.h> #include <ieee754.h>
#include <math.h> #include <math.h>
#include <printf.h> #include <printf.h>
#ifdef USE_IN_LIBIO
#include <libioP.h> #include <libioP.h>
#else
# include <stdio.h>
#endif
/* This defines make it possible to use the same code for GNU C library and /* This defines make it possible to use the same code for GNU C library and
the GNU I/O library. */ the GNU I/O library. */
#ifdef USE_IN_LIBIO
#define PUT(f, s, n) _IO_sputn (f, s, n) #define PUT(f, s, n) _IO_sputn (f, s, n)
#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n)) #define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n))
/* We use this file GNU C library and GNU I/O library. So make /* We use this file GNU C library and GNU I/O library. So make
@ -42,11 +37,6 @@
? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f)) ? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
#define size_t _IO_size_t #define size_t _IO_size_t
#define FILE _IO_FILE #define FILE _IO_FILE
#else /* ! USE_IN_LIBIO */
# define PUT(f, s, n) fwrite (s, 1, n, f)
# define PAD(f, c, n) __printf_pad (f, c, n)
ssize_t __printf_pad __P ((FILE *, char pad, int n)); /* In vfprintf.c. */
#endif /* USE_IN_LIBIO */
/* Macros for doing the actual output. */ /* Macros for doing the actual output. */

9
stdio-common/psignal.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991,1992,1995-1997,2001,2002 Free Software Foundation, Inc. /* Copyright (C) 1991, 1992, 1995, 1996, 1997, 2001, 2002, 2004
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
@ -20,9 +21,7 @@
#include <signal.h> #include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <libintl.h> #include <libintl.h>
#ifdef USE_IN_LIBIO
#include <wchar.h> #include <wchar.h>
#endif
#ifndef HAVE_GNU_LD #ifndef HAVE_GNU_LD
@ -49,11 +48,9 @@ psignal (int sig, const char *s)
if (sig >= 0 && sig < NSIG && (desc = INTUSE(_sys_siglist)[sig]) != NULL) if (sig >= 0 && sig < NSIG && (desc = INTUSE(_sys_siglist)[sig]) != NULL)
{ {
#ifdef USE_IN_LIBIO
if (_IO_fwide (stderr, 0) > 0) if (_IO_fwide (stderr, 0) > 0)
(void) __fwprintf (stderr, L"%s%s%s\n", s, colon, _(desc)); (void) __fwprintf (stderr, L"%s%s%s\n", s, colon, _(desc));
else else
#endif
(void) fprintf (stderr, "%s%s%s\n", s, colon, _(desc)); (void) fprintf (stderr, "%s%s%s\n", s, colon, _(desc));
} }
else else
@ -62,11 +59,9 @@ psignal (int sig, const char *s)
(void) __asprintf (&buf, _("%s%sUnknown signal %d\n"), s, colon, sig); (void) __asprintf (&buf, _("%s%sUnknown signal %d\n"), s, colon, sig);
#ifdef USE_IN_LIBIO
if (_IO_fwide (stderr, 0) > 0) if (_IO_fwide (stderr, 0) > 0)
(void) __fwprintf (stderr, L"%s", buf); (void) __fwprintf (stderr, L"%s", buf);
else else
#endif
(void) fputs (buf, stderr); (void) fputs (buf, stderr);
free (buf); free (buf);

5
stdio-common/putw.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1997, 1998, 2002 Free Software Foundation, Inc. /* Copyright (C) 1991, 1997, 1998, 2002, 2004 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
@ -17,11 +17,8 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <stdio.h> #include <stdio.h>
#ifdef USE_IN_LIBIO
#include <libio/iolibio.h> #include <libio/iolibio.h>
#define fwrite(p, n, m, s) INTUSE(_IO_fwrite) (p, n, m, s) #define fwrite(p, n, m, s) INTUSE(_IO_fwrite) (p, n, m, s)
#endif
/* Write the word (int) W to STREAM. */ /* Write the word (int) W to STREAM. */
int int

9
stdio-common/scanf.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc. /* Copyright (C) 1991, 1995, 1996, 1997, 2002, 2004
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
@ -19,9 +20,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#ifdef USE_IN_LIBIO
#include <libioP.h> #include <libioP.h>
#endif
/* Read formatted input from stdin according to the format string FORMAT. */ /* Read formatted input from stdin according to the format string FORMAT. */
@ -33,11 +32,7 @@ scanf (const char *format, ...)
int done; int done;
va_start (arg, format); va_start (arg, format);
#ifdef USE_IN_LIBIO
done = INTUSE(_IO_vfscanf) (stdin, format, arg, NULL); done = INTUSE(_IO_vfscanf) (stdin, format, arg, NULL);
#else
done = vfscanf (stdin, format, arg);
#endif
va_end (arg); va_end (arg);
return done; return done;

4
stdio-common/snprintf.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1995, 1997, 1998 Free Software Foundation, Inc. /* Copyright (C) 1991, 1995, 1997, 1998, 2004 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
@ -19,10 +19,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#ifdef USE_IN_LIBIO
#include <libio/libioP.h> #include <libio/libioP.h>
#define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a) #define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
#endif
/* Write formatted output into S, according to the format /* Write formatted output into S, according to the format
string FORMAT, writing no more than MAXLEN characters. */ string FORMAT, writing no more than MAXLEN characters. */

8
stdio-common/sprintf.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991, 1995, 1997, 1998, 2002 Free Software Foundation, Inc. /* Copyright (C) 1991, 1995, 1997, 1998, 2002, 2004
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
@ -18,11 +19,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#ifdef USE_IN_LIBIO
#include <libio/iolibio.h> #include <libio/iolibio.h>
#define vsprintf(s, f, a) INTUSE(_IO_vsprintf) (s, f, a) #define vsprintf(s, f, a) INTUSE(_IO_vsprintf) (s, f, a)
#endif
/* Write formatted output into S, according to the format string FORMAT. */ /* Write formatted output into S, according to the format string FORMAT. */
/* VARARGS2 */ /* VARARGS2 */
@ -40,6 +38,4 @@ sprintf (char *s, const char *format, ...)
} }
libc_hidden_def (sprintf) libc_hidden_def (sprintf)
#ifdef USE_IN_LIBIO
strong_alias(sprintf, _IO_sprintf) strong_alias(sprintf, _IO_sprintf)
#endif

8
stdio-common/sscanf.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991,1995,1996,1998,2002,2003 Free Software Foundation, Inc. /* Copyright (C) 1991, 1995, 1996, 1998, 2002, 2003, 2004
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
@ -18,11 +19,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#ifdef USE_IN_LIBIO
#include <libio/iolibio.h> #include <libio/iolibio.h>
#define __vsscanf(s, f, a) _IO_vsscanf (s, f, a) #define __vsscanf(s, f, a) _IO_vsscanf (s, f, a)
#endif
/* Read formatted input from S, according to the format string FORMAT. */ /* Read formatted input from S, according to the format string FORMAT. */
/* VARARGS2 */ /* VARARGS2 */
@ -40,8 +38,6 @@ sscanf (const char *s, const char *format, ...)
} }
libc_hidden_def (sscanf) libc_hidden_def (sscanf)
#ifdef USE_IN_LIBIO
#undef _IO_sscanf #undef _IO_sscanf
/* This is for libg++. */ /* This is for libg++. */
strong_alias (sscanf, _IO_sscanf) strong_alias (sscanf, _IO_sscanf)
#endif

6
stdio-common/tstgetln.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1992, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. /* Copyright (C) 1992, 1995, 1996, 1997, 1998, 2004
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
@ -17,11 +18,8 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <stdio.h> #include <stdio.h>
#ifdef USE_IN_LIBIO
#undef ssize_t #undef ssize_t
#define ssize_t _IO_ssize_t #define ssize_t _IO_ssize_t
#endif
int int
main (int argc, char *argv[]) main (int argc, char *argv[])

137
stdio-common/vfprintf.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991-2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1991-2002, 2003, 2004 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
@ -39,8 +39,6 @@
implementation as defined in ISO/IEC 9899:1990/Amendment 1:1995. */ implementation as defined in ISO/IEC 9899:1990/Amendment 1:1995. */
#ifdef USE_IN_LIBIO
/* This code is for use in libio. */
#include <libioP.h> #include <libioP.h>
#define FILE _IO_FILE #define FILE _IO_FILE
#undef va_list #undef va_list
@ -103,55 +101,6 @@
# undef EOF # undef EOF
# define EOF WEOF # define EOF WEOF
#endif #endif
#else /* ! USE_IN_LIBIO */
/* This code is for use in the GNU C library. */
# define ARGCHECK(S, Format) \
do \
{ \
/* Check file argument for consistence. */ \
if (!__validfp (S) || !S->__mode.__write) \
{ \
__set_errno (EBADF); \
return -1; \
} \
if (Format == NULL) \
{ \
__set_errno (EINVAL); \
return -1; \
} \
if (!S->__seen) \
{ \
if (__flshfp (S, EOF) == EOF) \
return -1; \
} \
} \
while (0)
# define UNBUFFERED_P(s) ((s)->__buffer == NULL)
# define CHAR_T char
# define UCHAR_T unsigned char
# define INT_T int
# define L_(Str) Str
# define ISDIGIT(Ch) isdigit (Ch)
# define PUT(F, S, N) fwrite (S, 1, N, F)
ssize_t __printf_pad __P ((FILE *, char pad, size_t n));
# define PAD(Padchar) \
if (width > 0) \
{ ssize_t __res = __printf_pad (s, (Padchar), width); \
if (__res == -1) \
{ \
done = -1; \
goto all_done; \
} \
done += __res; }
# define PUTC(C, F) putc (C, F)
/* XXX These declarations should go as soon as the stdio header files
have these prototypes. */
extern void __flockfile (FILE *);
extern void __funlockfile (FILE *);
#endif /* USE_IN_LIBIO */
#include "_i18n_number.h" #include "_i18n_number.h"
@ -1266,10 +1215,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
#ifdef ORIENT #ifdef ORIENT
/* Check for correct orientation. */ /* Check for correct orientation. */
if ( if (_IO_vtable_offset (s) == 0 &&
# ifdef USE_IN_LIBIO
_IO_vtable_offset (s) == 0 &&
# endif
_IO_fwide (s, sizeof (CHAR_T) == 1 ? -1 : 1) _IO_fwide (s, sizeof (CHAR_T) == 1 ? -1 : 1)
!= (sizeof (CHAR_T) == 1 ? -1 : 1)) != (sizeof (CHAR_T) == 1 ? -1 : 1))
/* The stream is already oriented otherwise. */ /* The stream is already oriented otherwise. */
@ -1305,13 +1251,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
#endif #endif
/* Lock stream. */ /* Lock stream. */
#ifdef USE_IN_LIBIO
_IO_cleanup_region_start ((void (*) (void *)) &_IO_funlockfile, s); _IO_cleanup_region_start ((void (*) (void *)) &_IO_funlockfile, s);
_IO_flockfile (s); _IO_flockfile (s);
#else
__libc_cleanup_region_start (1, (void (*) (void *)) &__funlockfile, s);
__flockfile (s);
#endif
/* Write the literal text before the first format. */ /* Write the literal text before the first format. */
outstring ((const UCHAR_T *) format, outstring ((const UCHAR_T *) format,
@ -1906,13 +1847,8 @@ all_done:
if (__builtin_expect (workstart != NULL, 0)) if (__builtin_expect (workstart != NULL, 0))
free (workstart); free (workstart);
/* Unlock the stream. */ /* Unlock the stream. */
#ifdef USE_IN_LIBIO
_IO_funlockfile (s); _IO_funlockfile (s);
_IO_cleanup_region_end (0); _IO_cleanup_region_end (0);
#else
__funlockfile (s);
__libc_cleanup_region_end (0);
#endif
return done; return done;
} }
@ -2041,7 +1977,6 @@ group_number (CHAR_T *w, CHAR_T *rear_ptr, const char *grouping,
return w; return w;
} }
#ifdef USE_IN_LIBIO
/* Helper "class" for `fprintf to unbuffered': creates a temporary buffer. */ /* Helper "class" for `fprintf to unbuffered': creates a temporary buffer. */
struct helper_file struct helper_file
{ {
@ -2159,7 +2094,7 @@ buffered_vfprintf (register _IO_FILE *s, const CHAR_T *format,
_IO_JUMPS (&helper._f) = (struct _IO_jump_t *) &_IO_helper_jumps; _IO_JUMPS (&helper._f) = (struct _IO_jump_t *) &_IO_helper_jumps;
/* Now print to helper instead. */ /* Now print to helper instead. */
#if defined USE_IN_LIBIO && !defined COMPILE_WPRINTF #ifndef COMPILE_WPRINTF
result = INTUSE(_IO_vfprintf) (hp, format, args); result = INTUSE(_IO_vfprintf) (hp, format, args);
#else #else
result = vfprintf (hp, format, args); result = vfprintf (hp, format, args);
@ -2193,71 +2128,6 @@ buffered_vfprintf (register _IO_FILE *s, const CHAR_T *format,
return result; return result;
} }
#else /* !USE_IN_LIBIO */
static int
internal_function
buffered_vfprintf (register FILE *s, const CHAR_T *format, va_list args)
{
char buf[BUFSIZ];
int result;
/* Orient the stream. */
#ifdef ORIENT
ORIENT;
#endif
s->__bufp = s->__buffer = buf;
s->__bufsize = sizeof buf;
s->__put_limit = s->__buffer + s->__bufsize;
s->__get_limit = s->__buffer;
/* Now use buffer to print. */
result = vfprintf (s, format, args);
if (fflush (s) == EOF)
result = -1;
s->__buffer = s->__bufp = s->__get_limit = s->__put_limit = NULL;
s->__bufsize = 0;
return result;
}
/* Pads string with given number of a specified character.
This code is taken from iopadn.c of the GNU I/O library. */
#define PADSIZE 16
static const CHAR_T blanks[PADSIZE] =
{ L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '),
L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' ') };
static const CHAR_T zeroes[PADSIZE] =
{ L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'),
L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0') };
ssize_t
#ifndef COMPILE_WPRINTF
__printf_pad (FILE *s, char pad, size_t count)
#else
__wprintf_pad (FILE *s, wchar_t pad, size_t count)
#endif
{
const CHAR_T *padptr;
register size_t i;
padptr = pad == L_(' ') ? blanks : zeroes;
for (i = count; i >= PADSIZE; i -= PADSIZE)
if (PUT (s, padptr, PADSIZE) != PADSIZE)
return -1;
if (i > 0)
if (PUT (s, padptr, i) != i)
return -1;
return count;
}
#undef PADSIZE
#endif /* USE_IN_LIBIO */
#ifdef USE_IN_LIBIO
#undef vfprintf #undef vfprintf
#ifdef strong_alias #ifdef strong_alias
/* This is for glibc. */ /* This is for glibc. */
@ -2281,4 +2151,3 @@ weak_alias (_IO_vfprintf, vfprintf);
# endif # endif
# endif # endif
#endif #endif
#endif

18
sysdeps/generic/dl-cache.c
View File

@ -243,12 +243,7 @@ _dl_load_cache_lookup (const char *name)
if (cache_new != (void *) -1) if (cache_new != (void *) -1)
{ {
/* This file ends in static libraries where we don't have a hwcap. */
unsigned long int *hwcap;
uint64_t platform; uint64_t platform;
#ifndef SHARED
weak_extern (_dl_hwcap);
#endif
/* This is where the strings start. */ /* This is where the strings start. */
cache_data = (const char *) cache_new; cache_data = (const char *) cache_new;
@ -256,22 +251,25 @@ _dl_load_cache_lookup (const char *name)
/* Now we can compute how large the string table is. */ /* Now we can compute how large the string table is. */
cache_data_size = (const char *) cache + cachesize - cache_data; cache_data_size = (const char *) cache + cachesize - cache_data;
hwcap = &GLRO(dl_hwcap);
platform = _dl_string_platform (GLRO(dl_platform)); platform = _dl_string_platform (GLRO(dl_platform));
if (platform != (uint64_t) -1) if (platform != (uint64_t) -1)
platform = 1ULL << platform; platform = 1ULL << platform;
/* Only accept hwcap if it's for the right platform. */ /* Only accept hwcap if it's for the right platform. */
#ifdef USE_TLS
# define _DL_HWCAP_TLS_MASK (1LL << 63)
#else
# define _DL_HWCAP_TLS_MASK 0
#endif
#define HWCAP_CHECK \ #define HWCAP_CHECK \
if (GLRO(dl_osversion) \ if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \
&& cache_new->libs[middle].osversion > GLRO(dl_osversion)) \
continue; \ continue; \
if (_DL_PLATFORMS_COUNT && platform != -1 \ if (_DL_PLATFORMS_COUNT && platform != -1 \
&& (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \ && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \
&& (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) \ && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) \
continue; \ continue; \
if (hwcap \ if (lib->hwcap \
&& ((lib->hwcap & *hwcap & ~_DL_HWCAP_PLATFORM) > *hwcap)) \ & ~(GLRO(dl_hwcap) | _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK)) \
continue continue
SEARCH_CACHE (cache_new); SEARCH_CACHE (cache_new);
} }