X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fsparcv9cap.c;h=5f31d20bd07c47a9fdb073ec8e4141f137b002cc;hb=34d05a402325411ff80cb8aa90044550556db2bd;hp=3ec2340241af11a1d668d70f5ea7ea304438587b;hpb=7a5dbeb7825159d47c3f39e86ade38465687704e;p=oweals%2Fopenssl.git

diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index 3ec2340241..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);
@@ -79,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;
@@ -91,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;
@@ -123,7 +143,7 @@ void OPENSSL_cpuid_setup(void)
  
 	if ((e=getenv("OPENSSL_sparcv9cap")))
 		{
-		OPENSSL_sparcv9cap_P=strtoul(env,NULL,0);
+		OPENSSL_sparcv9cap_P=strtoul(e,NULL,0);
 		return;
 		}