Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
diff --git a/Misc/NEWS b/Misc/NEWS
index 97c2146..dc981ff 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -378,6 +378,8 @@
 Build
 -----
 
+- Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
+
 - Disable _XOPEN_SOURCE on NetBSD 1.x.
 
 - Bug #1578513: Cross compilation was broken by a change to configure.
diff --git a/configure b/configure
index 3f8459d..70e0e68 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 52457 .
+# From configure.in Revision: 52844 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.5.
 #
@@ -11085,9 +11085,11 @@
 then
 	case $ac_sys_system/$ac_sys_release in
 	SunOS*) if test "$GCC" = yes;
-	        then CCSHARED="-fPIC";
-		else CCSHARED="-xcode=pic32";
-	        fi;;
+		then CCSHARED="-fPIC";
+		elif test `uname -p` = sparc;
+		then CCSHARED="-xcode=pic32";
+		else CCSHARED="-Kpic";
+		fi;;
 	hp*|HP*) if test "$GCC" = yes;
 		 then CCSHARED="-fPIC";
 		 else CCSHARED="+z";
diff --git a/configure.in b/configure.in
index 9d446c6..16d6ff1 100644
--- a/configure.in
+++ b/configure.in
@@ -1544,9 +1544,11 @@
 then
 	case $ac_sys_system/$ac_sys_release in
 	SunOS*) if test "$GCC" = yes;
-	        then CCSHARED="-fPIC";
-		else CCSHARED="-xcode=pic32";
-	        fi;;
+		then CCSHARED="-fPIC";
+		elif test `uname -p` = sparc;
+		then CCSHARED="-xcode=pic32";
+		else CCSHARED="-Kpic";
+		fi;;
 	hp*|HP*) if test "$GCC" = yes;
 		 then CCSHARED="-fPIC";
 		 else CCSHARED="+z";