about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Bingham <koorogi@koorogi.info>2014-04-27 21:13:59 -0500
committerBobby Bingham <koorogi@koorogi.info>2014-04-27 21:13:59 -0500
commit23d64182d8328c300b368446aad20da9cec91aa3 (patch)
tree9fe346fd618904a9430b106b949ebdf6d8a90feb
parentc3d9d172b1fcd56c4d356798f4e3b4653076bcc3 (diff)
downloadmusl-23d64182d8328c300b368446aad20da9cec91aa3.tar.gz
musl-23d64182d8328c300b368446aad20da9cec91aa3.tar.xz
musl-23d64182d8328c300b368446aad20da9cec91aa3.zip
fix superh nofpu check on old gcc versions
As far as gcc3 knows, sh4 is the only processor version that can have an
FPU, so it indicates the FPU's presence by defining __SH4__.  This is not
defined if there is no FPU, even if the processor really is an SH4.

Starting with gcc4, there is support for the sh2a processor, which has an
FPU but is not an SH4.  gcc4 therefore additionally defines __SH_FPU_ANY__
when there is an FPU, but still doesn't define __SH4__ for an FPU-less sh4.

Therefore, to support all gcc versions, we must look at both preprocessor
symbols.
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index eb72a1e6..e8a990b0 100755
--- a/configure
+++ b/configure
@@ -429,7 +429,7 @@ test "$ARCH" = "microblaze" && trycppif __MICROBLAZEEL__ "$t" \
 
 if test "$ARCH" = "sh" ; then
 trycppif __BIG_ENDIAN__ "$t" && SUBARCH=${SUBARCH}eb
-if trycppif __SH_FPU_ANY__ "$t" ; then
+if trycppif "__SH_FPU_ANY__ || __SH4__" "$t" ; 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.