add nofpu subarchs to the sh arch, and properly detect compiler's fpu config

diff --git a/arch/sh/bits/fenv.h b/arch/sh/bits/fenv.h
index f454a15d11b9e3355fca4f33d9d91227b7bbdfd7..7f1b8b66c6d1a9d3f7fb0c522a17453b0e98468b 100644 (file)
--- a/arch/sh/bits/fenv.h
+++ b/arch/sh/bits/fenv.h
@@ -1,3 +1,10 @@
+#ifndef __SH_FPU_ANY__
+
+#define FE_ALL_EXCEPT 0
+#define FE_TONEAREST  0
+
+#else
+
 #define FE_TONEAREST  0
 #define FE_TOWARDZERO 1
 
@@ -8,6 +15,8 @@
 #define FE_INVALID    0x40
 #define FE_ALL_EXCEPT 0x7c
 
+#endif
+
 typedef unsigned long fexcept_t;
 
 typedef struct {

diff --git a/configure b/configure
index 1a092f523b1b31138622b2d1c42761fa6575a871..572ea6404b51f5e38642d4707fe987170049f32e 100755 (executable)
--- a/configure
+++ b/configure
@@ -421,8 +421,24 @@ fi
 test "$ARCH" = "microblaze" && trycppif __MICROBLAZEEL__ "$t" \
 && SUBARCH=${SUBARCH}el
 
-test "$ARCH" = "sh" && trycppif __BIG_ENDIAN__ "$t" \
-&& SUBARCH=${SUBARCH}eb
+if test "$ARCH" = "sh" ; then
+trycppif __BIG_ENDIAN__ "$t" && SUBARCH=${SUBARCH}eb
+if trycppif __SH_FPU_ANY__ ; then
+# Some sh configurations are broken and replace double with float
+# rather than using softfloat when the fpu is present but only
+# supports single precision. Reject them.
+printf "checking whether compiler's double type is IEEE double... "
+echo 'typedef char dblcheck[(int)sizeof(double)-5];' >> "$tmpc"
+if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+printf "yes\n"
+else
+printf "no\n"
+fail "$0: error: compiler's floating point configuration is unsupported"
+fi
+else
+SUBARCH=${SUBARCH}-nofpu
+fi
+fi
 
 test "$SUBARCH" \
 && printf "configured for %s variant: %s\n" "$ARCH" "$ARCH$SUBARCH"

diff --git a/src/fenv/sh-nofpu/fenv.sub b/src/fenv/sh-nofpu/fenv.sub
new file mode 100644 (file)
index 0000000..9cafca5
--- /dev/null
+++ b/src/fenv/sh-nofpu/fenv.sub
@@ -0,0 +1 @@
+../fenv.c

diff --git a/src/fenv/sheb-nofpu/fenv.sub b/src/fenv/sheb-nofpu/fenv.sub
new file mode 100644 (file)
index 0000000..9cafca5
--- /dev/null
+++ b/src/fenv/sheb-nofpu/fenv.sub
@@ -0,0 +1 @@
+../fenv.c

diff --git a/src/setjmp/sh-nofpu/longjmp.s b/src/setjmp/sh-nofpu/longjmp.s
new file mode 100644 (file)
index 0000000..cda482c
--- /dev/null
+++ b/src/setjmp/sh-nofpu/longjmp.s
@@ -0,0 +1,22 @@
+.global _longjmp
+.global longjmp
+.type   _longjmp, @function
+.type   longjmp,  @function
+_longjmp:
+longjmp:
+       mov.l  @r4+, r8
+       mov.l  @r4+, r9
+       mov.l  @r4+, r10
+       mov.l  @r4+, r11
+       mov.l  @r4+, r12
+       mov.l  @r4+, r13
+       mov.l  @r4+, r14
+       mov.l  @r4+, r15
+       lds.l  @r4+, pr
+
+       tst  r5, r5
+       movt r0
+       add  r5, r0
+
+       rts
+        nop

diff --git a/src/setjmp/sh-nofpu/longjmp.sub b/src/setjmp/sh-nofpu/longjmp.sub
new file mode 100644 (file)
index 0000000..e80331b
--- /dev/null
+++ b/src/setjmp/sh-nofpu/longjmp.sub
@@ -0,0 +1 @@
+longjmp.s

diff --git a/src/setjmp/sh-nofpu/setjmp.s b/src/setjmp/sh-nofpu/setjmp.s
new file mode 100644 (file)
index 0000000..c6c7359
--- /dev/null
+++ b/src/setjmp/sh-nofpu/setjmp.s
@@ -0,0 +1,21 @@
+.global __setjmp
+.global _setjmp
+.global setjmp
+.type   __setjmp, @function
+.type   _setjmp,  @function
+.type   setjmp,   @function
+__setjmp:
+_setjmp:
+setjmp:
+       add   #36, r4
+       sts.l  pr,   @-r4
+       mov.l  r15   @-r4
+       mov.l  r14,  @-r4
+       mov.l  r13,  @-r4
+       mov.l  r12,  @-r4
+       mov.l  r11,  @-r4
+       mov.l  r10,  @-r4
+       mov.l  r9,   @-r4
+       mov.l  r8,   @-r4
+       rts
+        mov  #0, r0

diff --git a/src/setjmp/sh-nofpu/setjmp.sub b/src/setjmp/sh-nofpu/setjmp.sub
new file mode 100644 (file)
index 0000000..b7ad221
--- /dev/null
+++ b/src/setjmp/sh-nofpu/setjmp.sub
@@ -0,0 +1 @@
+setjmp.s

diff --git a/src/setjmp/sheb-nofpu/longjmp.sub b/src/setjmp/sheb-nofpu/longjmp.sub
new file mode 100644 (file)
index 0000000..62fcd2b
--- /dev/null
+++ b/src/setjmp/sheb-nofpu/longjmp.sub
@@ -0,0 +1 @@
+../sh-nofpu/longjmp.s

diff --git a/src/setjmp/sheb-nofpu/setjmp.sub b/src/setjmp/sheb-nofpu/setjmp.sub
new file mode 100644 (file)
index 0000000..a5bb294
--- /dev/null
+++ b/src/setjmp/sheb-nofpu/setjmp.sub
@@ -0,0 +1 @@
+../sh-nofpu/setjmp.s