From patchwork Thu Jul 13 14:21:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 107683 Delivered-To: patches@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2277329qge; Thu, 13 Jul 2017 07:21:39 -0700 (PDT) X-Received: by 10.28.31.203 with SMTP id f194mr2208508wmf.44.1499955699604; Thu, 13 Jul 2017 07:21:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499955699; cv=none; d=google.com; s=arc-20160816; b=LRbOWH0lzvHCkYeE5Dc/U5svx000BVow1DP2cPztfdUJbNX3gDb3psKdTaVmPSlJxn PGBBsI0GAoA4pzR8xIOU5An/x9QwFp9fwUMrt3XMYvae1DbBghUOrrzutdY8M+wbHalf vsSVmOf8TU8VFCBfrxgT1G3dQFtbm3418pos3gPqMbY+SoOSIOwmHiTH0KU6enMtyPME dSqwTRNYpMbhPwda6kYOFGMtuu7+J3lBpk4VVCvd6+pajuC+3IBzHXagT+WOyCeVGIfp PSS0w2/ztJO2MqbTJUT8L7g02BNERmVdsZqhvIEgCTo+e+tXRf3Ks34U/qYOC3p1gNGy Ilhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=F+WjlRUBloPfF5vRwo+o5mf3gaQBWhlKv+wjDQOnZa4=; b=OmsOYCtDn5lMLDzEKsX18qY+FAbrB/7REeD3mKY0tdvDmNh+HUOio6JFBuP/YAL7gN wVVK8vbCMoe2cY+FfkZ9UTMSz6/4RZQihk5uKCfiUuKCOGh7LrF5BgNcgErdbTiNZt4m pr9gGqlZk/qJPGJtTHHQN5hjjkxfOiGXG4QbuJ+aVyE6JbE4TWRUCoAUspazBWoQ+q7a rSE+CilpUMVGz3AUCjLhZAG1jBEiR8oAgx/7PWfvG7QldC55RCm0SLOfDoxkWv9shV3v RYZhv8wWbo2SEid6ElnQojfWG0SbCtaYlTy8Vvghou3QYV5wN75SVqzUVo/HEETgE9Ep y63A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id v107si4327764wrc.22.2017.07.13.07.21.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 07:21:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dVezq-0005xS-MU; Thu, 13 Jul 2017 15:21:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org Cc: patches@linaro.org Subject: [PATCH] configure: Drop ancient Solaris 9 and earlier support Date: Thu, 13 Jul 2017 15:21:37 +0100 Message-Id: <1499955697-28045-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 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 --- 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 Reviewed-by: Eric Blake Reviewed-by: Daniel P. Berrange 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 -#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.