Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

This commit is contained in:
Michael Tremer
2015-04-29 11:26:35 +02:00
3 changed files with 15 additions and 3 deletions

View File

@@ -0,0 +1,11 @@
diff -Naur openssl-1.0.2a.org/crypto/x86cpuid.pl openssl-1.0.2a/crypto/x86cpuid.pl
--- openssl-1.0.2a.org/crypto/x86cpuid.pl 2015-03-19 14:30:36.000000000 +0100
+++ openssl-1.0.2a/crypto/x86cpuid.pl 2015-04-28 13:47:57.853521020 +0200
@@ -71,6 +71,7 @@
&mov ("eax",1);
&xor ("ecx","ecx");
&cpuid ();
+ &and ("ecx",0xfffffdff); # clear SSSE3 because it is incredible slow on AMD's
&bt ("edx",28);
&jnc (&label("generic"));
&shr ("ebx",16);