From nobody Thu May 2 01:20:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14999562045071013.2610381085157; Thu, 13 Jul 2017 07:30:04 -0700 (PDT) Received: from localhost ([::1]:60380 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVf7w-0005Q2-A6 for importer@patchew.org; Thu, 13 Jul 2017 10:30:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVf27-0007iw-2c for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:24:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVf22-0001G7-9b for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:23:59 -0400 Received: from orth.archaic.org.uk ([81.2.115.148]:48451) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVf22-00014j-1s; Thu, 13 Jul 2017 10:23:54 -0400 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 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 81.2.115.148 Subject: [Qemu-devel] [PATCH] configure: Drop ancient Solaris 9 and earlier support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Daniel P. Berrange Reviewed-by: Eric Blake --- 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(-) diff --git a/configure b/configure index 5096cbc..ff77896 100755 --- a/configure +++ b/configure @@ -730,23 +730,6 @@ SunOS) install=3D"${INSTALL-ginstall}" ld=3D"gld" smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" - needs_libsunmath=3D"no" - solarisrev=3D$(uname -r | cut -f2 -d.) - if [ "$cpu" =3D "i386" -o "$cpu" =3D "x86_64" ] ; then - if test "$solarisrev" -le 9 ; then - if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then - needs_libsunmath=3D"yes" - QEMU_CFLAGS=3D"-I/opt/SUNWspro/prod/include/cc $QEMU_CFLAGS" - LDFLAGS=3D"-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib $LDFL= AGS" - LIBS=3D"-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/x= 86" \ - "Studio 11 can be downloaded from www.sun.com." - fi - fi - fi if test -f /usr/include/sys/soundcard.h ; then audio_drv_list=3D"oss" fi @@ -5430,10 +5413,6 @@ fi =20 if test "$solaris" =3D "yes" ; then echo "CONFIG_SOLARIS=3Dy" >> $config_host_mak - echo "CONFIG_SOLARIS_VERSION=3D$solarisrev" >> $config_host_mak - if test "$needs_libsunmath" =3D "yes" ; then - echo "CONFIG_NEEDS_LIBSUNMATH=3Dy" >> $config_host_mak - fi fi if test "$haiku" =3D "yes" ; then echo "CONFIG_HAIKU=3Dy" >> $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 =20 -#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 ty= pe. --=20 2.7.4