Merge commit 'refs/top-bases/t/hurdsig-SA_SIGINFO' into t/hurdsig-SA_SIGINFO

2 files changed, 1 insertions, 76 deletions

diff --git a/sysdeps/sh/sh4/fpu/bits/fenv.h b/sysdeps/sh/sh4/fpu/bits/fenv.h
deleted file mode 100644
index 3171ab6977..0000000000
--- a/sysdeps/sh/sh4/fpu/bits/fenv.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (C) 1999-2013 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _FENV_H
-# error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
-#endif
-
-
-/* Define bits representing the exception.  We use the bit positions
-   of the appropriate bits in the FPU control word.  */
-enum
-  {
-    FE_INEXACT =
-#define FE_INEXACT	0x04
-      FE_INEXACT,
-    FE_UNDERFLOW =
-#define FE_UNDERFLOW	0x08
-      FE_UNDERFLOW,
-    FE_OVERFLOW =
-#define FE_OVERFLOW	0x10
-      FE_OVERFLOW,
-    FE_DIVBYZERO =
-#define FE_DIVBYZERO	0x20
-      FE_DIVBYZERO,
-    FE_INVALID =
-#define FE_INVALID	0x40
-      FE_INVALID,
-  };
-
-#define FE_ALL_EXCEPT \
-	(FE_INEXACT | FE_DIVBYZERO | FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID)
-
-/* The SH FPU supports two of the four defined rounding modes: round to nearest
-   and round to zero.  We use again the bit positions in the FPU control word
-   as the values for the appropriate macros.  */
-enum
-  {
-    __FE_UNDEFINED = -1,
-
-    FE_TONEAREST =
-#define FE_TONEAREST	0x0
-      FE_TONEAREST,
-    FE_TOWARDZERO =
-#define FE_TOWARDZERO	0x1
-      FE_TOWARDZERO,
-  };
-
-
-/* Type representing exception flags.  */
-typedef unsigned short int fexcept_t;
-
-
-/* Type representing floating-point environment.  This function corresponds
-   to the layout of the block written by the `fstenv'.  */
-typedef struct
-  {
-    unsigned int __fpscr;
-  }
-fenv_t;
-
-/* If the default argument is used we use this value.  */
-#define FE_DFL_ENV	((const fenv_t *) -1)
diff --git a/sysdeps/sh/sh4/fpu/fegetround.c b/sysdeps/sh/sh4/fpu/fegetround.c
index be4833f017..0523321b2d 100644
--- a/sysdeps/sh/sh4/fpu/fegetround.c
+++ b/sysdeps/sh/sh4/fpu/fegetround.c
@@ -30,3 +30,4 @@ fegetround (void)
 
   return cw & 0x1;
 }
+libm_hidden_def (fegetround)