switch arm, sh, and mips fenv asm from .sub system to .S files

diff --git a/src/fenv/armhf/fenv.s b/src/fenv/arm/fenv-hf.S
similarity index 97%
rename from src/fenv/armhf/fenv.s
rename to src/fenv/arm/fenv-hf.S
index 53307e68e1b86e03d20f132712c2e96b5f3cb9de..f55d798a606207b4cf9e6da4ee9f074ea331e9f2 100644 (file)
--- a/src/fenv/armhf/fenv.s
+++ b/src/fenv/arm/fenv-hf.S
@@ -1,3 +1,5 @@
+#if __ARM_PCS_VFP
+
 .syntax unified
 .fpu vfp
 
@@ -63,3 +65,5 @@ fesetenv:
        fmxr fpscr, r3
        mov r0, #0
        bx lr
+
+#endif

diff --git a/src/fenv/arm/fenv.c b/src/fenv/arm/fenv.c
new file mode 100644 (file)
index 0000000..ad295f5
--- /dev/null
+++ b/src/fenv/arm/fenv.c
@@ -0,0 +1,3 @@
+#if !__ARM_PCS_VFP
+#include "../fenv.c"
+#endif

diff --git a/src/fenv/armebhf/fenv.sub b/src/fenv/armebhf/fenv.sub
deleted file mode 100644 (file)
index 5281e40..0000000
--- a/src/fenv/armebhf/fenv.sub
+++ /dev/null
@@ -1 +0,0 @@
-../armhf/fenv.s

diff --git a/src/fenv/armhf/fenv.sub b/src/fenv/armhf/fenv.sub
deleted file mode 100644 (file)
index ec559cd..0000000
--- a/src/fenv/armhf/fenv.sub
+++ /dev/null
@@ -1 +0,0 @@
-fenv.s

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

diff --git a/src/fenv/mips/fenv-sf.c b/src/fenv/mips/fenv-sf.c
new file mode 100644 (file)
index 0000000..4aa3dbf
--- /dev/null
+++ b/src/fenv/mips/fenv-sf.c
@@ -0,0 +1,3 @@
+#ifdef __mips_soft_float
+#include "../fenv.c"
+#endif

diff --git a/src/fenv/mips/fenv.s b/src/fenv/mips/fenv.S
similarity index 96%
rename from src/fenv/mips/fenv.s
rename to src/fenv/mips/fenv.S
index 62828212ab965fba35e6cd205d001b5103245a26..a5cb1f5833906c574dd46e78ccd6c89ae8f6315c 100644 (file)
--- a/src/fenv/mips/fenv.s
+++ b/src/fenv/mips/fenv.S
@@ -1,3 +1,5 @@
+#ifndef __mips_soft_float
+
 .set noreorder
 
 .global feclearexcept
@@ -65,3 +67,5 @@ fesetenv:
 1:     ctc1    $5, $31
        jr      $ra
        li      $2, 0
+
+#endif

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

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

diff --git a/src/fenv/sh/fenv-nofpu.c b/src/fenv/sh/fenv-nofpu.c
new file mode 100644 (file)
index 0000000..b2495a6
--- /dev/null
+++ b/src/fenv/sh/fenv-nofpu.c
@@ -0,0 +1,3 @@
+#if !__SH_FPU_ANY__ && !__SH4__
+#include "../fenv.c"
+#endif

diff --git a/src/fenv/sh/fenv.s b/src/fenv/sh/fenv.S
similarity index 96%
rename from src/fenv/sh/fenv.s
rename to src/fenv/sh/fenv.S
index 7f5c62778e3f7f82cfdd6c1790cd3e6291fc2aeb..cd47b5bc21eb2db33cc942d60743b32352c42e86 100644 (file)
--- a/src/fenv/sh/fenv.s
+++ b/src/fenv/sh/fenv.S
@@ -1,3 +1,5 @@
+#if __SH_FPU_ANY__ || __SH4__
+
 .global fegetround
 .type   fegetround, @function
 fegetround:
@@ -72,3 +74,5 @@ fesetenv:
 2:     lds r0, fpscr
        rts
         mov #0, r0
+
+#endif

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