libm: add i387/ dir, fix test51 compilation

	. if $MACHINE_ARCH is unknown, use $MACHINE like in libc
	. fixes test51 compilation for gcc/clang (with other compile
	  and link fixes)

diff --git a/lib/nbsd_libm/Makefile b/lib/nbsd_libm/Makefile
index 3c3de53b99acdb80c31cc5ef491a8b7e0e227049..860eb95cb478392f8653f111298db1c4667bd259 100644 (file)
--- a/lib/nbsd_libm/Makefile
+++ b/lib/nbsd_libm/Makefile
@@ -13,6 +13,14 @@
 #
 #
 
+.warning  MACHINE_ARCH is first ${MACHINE_ARCH}
+
+.if ${MACHINE_ARCH} == "unknown"
+MACHINE_ARCH:= ${MACHINE}
+.endif
+
+.warning  MACHINE_ARCH is now ${MACHINE_ARCH}
+
 #
 # There are two options in making libm at fdlibm compile time:
 #      _IEEE_LIBM      --- IEEE libm; smaller, and somewhat faster

diff --git a/lib/nbsd_libm/arch/i387/fenv.c b/lib/nbsd_libm/arch/i387/fenv.c
index 035afd3bf3a6219f483ff37e874198a33f8f7576..085e030ab5068e5b6cbe12ec6268172c9e915d40 100644 (file)
--- a/lib/nbsd_libm/arch/i387/fenv.c
+++ b/lib/nbsd_libm/arch/i387/fenv.c
@@ -122,8 +122,10 @@ static void __test_sse(void)
        size_t oldlen = sizeof(__HAS_SSE);
        int rv;
 
+#ifndef __minix
        rv = sysctlbyname("machdep.sse", &__HAS_SSE, &oldlen, NULL, 0);
        if (rv == -1)
+#endif
                __HAS_SSE = 0;
 }
 

diff --git a/test/Makefile b/test/Makefile
index 720e010ba922a5ac1738d6d42013e51b61307200..0c7b3a3879b6276e38324bab827e8c9b53dd2fae 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,8 +2,8 @@
 
 GCC?=gcc
 CFLAGS= -O0 -D_MINIX -D_POSIX_SOURCE
-CFLAGS-GCC= $(CFLAGS) -Wall 
-CFLAGS-GCCFPU= $(CFLAGS) -Wall -mhard-float
+CFLAGS-GCC= $(CFLAGS) -Wall  -D_NETBSD_SOURCE 
+CFLAGS-GCCFPU= $(CFLAGS) -Wall -mhard-float 
 CFLAGS-GCCFPU= $(CFLAGS-GCC) -W -mhard-float
 
 OBJ=   test1  test2  test3  test4  test5  test6  test7  test8  test9  \
@@ -33,7 +33,7 @@ $(GCCOBJ):
        if which $(GCC) >/dev/null 2>&1; then $(GCC) $(CFLAGS-GCC) -o $@ ${@:S/-gcc//}.c; fi
 
 $(GCCFPUOBJ):
-       if which $(GCC) >/dev/null 2>&1; then $(GCC) $(CFLAGS-GCCFPU) -o $@ ${@:S/-gcc//}.c; fi
+       if which $(GCC) >/dev/null 2>&1; then $(GCC) $(CFLAGS-GCCFPU) -o $@ ${@:S/-gcc//}.c -lm; fi
 
 $(ROOTOBJ):
        $(CC) $(CFLAGS) $@.c

diff --git a/test/test51.c b/test/test51.c
index 6527fc4ffb69b9d8140ff6a2fcf487a71bbc7f12..449ad72f68382730d260d3d40f2df61d75e4e082 100644 (file)
--- a/test/test51.c
+++ b/test/test51.c
@@ -5,6 +5,7 @@
  * Part of this test is somewhat based on the GNU GCC ucontext test set.
  *
  */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -14,6 +15,8 @@
 #include <math.h>
 #include <fenv.h>
 
+#include <sys/signal.h>
+
 _PROTOTYPE( void do_calcs, (void)                                      );
 _PROTOTYPE( void do_child, (void)                                      );
 _PROTOTYPE( void do_parent, (void)                                     );