diff options
author | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-27 11:25:41 -0500 |
commit | 43455e09166350b1237d2168d1b008c9f47ebaf0 (patch) | |
tree | 42390fa1645e01c728923b9874cc61a35823cffd /sysdeps | |
parent | 6ac2f2df75d3b48ab502f0b0275b7e838e90c0b1 (diff) | |
parent | 965a54a4eecc6cf5c53718f07290171f744c4d6c (diff) | |
download | glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.gz glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.bz2 glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.zip |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/_G_config.h | 6 | ||||
-rw-r--r-- | sysdeps/generic/sysdep.h | 6 | ||||
-rw-r--r-- | sysdeps/gnu/_G_config.h | 6 | ||||
-rw-r--r-- | sysdeps/i386/asm-syntax.h | 12 | ||||
-rw-r--r-- | sysdeps/mach/hurd/_G_config.h | 6 | ||||
-rw-r--r-- | sysdeps/powerpc/bits/mathdef.h | 14 | ||||
-rw-r--r-- | sysdeps/s390/asm-syntax.h | 12 | ||||
-rw-r--r-- | sysdeps/sh/sh4/bits/mathdef.h | 15 | ||||
-rw-r--r-- | sysdeps/sparc/bits/mathdef.h | 12 | ||||
-rw-r--r-- | sysdeps/unix/sysdep.h | 10 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h | 8 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h | 8 |
12 files changed, 20 insertions, 95 deletions
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h index 4aafe65f6b..67b8dcdd10 100644 --- a/sysdeps/generic/_G_config.h +++ b/sysdeps/generic/_G_config.h @@ -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 */ diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h index d1fec5456e..c844aad031 100644 --- a/sysdeps/generic/sysdep.h +++ b/sysdeps/generic/sysdep.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 diff --git a/sysdeps/gnu/_G_config.h b/sysdeps/gnu/_G_config.h index 211d0224b1..fe43f8c894 100644 --- a/sysdeps/gnu/_G_config.h +++ b/sysdeps/gnu/_G_config.h @@ -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 */ diff --git a/sysdeps/i386/asm-syntax.h b/sysdeps/i386/asm-syntax.h index 19510e01b5..4b9fd20d0d 100644 --- a/sysdeps/i386/asm-syntax.h +++ b/sysdeps/i386/asm-syntax.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 diff --git a/sysdeps/mach/hurd/_G_config.h b/sysdeps/mach/hurd/_G_config.h index db959246ee..8c685619fe 100644 --- a/sysdeps/mach/hurd/_G_config.h +++ b/sysdeps/mach/hurd/_G_config.h @@ -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 */ diff --git a/sysdeps/powerpc/bits/mathdef.h b/sysdeps/powerpc/bits/mathdef.h index 7723f0caaf..3a9b1b0459 100644 --- a/sysdeps/powerpc/bits/mathdef.h +++ b/sysdeps/powerpc/bits/mathdef.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. */ diff --git a/sysdeps/s390/asm-syntax.h b/sysdeps/s390/asm-syntax.h index a1d7b5e74b..98dc6e866e 100644 --- a/sysdeps/s390/asm-syntax.h +++ b/sysdeps/s390/asm-syntax.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 diff --git a/sysdeps/sh/sh4/bits/mathdef.h b/sysdeps/sh/sh4/bits/mathdef.h index 2b8caf1943..5b92234983 100644 --- a/sysdeps/sh/sh4/bits/mathdef.h +++ b/sysdeps/sh/sh4/bits/mathdef.h @@ -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. */ diff --git a/sysdeps/sparc/bits/mathdef.h b/sysdeps/sparc/bits/mathdef.h index c8dcc9c93f..042c9c881b 100644 --- a/sysdeps/sparc/bits/mathdef.h +++ b/sysdeps/sparc/bits/mathdef.h @@ -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. */ diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h index 11e5317dff..e8c1ec8e24 100644 --- a/sysdeps/unix/sysdep.h +++ b/sysdeps/unix/sysdep.h @@ -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. */ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h index c42efbabdd..322e43b61c 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h @@ -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__ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h index e714c4c534..31a077dbf5 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h @@ -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__ |