From a6bf543578ea2c1539b0f2d9c1a775d77ffaca89 Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net" <bsmedberg%covad.net>
Date: Thu, 5 Jan 2006 16:11:51 +0000
Subject: [PATCH] Bug 322450 - TARGET_XPCOM_ABI not set in solaris builds,
 patch by Leon Sha <leon.sha@sun.com> r=me

---
 configure.in | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 952edab28f3..df10bf039ff 100644
--- a/configure.in
+++ b/configure.in
@@ -1025,7 +1025,7 @@ fi
 # Only set CPU_ARCH if we recognize the value of OS_TEST
 
 case "$OS_TEST" in
-*86)
+*86 | i86pc)
     CPU_ARCH=x86
     ;;
 
@@ -1037,8 +1037,12 @@ Alpha | alpha | ALPHA)
     CPU_ARCH=Alpha
     ;;
 
+sun4u)
+    CPU_ARCH=sparc
+    ;;
+
 x86_64 | sparc | ppc | ia64)
-    CPU_ARCH="$CPU_ARCH_TEST"
+    CPU_ARCH="$OS_TEST"
     ;;
 esac
 
@@ -2037,6 +2041,7 @@ dnl the qsort routine under solaris is faulty
        AS='/usr/ccs/bin/as'
        ASFLAGS="$ASFLAGS -K PIC -L -P -D_ASM -D__STDC__=0"
        AS_DASH_C_FLAG=''
+       TARGET_COMPILER_ABI="sunc"
         CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
         CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
        AC_MSG_CHECKING([for Forte compiler version >= WS6U2])