configure: Drop ancient Solaris 9 and earlier support

Message ID 1499955697-28045-1-git-send-email-peter.maydell@linaro.org
State Accepted
Commit 91939262ffcd3c85ea6a4793d3029326eea1d649
Headers show

Commit Message

Peter Maydell July 13, 2017, 2:21 p.m.
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>

---
Not a big thing, but it's a start on cleaning out some
of the untested and untestable cruft from configure...

 configure               | 21 ---------------------
 include/fpu/softfloat.h |  5 -----
 2 files changed, 26 deletions(-)

-- 
2.7.4

Comments

Eric Blake July 13, 2017, 2:37 p.m. | #1
On 07/13/2017 09:21 AM, Peter Maydell wrote:
> 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>

> ---

> Not a big thing, but it's a start on cleaning out some

> of the untested and untestable cruft from configure...


Reviewed-by: Eric Blake <eblake@redhat.com>


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org
Daniel P. Berrange July 13, 2017, 3:14 p.m. | #2
On Thu, Jul 13, 2017 at 03:21:37PM +0100, Peter Maydell wrote:
> 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>

> ---

> Not a big thing, but it's a start on cleaning out some

> of the untested and untestable cruft from configure...

> 

>  configure               | 21 ---------------------

>  include/fpu/softfloat.h |  5 -----

>  2 files changed, 26 deletions(-)


Reviewed-by: Daniel P. Berrange <berrange@redhat.com>



Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Peter Maydell July 21, 2017, 3:24 p.m. | #3
On 13 July 2017 at 15:21, Peter Maydell <peter.maydell@linaro.org> wrote:
> 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>

> ---

> Not a big thing, but it's a start on cleaning out some

> of the untested and untestable cruft from configure...

>


Applied to master, thanks.

-- PMM

Patch hide | download patch | download mbox

diff --git a/configure b/configure
index 5096cbc..ff77896 100755
--- a/configure
+++ b/configure
@@ -730,23 +730,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
@@ -5430,10 +5413,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 d9689ec..0f96a0e 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.