mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 12:30:06 +00:00
Merge branch 'master' of ssh://sourceware.org/git/glibc
This commit is contained in:
Ulrich Drepper
commit
43455e0916
25
ChangeLog
25
ChangeLog
@ -1,3 +1,28 @@
|
||||
2012-01-26 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* crypt/md5.h: Remove __STDC__ conditionals.
|
||||
* libio/libioP.h: Likewise.
|
||||
* locale/programs/config.h: Likewise.
|
||||
* sysdeps/generic/sysdep.h: Likewise.
|
||||
* sysdeps/i386/asm-syntax.h: Likewise.
|
||||
* sysdeps/s390/asm-syntax.h: Likewise.
|
||||
* sysdeps/unix/sysdep.h: Likewise.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise.
|
||||
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise.
|
||||
|
||||
2012-01-26 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* libio/libio.h: Remove __STDC__ conditionals.
|
||||
* malloc/obstack.h: Likewise.
|
||||
* math/complex.h: Likewise.
|
||||
* math/math.h: Likewise.
|
||||
* sysdeps/generic/_G_config.h: Likewise.
|
||||
* sysdeps/gnu/_G_config.h: Likewise.
|
||||
* sysdeps/mach/hurd/_G_config.h: Likewise.
|
||||
* sysdeps/powerpc/bits/mathdef.h: Likewise.
|
||||
* sysdeps/sh/sh4/bits/mathdef.h: Likewise.
|
||||
* sysdeps/sparc/bits/mathdef.h: Likewise.
|
||||
|
||||
2012-01-26 Ulrich Drepper <drepper@gmail.com>
|
||||
|
||||
[BZ #13583]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* Declaration of functions and data types used for MD5 sum computing
|
||||
library functions.
|
||||
Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2011
|
||||
Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2011,2012
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
@ -43,11 +43,7 @@
|
||||
typedef uint32_t md5_uint32;
|
||||
typedef uintptr_t md5_uintptr;
|
||||
#else
|
||||
# if defined __STDC__ && __STDC__
|
||||
# define UINT_MAX_32_BITS 4294967295U
|
||||
# else
|
||||
# define UINT_MAX_32_BITS 0xFFFFFFFF
|
||||
# endif
|
||||
# define UINT_MAX_32_BITS 4294967295U
|
||||
|
||||
/* If UINT_MAX isn't defined, assume it's a 32-bit type.
|
||||
This should be valid for all systems GNU cares about because
|
||||
|
||||
@ -62,13 +62,8 @@
|
||||
# if _G_HAVE_SYS_CDEFS
|
||||
# include <sys/cdefs.h>
|
||||
# else
|
||||
# ifdef __STDC__
|
||||
# define __P(p) p
|
||||
# define __PMT(p) p
|
||||
# else
|
||||
# define __P(p) ()
|
||||
# define __PMT(p) ()
|
||||
# endif
|
||||
# define __P(p) p
|
||||
# define __PMT(p) p
|
||||
# endif
|
||||
#endif /*!__P*/
|
||||
|
||||
@ -77,11 +72,6 @@
|
||||
# define _PARAMS(protos) __P(protos)
|
||||
#endif /*!_PARAMS*/
|
||||
|
||||
#ifndef __STDC__
|
||||
# ifndef const
|
||||
# define const
|
||||
# endif
|
||||
#endif
|
||||
#define _IO_UNIFIED_JUMPTABLES 1
|
||||
#ifndef _G_HAVE_PRINTF_FP
|
||||
# define _IO_USE_DTOA 1
|
||||
|
||||
@ -927,11 +927,7 @@ VTABLE_LABEL(builtinbuf_vtable, builtinbuf, 10)
|
||||
# endif
|
||||
#endif /* !defined(builtinbuf_vtable) && defined(__cplusplus) */
|
||||
|
||||
#if defined(__STDC__) || defined(__cplusplus)
|
||||
# define _IO_va_start(args, last) va_start(args, last)
|
||||
#else
|
||||
# define _IO_va_start(args, last) va_start(args)
|
||||
#endif
|
||||
#define _IO_va_start(args, last) va_start(args, last)
|
||||
|
||||
extern struct _IO_fake_stdiobuf _IO_stdin_buf, _IO_stdout_buf, _IO_stderr_buf;
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* Configuration for localedef program.
|
||||
Copyright (C) 1995,1996,1997,1998,2000,2005 Free Software Foundation, Inc.
|
||||
Copyright (C) 1995-1998,2000,2005,2012 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
|
||||
|
||||
@ -30,11 +30,7 @@
|
||||
#define DEFAULT_CHARMAP "ANSI_X3.4-1968" /* ASCII */
|
||||
|
||||
#ifndef PARAMS
|
||||
# if __STDC__
|
||||
# define PARAMS(args) args
|
||||
# else
|
||||
# define PARAMS(args) ()
|
||||
# endif
|
||||
# define PARAMS(args) args
|
||||
#endif
|
||||
|
||||
/* This must be one higer than the last used LC_xxx category value. */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* obstack.h - object stack macros
|
||||
Copyright (C) 1988-1994,1996-1999,2003,2004,2005,2009,2011
|
||||
Copyright (C) 1988-1994,1996-1999,2003,2004,2005,2009,2011,2012
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
@ -250,7 +250,7 @@ extern int obstack_exit_failure;
|
||||
|
||||
#define obstack_memory_used(h) _obstack_memory_used (h)
|
||||
|
||||
#if defined __GNUC__ && defined __STDC__ && __STDC__
|
||||
#if defined __GNUC__
|
||||
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
|
||||
does not implement __extension__. But that compiler doesn't define
|
||||
__GNUC_MINOR__. */
|
||||
@ -402,7 +402,7 @@ __extension__ \
|
||||
__o->next_free = __o->object_base = (char *)__obj; \
|
||||
else (obstack_free) (__o, __obj); })
|
||||
|
||||
#else /* not __GNUC__ or not __STDC__ */
|
||||
#else /* not __GNUC__ */
|
||||
|
||||
# define obstack_object_size(h) \
|
||||
(unsigned) ((h)->next_free - (h)->object_base)
|
||||
@ -500,7 +500,7 @@ __extension__ \
|
||||
= (h)->temp.tempint + (char *) (h)->chunk), 0) \
|
||||
: ((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0)))
|
||||
|
||||
#endif /* not __GNUC__ or not __STDC__ */
|
||||
#endif /* not __GNUC__ */
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* C++ */
|
||||
|
||||
@ -82,20 +82,15 @@ __BEGIN_DECLS
|
||||
# define _Mfloat_ float
|
||||
#endif
|
||||
#define _Mdouble_ _Mfloat_
|
||||
#ifdef __STDC__
|
||||
# define __MATH_PRECNAME(name) name##f
|
||||
#else
|
||||
# define __MATH_PRECNAME(name) name/**/f
|
||||
#endif
|
||||
#define __MATH_PRECNAME(name) name##f
|
||||
#include <bits/cmathcalls.h>
|
||||
#undef _Mdouble_
|
||||
#undef __MATH_PRECNAME
|
||||
|
||||
/* And the long double versions. It is non-critical to define them
|
||||
here unconditionally since `long double' is required in ISO C99. */
|
||||
#if (__STDC__ - 0 || __GNUC__ - 0) \
|
||||
&& (!(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \
|
||||
|| defined __LDBL_COMPAT)
|
||||
#if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \
|
||||
|| defined __LDBL_COMPAT
|
||||
# ifdef __LDBL_COMPAT
|
||||
# undef __MATHDECL_1
|
||||
# define __MATHDECL_1(type, function, args) \
|
||||
@ -106,11 +101,7 @@ __BEGIN_DECLS
|
||||
# define _Mlong_double_ long double
|
||||
# endif
|
||||
# define _Mdouble_ _Mlong_double_
|
||||
# ifdef __STDC__
|
||||
# define __MATH_PRECNAME(name) name##l
|
||||
# else
|
||||
# define __MATH_PRECNAME(name) name/**/l
|
||||
# endif
|
||||
# define __MATH_PRECNAME(name) name##l
|
||||
# include <bits/cmathcalls.h>
|
||||
#endif
|
||||
#undef _Mdouble_
|
||||
|
||||
21
math/math.h
21
math/math.h
@ -1,5 +1,5 @@
|
||||
/* Declarations for math functions.
|
||||
Copyright (C) 1991-1993, 1995-1999, 2001, 2002, 2004, 2006, 2009, 2011
|
||||
Copyright (C) 1991-1993, 1995-1999, 2001, 2002, 2004, 2006, 2009, 2011, 2012
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
@ -84,11 +84,7 @@ __BEGIN_DECLS
|
||||
# define _Mfloat_ float
|
||||
# endif
|
||||
# define _Mdouble_ _Mfloat_
|
||||
# ifdef __STDC__
|
||||
# define __MATH_PRECNAME(name,r) name##f##r
|
||||
# else
|
||||
# define __MATH_PRECNAME(name,r) name/**/f/**/r
|
||||
# endif
|
||||
# define __MATH_PRECNAME(name,r) name##f##r
|
||||
# define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_C99
|
||||
# define _Mdouble_END_NAMESPACE __END_NAMESPACE_C99
|
||||
# include <bits/mathcalls.h>
|
||||
@ -97,9 +93,8 @@ __BEGIN_DECLS
|
||||
# undef _Mdouble_END_NAMESPACE
|
||||
# undef __MATH_PRECNAME
|
||||
|
||||
# if (__STDC__ - 0 || __GNUC__ - 0) \
|
||||
&& (!(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \
|
||||
|| defined __LDBL_COMPAT)
|
||||
# if !(defined __NO_LONG_DOUBLE_MATH && defined _LIBC) \
|
||||
|| defined __LDBL_COMPAT
|
||||
# ifdef __LDBL_COMPAT
|
||||
|
||||
# ifdef __USE_ISOC99
|
||||
@ -132,11 +127,7 @@ extern long double __REDIRECT_NTH (nexttowardl,
|
||||
# define _Mlong_double_ long double
|
||||
# endif
|
||||
# define _Mdouble_ _Mlong_double_
|
||||
# ifdef __STDC__
|
||||
# define __MATH_PRECNAME(name,r) name##l##r
|
||||
# else
|
||||
# define __MATH_PRECNAME(name,r) name/**/l/**/r
|
||||
# endif
|
||||
# define __MATH_PRECNAME(name,r) name##l##r
|
||||
# define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_C99
|
||||
# define _Mdouble_END_NAMESPACE __END_NAMESPACE_C99
|
||||
# define __MATH_DECLARE_LDOUBLE 1
|
||||
@ -146,7 +137,7 @@ extern long double __REDIRECT_NTH (nexttowardl,
|
||||
# undef _Mdouble_END_NAMESPACE
|
||||
# undef __MATH_PRECNAME
|
||||
|
||||
# endif /* __STDC__ || __GNUC__ */
|
||||
# endif /* !(__NO_LONG_DOUBLE_MATH && _LIBC) || __LDBL_COMPAT */
|
||||
|
||||
#endif /* Use misc or ISO C99. */
|
||||
#undef __MATHDECL_1
|
||||
|
||||
@ -84,10 +84,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
|
||||
#define _G_VTABLE_LABEL_HAS_LENGTH 1
|
||||
|
||||
|
||||
#if defined __cplusplus || defined __STDC__
|
||||
# define _G_ARGS(ARGLIST) ARGLIST
|
||||
#else
|
||||
# define _G_ARGS(ARGLIST) ()
|
||||
#endif
|
||||
#define _G_ARGS(ARGLIST) ARGLIST
|
||||
|
||||
#endif /* _G_config.h */
|
||||
|
||||
@ -21,11 +21,7 @@
|
||||
#ifndef C_LABEL
|
||||
|
||||
/* Define a macro we can use to construct the asm name for a C symbol. */
|
||||
# ifdef __STDC__
|
||||
# define C_LABEL(name) name##:
|
||||
# else
|
||||
# define C_LABEL(name) name/**/:
|
||||
# endif
|
||||
# define C_LABEL(name) name##:
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -92,10 +92,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
|
||||
#define _G_VTABLE_LABEL_PREFIX_ID __vt_
|
||||
|
||||
|
||||
#if defined __cplusplus || defined __STDC__
|
||||
# define _G_ARGS(ARGLIST) ARGLIST
|
||||
#else
|
||||
# define _G_ARGS(ARGLIST) ()
|
||||
#endif
|
||||
#define _G_ARGS(ARGLIST) ARGLIST
|
||||
|
||||
#endif /* _G_config.h */
|
||||
|
||||
@ -23,15 +23,7 @@
|
||||
|
||||
#undef L
|
||||
#ifdef __ELF__
|
||||
# ifdef __STDC__
|
||||
# define L(body) .L##body
|
||||
# else
|
||||
# define L(body) .L/**/body
|
||||
# endif
|
||||
# define L(body) .L##body
|
||||
#else
|
||||
# ifdef __STDC__
|
||||
# define L(body) L##body
|
||||
# else
|
||||
# define L(body) L/**/body
|
||||
# endif
|
||||
# define L(body) L##body
|
||||
#endif
|
||||
|
||||
@ -91,10 +91,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
|
||||
#define _G_VTABLE_LABEL_PREFIX_ID __vt_
|
||||
|
||||
|
||||
#if defined __cplusplus || defined __STDC__
|
||||
# define _G_ARGS(ARGLIST) ARGLIST
|
||||
#else
|
||||
# define _G_ARGS(ARGLIST) ()
|
||||
#endif
|
||||
#define _G_ARGS(ARGLIST) ARGLIST
|
||||
|
||||
#endif /* _G_config.h */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1997,1998,1999,2000,2003,2004,2006,2010
|
||||
/* Copyright (C) 1997,1998,1999,2000,2003,2004,2006,2010,2012
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
@ -32,23 +32,13 @@
|
||||
# define _MATH_H_MATHDEF 1
|
||||
|
||||
# ifdef __GNUC__
|
||||
# if __STDC__ == 1
|
||||
|
||||
/* In GNU or ANSI mode, gcc leaves `float' expressions as-is. */
|
||||
/* gcc leaves `float' expressions as-is. */
|
||||
typedef float float_t; /* `float' expressions are evaluated as
|
||||
`float'. */
|
||||
typedef double double_t; /* `double' expressions are evaluated as
|
||||
`double'. */
|
||||
|
||||
# else
|
||||
|
||||
/* For `gcc -traditional', `float' expressions are evaluated as `double'. */
|
||||
typedef double float_t; /* `float' expressions are evaluated as
|
||||
`double'. */
|
||||
typedef double double_t; /* `double' expressions are evaluated as
|
||||
`double'. */
|
||||
|
||||
# endif
|
||||
# else
|
||||
|
||||
/* Wild guess at types for float_t and double_t. */
|
||||
|
||||
@ -23,15 +23,7 @@
|
||||
|
||||
#undef L
|
||||
#ifdef __ELF__
|
||||
# ifdef __STDC__
|
||||
# define L(body) .L##body
|
||||
# else
|
||||
# define L(body) .L/**/body
|
||||
# endif
|
||||
# define L(body) .L##body
|
||||
#else
|
||||
# ifdef __STDC__
|
||||
# define L(body) L##body
|
||||
# else
|
||||
# define L(body) L/**/body
|
||||
# endif
|
||||
# define L(body) L##body
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/* Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1997, 1998, 1999, 2000, 2004, 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
|
||||
@ -31,23 +32,13 @@
|
||||
# define _MATH_H_MATHDEF 1
|
||||
|
||||
# ifdef __GNUC__
|
||||
# if __STDC__ == 1
|
||||
|
||||
/* In GNU or ANSI mode, gcc leaves `float' expressions as-is. */
|
||||
/* gcc leaves `float' expressions as-is. */
|
||||
typedef float float_t; /* `float' expressions are evaluated as
|
||||
`float'. */
|
||||
typedef double double_t; /* `double' expressions are evaluated as
|
||||
`double'. */
|
||||
|
||||
# else
|
||||
|
||||
/* For `gcc -traditional', `float' expressions are evaluated as `double'. */
|
||||
typedef double float_t; /* `float' expressions are evaluated as
|
||||
`double'. */
|
||||
typedef double double_t; /* `double' expressions are evaluated as
|
||||
`double'. */
|
||||
|
||||
# endif
|
||||
# else
|
||||
|
||||
/* Wild guess at types for float_t and double_t. */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1997, 1998, 1999, 2000, 2004, 2006
|
||||
/* Copyright (C) 1997, 1998, 1999, 2000, 2004, 2006, 2012
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
@ -30,19 +30,11 @@
|
||||
# define _MATH_H_MATHDEF 1
|
||||
|
||||
# ifdef __GNUC__
|
||||
# if __STDC__ == 1
|
||||
|
||||
/* In GNU or ANSI mode, gcc leaves `float' expressions as-is. */
|
||||
/* gcc leaves `float' expressions as-is. */
|
||||
typedef float float_t;
|
||||
typedef double double_t;
|
||||
|
||||
# else
|
||||
|
||||
/* For `gcc -traditional', `float' expressions are evaluated as `double'. */
|
||||
typedef double float_t;
|
||||
typedef double double_t;
|
||||
|
||||
# endif
|
||||
# else
|
||||
|
||||
/* Wild guess at types for float_t and double_t. */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1991, 92, 93, 96, 98, 2003 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991-1993, 96, 98, 2003, 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
|
||||
@ -22,11 +22,7 @@
|
||||
#define HAVE_SYSCALLS
|
||||
|
||||
/* Note that using a `PASTE' macro loses. */
|
||||
#ifdef __STDC__
|
||||
#define SYSCALL__(name, args) PSEUDO (__##name, name, args)
|
||||
#else
|
||||
#define SYSCALL__(name, args) PSEUDO (__/**/name, name, args)
|
||||
#endif
|
||||
#define SYSCALL(name, args) PSEUDO (name, name, args)
|
||||
|
||||
/* Machine-dependent sysdep.h files are expected to define the macro
|
||||
@ -36,11 +32,7 @@
|
||||
an instruction such that "MOVE(r1, r0)" works. ret should be defined
|
||||
as the return instruction. */
|
||||
|
||||
#ifdef __STDC__
|
||||
#define SYS_ify(syscall_name) SYS_##syscall_name
|
||||
#else
|
||||
#define SYS_ify(syscall_name) SYS_/**/syscall_name
|
||||
#endif
|
||||
|
||||
/* Terminate a system call named SYM. This is used on some platforms
|
||||
to generate correct debugging information. */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1992,1997-2003,2004,2005,2006 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1992,1997-2006,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
|
||||
@ -45,11 +45,7 @@
|
||||
of the kernel. But these symbols do not follow the SYS_* syntax
|
||||
so we have to redefine the `SYS_ify' macro here. */
|
||||
#undef SYS_ify
|
||||
#ifdef __STDC__
|
||||
# define SYS_ify(syscall_name) __NR_##syscall_name
|
||||
#else
|
||||
# define SYS_ify(syscall_name) __NR_/**/syscall_name
|
||||
#endif
|
||||
#define SYS_ify(syscall_name) __NR_##syscall_name
|
||||
|
||||
#ifndef __ASSEMBLER__
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1992,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
|
||||
/* Copyright (C) 1992,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2012
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
@ -53,11 +53,7 @@
|
||||
of the kernel. But these symbols do not follow the SYS_* syntax
|
||||
so we have to redefine the `SYS_ify' macro here. */
|
||||
#undef SYS_ify
|
||||
#ifdef __STDC__
|
||||
# define SYS_ify(syscall_name) __NR_##syscall_name
|
||||
#else
|
||||
# define SYS_ify(syscall_name) __NR_/**/syscall_name
|
||||
#endif
|
||||
#define SYS_ify(syscall_name) __NR_##syscall_name
|
||||
|
||||
#ifdef __ASSEMBLER__
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user