Update.

2000-08-16  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/sparc/fpu/fedisblxcpt.c: New file.
	* sysdeps/sparc/fpu/feenablxcpt.c: New file.
	* sysdeps/sparc/fpu/fegetexcept.c: New file.
	* sysdeps/sparc/sparc64/fpu/e_sqrtl.c: New file.

	* sysdeps/sparc/sparc64/dl-machine.h: Subtract 4 .rela.plt entries
	to match Solaris.

5 files changed, 138 insertions, 3 deletions

diff --git a/sysdeps/sparc/fpu/fedisblxcpt.c b/sysdeps/sparc/fpu/fedisblxcpt.c
new file mode 100644
index 0000000000..27378ac873
--- /dev/null
+++ b/sysdeps/sparc/fpu/fedisblxcpt.c
@@ -0,0 +1,36 @@
+/* Disable floating-point exceptions.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fenv.h>
+
+int
+fedisableexcept (int excepts)
+{
+  fenv_t new_exc, old_exc;
+
+  __fenv_stfsr (new_exc);
+
+  old_exc = (new_exc >> 18) & FE_ALL_EXCEPT;
+  new_exc &= ~(((fenv_t)excepts & FE_ALL_EXCEPT) << 18);
+
+  __fenv_ldfsr (new_exc);
+
+  return old_exc;
+}
diff --git a/sysdeps/sparc/fpu/feenablxcpt.c b/sysdeps/sparc/fpu/feenablxcpt.c
new file mode 100644
index 0000000000..20df4d1ed9
--- /dev/null
+++ b/sysdeps/sparc/fpu/feenablxcpt.c
@@ -0,0 +1,36 @@
+/* Enable floating-point exceptions.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fenv.h>
+
+int
+feenableexcept (int excepts)
+{
+  fenv_t new_exc, old_exc;
+
+  __fenv_stfsr (new_exc);
+
+  old_exc = (new_exc >> 18) & FE_ALL_EXCEPT;
+  new_exc |= (((fenv_t)excepts & FE_ALL_EXCEPT) << 18);
+
+  __fenv_ldfsr (new_exc);
+
+  return old_exc;
+}
diff --git a/sysdeps/sparc/fpu/fegetexcept.c b/sysdeps/sparc/fpu/fegetexcept.c
new file mode 100644
index 0000000000..df57834b42
--- /dev/null
+++ b/sysdeps/sparc/fpu/fegetexcept.c
@@ -0,0 +1,30 @@
+/* Get enabled floating-point exceptions.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <fenv.h>
+
+int
+fegetexcept (void)
+{
+  fenv_t exc;
+  __fenv_stfsr (exc);
+
+  return (exc >> 18) & FE_ALL_EXCEPT;
+}
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h
index fc89f08ed2..6aa9ca6659 100644
--- a/sysdeps/sparc/sparc64/dl-machine.h
+++ b/sysdeps/sparc/sparc64/dl-machine.h
@@ -446,8 +446,8 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
       plt[8 + 6] = 0xadc40011;
       plt[8 + 7] = 0x9330700c;
 
-      /* Now put the magic cookie at the beginning of .PLT3
-	 Entry .PLT4 is unused by this implementation.  */
+      /* Now put the magic cookie at the beginning of .PLT2
+	 Entry .PLT3 is unused by this implementation.  */
       *((struct link_map **)(&plt[16 + 0])) = l;
     }
 
@@ -467,13 +467,14 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
 	ldx	[%l6 + 32 + 8], %o0
 	sub     %g1, %l6, %l0
 	xor     %l2, -1016, %l2
-	sethi   %hi(5120), %l3
+	sethi   %hi(5120), %l3	! 160 * 32
 	add     %l0, %l2, %l0
 	sethi   %hi(32768), %l4
 	udivx   %l0, %l3, %l3
 	sllx    %l3, 2, %l1
 	add     %l1, %l3, %l1
 	sllx    %l1, 10, %l2
+	sub	%l4, 4, %l4	! No thanks to Sun for not obeying their own ABI
 	sllx    %l1, 5, %l1
 	sub     %l0, %l2, %l0
 	udivx   %l0, 24, %l0
@@ -495,6 +496,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
 	! srlx	%g1, 12, %o1 - Done in .PLT1
 	ldx	[%l6 + 8], %o0
 	add	%o1, %o1, %o3
+	sub	%o1, 96, %o1	! No thanks to Sun for not obeying their own ABI
 	mov	%i7, %o2
 	call	" #fixup_name "
 	 add	%o1, %o3, %o1
diff --git a/sysdeps/sparc/sparc64/fpu/e_sqrtl.c b/sysdeps/sparc/sparc64/fpu/e_sqrtl.c
new file mode 100644
index 0000000000..122fae3b2c
--- /dev/null
+++ b/sysdeps/sparc/sparc64/fpu/e_sqrtl.c
@@ -0,0 +1,31 @@
+/* Long double square root, sparc64 version.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <math.h>
+
+extern void _Qp_sqrt(long double *, const long double *);
+
+long double
+__ieee754_sqrtl (long double x)
+{
+  long double ret;
+  _Qp_sqrt (&ret, &x);
+  return ret;
+}