#
# Teach perl how to build 64-bit x86 properly.
#
--- perl-5.16.2/hints/solaris_2.sh_orig	2012-10-25 19:44:15.000000000 -0700
+++ perl-5.16.2/hints/solaris_2.sh	2013-03-13 11:13:25.982938736 -0700
@@ -84,8 +84,8 @@
 	getworkshoplibs=`cat <<'END'
 eval $tryworkshopcc -### 2>&1 | \
 sed -n '/ -Y /s!.* -Y "P,\([^"]*\)".*!\1!p' | tr ':' ' ' | \
-sed -e 's!/usr/lib/sparcv9!!' -e 's!/usr/ccs/lib/sparcv9!!' \
-    -e 's!/usr/lib!!g' -e 's!/usr/ccs/lib!!g'
+sed -e 's!/lib/64!!' -e 's!/usr/lib/64!!' \
+    -e 's!/lib!!g' -e 's!/usr/lib!!g'
 END
 `
 
@@ -552,8 +552,7 @@
 		;;
 	    esac
 	    processor=`uname -p`;
-	    if test "$processor" = sparc; then
-		libc='/usr/lib/sparcv9/libc.so'
+		libc='/lib/64/libc.so'
 		if test ! -f $libc; then
 		    cat >&4 <<EOM
 
@@ -563,7 +562,6 @@
 EOM
 		    exit 1
 		fi
-	    fi
 	    case "${cc:-cc} -v 2>/dev/null" in
 	    *gcc*)
 		echo 'int main() { return 0; }' > try.c
@@ -614,9 +612,7 @@
 
 		echo "int main() { return(0); } " > try.c
 		tryworkshopcc="${cc:-cc} try.c -o try $ccflags"
-		if test "$processor" = sparc; then
-		    loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 $loclibpth"
-		fi
+		loclibpth="/lib/64 /usr/lib/64 $loclibpth"
 		loclibpth="`$getworkshoplibs` $loclibpth"
 		;;
 	    esac