X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fsparcv9cap.c;h=5f31d20bd07c47a9fdb073ec8e4141f137b002cc;hb=d9f5f07e286bfc7a2a81756199a3e94444e0f6ce;hp=db6f7030527dd742d95dd688fa7e8815484d3f8a;hpb=a00e414faf76db8372f4e5fe04010e47e8ff90d4;p=oweals%2Fopenssl.git

diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index db6f703052..5f31d20bd0 100644
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -41,6 +41,7 @@ unsigned long OPENSSL_rdtsc(void)
 
 #include <dlfcn.h>
 #include <libdevinfo.h>
+#include <sys/systeminfo.h>
 
 typedef di_node_t (*di_init_t)(const char *,uint_t);
 typedef void      (*di_fini_t)(di_node_t);
@@ -55,21 +56,22 @@ static int walk_nodename(di_node_t node, di_node_name_t di_node_name)
 
 	/* This is expected to catch all UltraSPARC flavors prior T1 */
 	if (!strcmp (name,"SUNW,UltraSPARC") ||
-	    !strncmp(name,"SUNW,UltraSPARC-I",17))
+	    !strncmp(name,"SUNW,UltraSPARC-I",17))  /* covers II,III,IV */
 		{
 		OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU|SPARCV9_VIS1;
 
-		/* %tick is privileged only on UltraSPARC-I/II */
+		/* %tick is privileged only on UltraSPARC-I/II, but not IIe */
 		if (name[14]!='\0' && name[17]!='\0' && name[18]!='\0')
 			OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
 
 		return DI_WALK_TERMINATE;
 		}
-	/* This is expected to catch remaining UltraSPARC T1 */
+	/* This is expected to catch remaining UltraSPARCs, such as T1 */
 	else if (!strncmp(name,"SUNW,UltraSPARC",15))
 		{
-		OPENSSL_sparcv9cap_P |= SPARCV9_VIS1;
 		OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
+
+		return DI_WALK_TERMINATE;
 		}
 
 	return DI_WALK_CONTINUE;
@@ -78,7 +80,7 @@ static int walk_nodename(di_node_t node, di_node_name_t di_node_name)
 void OPENSSL_cpuid_setup(void)
 	{
 	void *h;
-	char *e;
+	char *e,si[256];
 	static int trigger=0;
 
 	if (trigger) return;
@@ -90,6 +92,25 @@ void OPENSSL_cpuid_setup(void)
 		return;
 		}
 
+	if (sysinfo(SI_MACHINE,si,sizeof(si))>0)
+		{
+		if (strcmp(si,"sun4v"))
+			/* FPU is preferred for all CPUs, but US-T1/2 */
+			OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU;
+		}
+
+	if (sysinfo(SI_ISALIST,si,sizeof(si))>0)
+		{
+		if (strstr(si,"+vis"))
+			OPENSSL_sparcv9cap_P |= SPARCV9_VIS1;
+		if (strstr(si,"+vis2"))
+			{
+			OPENSSL_sparcv9cap_P |= SPARCV9_VIS2;
+			OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
+			return;
+			}
+		}
+
 	if ((h = dlopen("libdevinfo.so.1",RTLD_LAZY))) do
 		{
 		di_init_t	di_init;
@@ -116,13 +137,13 @@ void OPENSSL_cpuid_setup(void)
 
 #else
 
-void OPENSSL_cpucap_setup(void)
+void OPENSSL_cpuid_setup(void)
 	{
 	char *e;
  
 	if ((e=getenv("OPENSSL_sparcv9cap")))
 		{
-		OPENSSL_sparcv9cap_P=strtoul(env,NULL,0);
+		OPENSSL_sparcv9cap_P=strtoul(e,NULL,0);
 		return;
 		}