diff options
| author | Roland McGrath <roland@gnu.org> | 2003-02-27 20:57:19 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-02-27 20:57:19 +0000 |
| commit | 73a061bbe9b6a6c79d0a777d81c376306b5da98d (patch) | |
| tree | 8b91212d2276fe8ebce579c4bff78aaea4ed499b /sysdeps | |
| parent | f4038ed763e48e3530a330513eeba9ff5ff78156 (diff) | |
| download | glibc-73a061bbe9b6a6c79d0a777d81c376306b5da98d.tar.gz glibc-73a061bbe9b6a6c79d0a777d81c376306b5da98d.tar.xz glibc-73a061bbe9b6a6c79d0a777d81c376306b5da98d.zip | |
* sysdeps/powerpc/fpu/fpu_control.h (_FPU_GETCW, _FPU_SETCW):
Rename argument to avoid symbol conflict. * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h [__USE_GNU] (O_DIRECT): New macro.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/powerpc/fpu/fpu_control.h | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h | 13 |
2 files changed, 14 insertions, 13 deletions
diff --git a/sysdeps/powerpc/fpu/fpu_control.h b/sysdeps/powerpc/fpu/fpu_control.h index 7b58b7bc91..1b2ba87c9d 100644 --- a/sysdeps/powerpc/fpu/fpu_control.h +++ b/sysdeps/powerpc/fpu/fpu_control.h @@ -49,15 +49,17 @@ typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__SI__))); /* Macros for accessing the hardware control word. */ -#define _FPU_GETCW(cw) ( { \ - union { double d; fpu_control_t cw[2]; } tmp __attribute__ ((__aligned__(8))); \ +#define _FPU_GETCW(__cw) ( { \ + union { double d; fpu_control_t cw[2]; } \ + tmp __attribute__ ((__aligned__(8))); \ __asm__ ("mffs 0; stfd%U0 0,%0" : "=m" (tmp.d) : : "fr0"); \ - (cw)=tmp.cw[1]; \ + (__cw)=tmp.cw[1]; \ tmp.cw[1]; } ) -#define _FPU_SETCW(cw) { \ - union { double d; fpu_control_t cw[2]; } tmp __attribute__ ((__aligned__(8))); \ +#define _FPU_SETCW(__cw) { \ + union { double d; fpu_control_t cw[2]; } \ + tmp __attribute__ ((__aligned__(8))); \ tmp.cw[0] = 0xFFF80000; /* More-or-less arbitrary; this is a QNaN. */ \ - tmp.cw[1] = cw; \ + tmp.cw[1] = __cw; \ __asm__ ("lfd%U0 0,%0; mtfsf 255,0" : : "m" (tmp.d) : "fr0"); \ } diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h index 7d9fa8f595..98608c554f 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h @@ -1,5 +1,5 @@ -/* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 1995-1998, 2000 Free Software Foundation, Inc. +/* O_*, F_*, FD_* bit values for Linux/PowerPC. + Copyright (C) 1995,1996,1997,1998,2000,2003 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 @@ -42,7 +42,8 @@ #define O_ASYNC 020000 #ifdef __USE_GNU -# define O_DIRECTORY 040000 /* Must be a directory. */ +# define O_DIRECT 0400000 /* Direct disk access. */ +# define O_DIRECTORY 040000 /* Must be a directory. */ # define O_NOFOLLOW 0100000 /* Do not follow links. */ #endif @@ -64,7 +65,6 @@ #define F_SETFD 2 /* Set file descriptor flags. */ #define F_GETFL 3 /* Get file status flags. */ #define F_SETFL 4 /* Set file status flags. */ - #ifndef __USE_FILE_OFFSET64 # define F_GETLK 5 /* Get record locking info. */ # define F_SETLK 6 /* Set record locking info (non-blocking). */ @@ -74,7 +74,6 @@ # define F_SETLK F_SETLK64 /* Set record locking info (non-blocking).*/ # define F_SETLKW F_SETLKW64 /* Set record locking info (blocking). */ #endif - #define F_GETLK64 12 /* Get record locking info. */ #define F_SETLK64 13 /* Set record locking info (non-blocking). */ #define F_SETLKW64 14 /* Set record locking info (blocking). */ @@ -103,12 +102,12 @@ #define F_WRLCK 1 /* Write lock. */ #define F_UNLCK 2 /* Remove lock. */ -/* for old implementation of bsd flock () */ +/* For old implementation of bsd flock(). */ #define F_EXLCK 4 /* or 3 */ #define F_SHLCK 8 /* or 4 */ #ifdef __USE_BSD -/* Operations for bsd flock(), also used by the kernel implementation */ +/* Operations for bsd flock(), also used by the kernel implementation. */ # define LOCK_SH 1 /* shared lock */ # define LOCK_EX 2 /* exclusive lock */ # define LOCK_NB 4 /* or'd with one of the above to prevent |