From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IWXGB-0001qC-NC
	for qemu-devel@nongnu.org; Sat, 15 Sep 2007 09:00:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IWXG9-0001ow-A9
	for qemu-devel@nongnu.org; Sat, 15 Sep 2007 09:00:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IWXG9-0001or-41
	for qemu-devel@nongnu.org; Sat, 15 Sep 2007 09:00:29 -0400
Received: from eastrmmtao104.cox.net ([68.230.240.46])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <sol10x86@cox.net>) id 1IWXG8-0003Sq-Lw
	for qemu-devel@nongnu.org; Sat, 15 Sep 2007 09:00:28 -0400
Received: from eastrmimpo01.cox.net ([68.1.16.119]) by eastrmmtao104.cox.net
	(InterMail vM.7.08.02.01 201-2186-121-102-20070209) with ESMTP
	id <20070915130028.JQD21140.eastrmmtao104.cox.net@eastrmimpo01.cox.net>
	for <qemu-devel@nongnu.org>; Sat, 15 Sep 2007 09:00:28 -0400
Message-ID: <19554023.1189861227843.JavaMail.root@eastrmwml11>
Date: Sat, 15 Sep 2007 9:00:27 -0400
From: Ben Taylor <sol10x86@cox.net>
Subject: Re: [Qemu-devel] Solaris x86_64 configure patch
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Reply-To: sol10x86@cox.net, qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org


Corrected version of the patch.

--- qemu.ORIG/configure 2007-08-24 21:37:51.000000000 -0400
+++ qemu/configure      2007-09-15 09:07:47.928893000 -0400
@@ -155,6 +155,12 @@
     install="ginstall"
     needs_libsunmath="no"
     solarisrev=`uname -r | cut -f2 -d.`
+    # have to select again, because `uname -m` returns i86pc
+    # even on an x86_64 box.
+    solariscpu=`isainfo -k`
+    if test "${solariscpu}" = "amd64" ; then
+        cpu="x86_64"
+    fi
     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
@@ -333,6 +339,16 @@
            ;;
 esac

+if [ "$solaris" = "yes" -a  "$cpu" = "x86_64" ] ; then
+    CFLAGS="${CFLAGS} -m64"
+    OS_CFLAGS="${OS_CFLAGS} -m64"
+fi
+
+if [ "$solaris" = "yes" -a  "$cpu" = "i386" ] ; then
+    CFLAGS="${CFLAGS} -m32"
+    OS_CFLAGS="${OS_CFLAGS} -m32"
+fi
+
 if test x"$show_help" = x"yes" ; then
 cat << EOF