Merge pull request #3363 from martin-frbg/fixpr3360
Correct misplaced ifdef lines from PR 3360
This commit is contained in:
commit
7c72c45be6
|
@ -372,10 +372,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FORCE_SKYLAKEX
|
#ifdef FORCE_SKYLAKEX
|
||||||
#ifdef NO_AVX512
|
|
||||||
#define FORCE
|
#define FORCE
|
||||||
#define FORCE_INTEL
|
#define FORCE_INTEL
|
||||||
#define ARCHITECTURE "X86"
|
#define ARCHITECTURE "X86"
|
||||||
|
#ifdef NO_AVX512
|
||||||
#ifdef NO_AVX2
|
#ifdef NO_AVX2
|
||||||
#ifdef NO_AVX
|
#ifdef NO_AVX
|
||||||
#define SUBARCHITECTURE "NEHALEM"
|
#define SUBARCHITECTURE "NEHALEM"
|
||||||
|
@ -421,10 +421,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FORCE_COOPERLAKE
|
#ifdef FORCE_COOPERLAKE
|
||||||
#ifdef NO_AVX512
|
|
||||||
#define FORCE
|
#define FORCE
|
||||||
#define FORCE_INTEL
|
#define FORCE_INTEL
|
||||||
#define ARCHITECTURE "X86"
|
#define ARCHITECTURE "X86"
|
||||||
|
#ifdef NO_AVX512
|
||||||
#ifdef NO_AVX2
|
#ifdef NO_AVX2
|
||||||
#ifdef NO_AVX
|
#ifdef NO_AVX
|
||||||
#define SUBARCHITECTURE "NEHALEM"
|
#define SUBARCHITECTURE "NEHALEM"
|
||||||
|
|
Loading…
Reference in New Issue