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/unix | |
| parent | 6ac2f2df75d3b48ab502f0b0275b7e838e90c0b1 (diff) | |
| parent | 965a54a4eecc6cf5c53718f07290171f744c4d6c (diff) | |
| download | glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.zip glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.gz glibc-43455e09166350b1237d2168d1b008c9f47ebaf0.tar.bz2 | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Diffstat (limited to 'sysdeps/unix')
| -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 |
3 files changed, 5 insertions, 21 deletions
diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h index 11e5317..e8c1ec8 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 c42efba..322e43b 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 e714c4c..31a077d 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__ |