diff -wpruN '--exclude=*.orig' a~/src/java.base/share/conf/security/java.security a/src/java.base/share/conf/security/java.security
--- a~/src/java.base/share/conf/security/java.security	1970-01-01 00:00:00
+++ a/src/java.base/share/conf/security/java.security	1970-01-01 00:00:00
@@ -62,7 +62,6 @@
 #
 #ifdef solaris
 security.provider.tbd=OracleUcrypto
-security.provider.tbd=SunPKCS11 ${java.home}/conf/security/sunpkcs11-solaris.cfg
 #endif
 security.provider.tbd=SUN
 security.provider.tbd=SunRsaSign
@@ -83,6 +82,8 @@ security.provider.tbd=Apple
 #endif
 #ifndef solaris
 security.provider.tbd=SunPKCS11
+#else
+security.provider.tbd=SunPKCS11 ${java.home}/conf/security/sunpkcs11-solaris.cfg
 #endif
 
 #