--- a/jdk/test/sun/security/krb5/runNameEquals.sh	Thu Nov 14 11:19:32 2013 +0100
+++ b/jdk/test/sun/security/krb5/runNameEquals.sh	Tue Nov 19 14:14:14 2013 +0800
@@ -57,10 +57,10 @@
     FILESEP="/"
     NATIVE=true
     # Not all *nix has native GSS libs installed
-    krb5-config --libs gssapi 2> /dev/null
+    krb5-config --libs 2> /dev/null
     if [ $? != 0 ]; then
         # Fedora has a different path
-        /usr/kerberos/bin/krb5-config --libs gssapi 2> /dev/null
+        /usr/kerberos/bin/krb5-config --libs 2> /dev/null
         if [ $? != 0 ]; then
             NATIVE=false
         fi
@@ -97,6 +97,15 @@
     if [ $? != 0 ] ; then
         echo "Native provider fails"
         EXIT_STATUS=1
+        if [ "$OS" = "Linux" -a `arch` = "x86_64" ]; then
+            ${TESTJAVA}${FILESEP}bin${FILESEP}java -XshowSettings:properties -version 2> allprop
+            cat allprop | grep sun.arch.data.model | grep 32
+            if [ "$?" = "0" ]; then
+                echo "Running 32-bit JDK on 64-bit Linux. Maybe only 64-bit library is installed."
+                echo "Please manually check if this is the case. Treated as PASSED now."
+                EXIT_STATUS=0
+            fi
+        fi
     fi
 fi