summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-13 15:21:37 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-21 15:04:05 +0100
commit91939262ffcd3c85ea6a4793d3029326eea1d649 (patch)
treeda0b151b1d8b3608b176ebbee522b9f5119ecba0
parent951fedfceeda1b09ac8aa1f5263288b65e13caca (diff)
downloadqemu-91939262ffcd3c85ea6a4793d3029326eea1d649.zip
configure: Drop ancient Solaris 9 and earlier support
Solaris 9 was released in 2002, its successor Solaris 10 was released in 2005, and Solaris 9 was end-of-lifed in 2014. Nobody has stepped forward to express interest in supporting Solaris of any flavour, so removing support for the ancient versions seems uncontroversial. In particular, this allows us to remove a use of 'uname' in configure that won't work if you're cross-compiling. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Message-id: 1499955697-28045-1-git-send-email-peter.maydell@linaro.org
-rwxr-xr-xconfigure21
-rw-r--r--include/fpu/softfloat.h5
2 files changed, 0 insertions, 26 deletions
diff --git a/configure b/configure
index c9cb740130..6b52e19ee3 100755
--- a/configure
+++ b/configure
@@ -747,23 +747,6 @@ SunOS)
install="${INSTALL-ginstall}"
ld="gld"
smbd="${SMBD-/usr/sfw/sbin/smbd}"
- needs_libsunmath="no"
- solarisrev=$(uname -r | cut -f2 -d.)
- if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
- if test "$solarisrev" -le 9 ; then
- if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then
- needs_libsunmath="yes"
- QEMU_CFLAGS="-I/opt/SUNWspro/prod/include/cc $QEMU_CFLAGS"
- LDFLAGS="-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib $LDFLAGS"
- LIBS="-lsunmath $LIBS"
- else
- error_exit "QEMU will not link correctly on Solaris 8/X86 or 9/x86 without" \
- "libsunmath from the Sun Studio compilers tools, due to a lack of" \
- "C99 math features in libm.so in Solaris 8/x86 and Solaris 9/x86" \
- "Studio 11 can be downloaded from www.sun.com."
- fi
- fi
- fi
if test -f /usr/include/sys/soundcard.h ; then
audio_drv_list="oss"
fi
@@ -5517,10 +5500,6 @@ fi
if test "$solaris" = "yes" ; then
echo "CONFIG_SOLARIS=y" >> $config_host_mak
- echo "CONFIG_SOLARIS_VERSION=$solarisrev" >> $config_host_mak
- if test "$needs_libsunmath" = "yes" ; then
- echo "CONFIG_NEEDS_LIBSUNMATH=y" >> $config_host_mak
- fi
fi
if test "$haiku" = "yes" ; then
echo "CONFIG_HAIKU=y" >> $config_host_mak
diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h
index d9689eca2a..0f96a0edd1 100644
--- a/include/fpu/softfloat.h
+++ b/include/fpu/softfloat.h
@@ -82,11 +82,6 @@ this code that are retained.
#ifndef SOFTFLOAT_H
#define SOFTFLOAT_H
-#if defined(CONFIG_SOLARIS) && defined(CONFIG_NEEDS_LIBSUNMATH)
-#include <sunmath.h>
-#endif
-
-
/* This 'flag' type must be able to hold at least 0 and 1. It should
* probably be replaced with 'bool' but the uses would need to be audited
* to check that they weren't accidentally relying on it being a larger type.