From 71d4b5f49f3ac3fa95421c2acb140c1da596ccd1 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 16 Dec 2015 20:52:14 +0000
Subject: [PATCH] Broadwell/Skylake tweak

---
 .../support/CPUInformation/IntelInfoImpl.java        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
index e022cd9f8..9a2e2c07e 100644
--- a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
+++ b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
@@ -346,12 +346,12 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
                     case 0x3d: {
                         CPUIDCPUInfo c = new CPUIDCPUInfo();
                         if (c.hasAVX2() && c.hasBMI1()  && c.hasBMI2() &&
-                            c.hasFMA3() && c.hasMOVBE() && c.hasABM() &&
-                            c.hasADX()) {
+                            c.hasFMA3() && c.hasMOVBE() && c.hasABM()) {
                             isSandyCompatible = true;
                             isIvyCompatible = true;
                             isHaswellCompatible = true;
-                            isBroadwellCompatible = true;
+                            if (c.hasADX())
+                                isBroadwellCompatible = true;
                             modelString = "Broadwell Core i3/i5/i7";
                         } else {
                             // This processor is "corei" compatible, as we define it,
@@ -440,12 +440,12 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
                     case 0x5e: {
                         CPUIDCPUInfo c = new CPUIDCPUInfo();
                         if (c.hasAVX2() && c.hasBMI1()  && c.hasBMI2() &&
-                            c.hasFMA3() && c.hasMOVBE() && c.hasABM() &&
-                            c.hasADX()) {
+                            c.hasFMA3() && c.hasMOVBE() && c.hasABM()) {
                             isSandyCompatible = true;
                             isIvyCompatible = true;
                             isHaswellCompatible = true;
-                            isBroadwellCompatible = true;
+                            if (c.hasADX())
+                                isBroadwellCompatible = true;
                             modelString = "Skylake Core i3/i5/i7";
                         } else {
                             // This processor is "corei" compatible, as we define it,