Revert (leaving the complex math part alone). Some stuff is depending

on this historical behavior;  so we're stuck in this stupid situation.
No cookie for me.

2 files changed, 43 insertions, 3 deletions

diff --git a/lib/libc/arch/sh/gen/Makefile.inc b/lib/libc/arch/sh/gen/Makefile.inc
index 5566687b208..55de1973b30 100644
--- a/lib/libc/arch/sh/gen/Makefile.inc
+++ b/lib/libc/arch/sh/gen/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2011/07/08 19:21:42 martynas Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2011/07/08 22:28:33 martynas Exp $
 
-SRCS+= flt_rounds.c infinity.c ldexp.c nan.c setjmp.S _setjmp.S
+SRCS+= flt_rounds.c infinity.c ldexp.c modf.c nan.c setjmp.S _setjmp.S
 SRCS+= sigsetjmp.S
-SRCS+=	fpgetmask.c fpgetround.c fpgetsticky.c \
+SRCS+=	fabs.c fpgetmask.c fpgetround.c fpgetsticky.c \
 	fpsetmask.c fpsetround.c fpsetsticky.c
diff --git a/lib/libc/arch/sh/gen/fabs.c b/lib/libc/arch/sh/gen/fabs.c
new file mode 100644
index 00000000000..b7396043b43
--- /dev/null
+++ b/lib/libc/arch/sh/gen/fabs.c
@@ -0,0 +1,40 @@
+/*	$OpenBSD: fabs.c,v 1.9 2011/07/08 22:28:33 martynas Exp $	*/
+/*
+ * Copyright (c) 2006 Miodrag Vallat.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice, this permission notice, and the disclaimer below
+ * appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/cdefs.h>
+#if !defined(__SH4__) || defined(__SH4_NOFPU__)
+#include <sys/types.h>
+#include <machine/ieee.h>
+#endif /* !defined(__SH4__) || defined(__SH4_NOFPU__) */
+
+#include <math.h>
+
+double
+fabs(double d)
+{
+#if defined(__SH4__) && !defined(__SH4_NOFPU__)
+	__asm__ __volatile__("fabs %0" : "+f" (d));
+#else
+	struct ieee_double *p = (struct ieee_double *)&d;
+
+	p->dbl_sign = 0;
+#endif
+	return (d);
+}
+
+__weak_alias(fabsl, fabs);