x86cpuid fixes.

PR: 1526

crypto/perlasm/x86unix.pl

@@ -51,6 +51,7 @@ sub ::generic
     if ($#_==0)				{ &::emit($opcode);		}
     elsif ($opcode =~ m/^j/o && $#_==1)	{ &::emit($opcode,@arg);	}
     elsif ($opcode eq "call" && $#_==1)	{ &::emit($opcode,@arg);	}
+    elsif ($opcode =~ m/^set/&& $#_==1)	{ &::emit($opcode,@arg);	}
     else				{ &::emit($opcode.$suffix,@arg);}
 
   1;

crypto/x86cpuid.pl

@@ -43,7 +43,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
 	&shr	("ebx",16);
 	&cmp	(&LB("ebx"),1);		# see if cache is shared(*)
 	&ja	(&label("nocpuid"));
-	&and	("edx",~(1<<28));	# clear hyper-threading bit if not
+	&and	("edx",0xefffffff);	# clear hyper-threading bit if not
 &set_label("nocpuid");
 	&mov	("eax","edx");
 	&mov	("edx","ecx");