diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-11-05 13:16:07 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-11-05 13:16:07 +0000 |
| commit | 99252c8c6256d1afe91651d334cbef402d529fa5 (patch) | |
| tree | 88ba72e782dc1c8888b3a0ed3858f6b3efe6b5a5 /sysdeps | |
| parent | d6d98dea2d97e1dee5ab727982dd7430873c836f (diff) | |
| download | glibc-99252c8c6256d1afe91651d334cbef402d529fa5.tar.gz glibc-99252c8c6256d1afe91651d334cbef402d529fa5.tar.xz glibc-99252c8c6256d1afe91651d334cbef402d529fa5.zip | |
Fix S/390 bits/fenv.h namespace use (bug 14801).
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/s390/fpu/bits/fenv.h | 4 | ||||
| -rw-r--r-- | sysdeps/s390/fpu/fegetenv.c | 4 | ||||
| -rw-r--r-- | sysdeps/s390/fpu/feholdexcpt.c | 4 | ||||
| -rw-r--r-- | sysdeps/s390/fpu/fesetenv.c | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sysdeps/s390/fpu/bits/fenv.h b/sysdeps/s390/fpu/bits/fenv.h index f6cc351231..88c6f7ac04 100644 --- a/sysdeps/s390/fpu/bits/fenv.h +++ b/sysdeps/s390/fpu/bits/fenv.h @@ -76,8 +76,8 @@ typedef unsigned int fexcept_t; /* size of fpc */ to the layout of the block written by the `fstenv'. */ typedef struct { - fexcept_t fpc; - void *ieee_instruction_pointer; + fexcept_t __fpc; + void *__ieee_instruction_pointer; /* failing instruction for ieee exceptions */ } fenv_t; diff --git a/sysdeps/s390/fpu/fegetenv.c b/sysdeps/s390/fpu/fegetenv.c index 243f1f1e15..afbe2c771d 100644 --- a/sysdeps/s390/fpu/fegetenv.c +++ b/sysdeps/s390/fpu/fegetenv.c @@ -1,5 +1,5 @@ /* Store current floating-point environment. - Copyright (C) 2000, 2008 Free Software Foundation, Inc. + Copyright (C) 2000-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Denis Joseph Barrow (djbarrow@de.ibm.com). @@ -23,7 +23,7 @@ int fegetenv (fenv_t *envp) { - _FPU_GETCW (envp->fpc); + _FPU_GETCW (envp->__fpc); /* Success. */ return 0; diff --git a/sysdeps/s390/fpu/feholdexcpt.c b/sysdeps/s390/fpu/feholdexcpt.c index 76ca70fb4f..5b97ade029 100644 --- a/sysdeps/s390/fpu/feholdexcpt.c +++ b/sysdeps/s390/fpu/feholdexcpt.c @@ -1,5 +1,5 @@ /* Store current floating-point environment and clear exceptions. - Copyright (C) 2000, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 2000-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Denis Joseph Barrow (djbarrow@de.ibm.com). @@ -27,7 +27,7 @@ int feholdexcept (fenv_t *envp) fegetenv (envp); /* Clear the current sticky bits as more than one exception may be generated. */ - fpc = envp->fpc & ~(FPC_FLAGS_MASK | FPC_DXC_MASK); + fpc = envp->__fpc & ~(FPC_FLAGS_MASK | FPC_DXC_MASK); /* Hold from generating fpu exceptions temporarily. */ _FPU_SETCW ((fpc & ~(FE_ALL_EXCEPT << FPC_EXCEPTION_MASK_SHIFT))); return 0; diff --git a/sysdeps/s390/fpu/fesetenv.c b/sysdeps/s390/fpu/fesetenv.c index 4fe82999d1..b5342051fa 100644 --- a/sysdeps/s390/fpu/fesetenv.c +++ b/sysdeps/s390/fpu/fesetenv.c @@ -1,5 +1,5 @@ /* Install given floating-point environment. - Copyright (C) 2000, 2008 Free Software Foundation, Inc. + Copyright (C) 2000-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Denis Joseph Barrow (djbarrow@de.ibm.com). @@ -31,18 +31,18 @@ fesetenv (const fenv_t *envp) if (envp == FE_DFL_ENV) { - env.fpc = _FPU_DEFAULT; - env.ieee_instruction_pointer = 0; + env.__fpc = _FPU_DEFAULT; + env.__ieee_instruction_pointer = 0; } else if (envp == FE_NOMASK_ENV) { - env.fpc = FPC_EXCEPTION_MASK; - env.ieee_instruction_pointer = 0; + env.__fpc = FPC_EXCEPTION_MASK; + env.__ieee_instruction_pointer = 0; } else env = (*envp); - _FPU_SETCW (env.fpc); + _FPU_SETCW (env.__fpc); /* Success. */ return 0; |