From 0a8700a945388243e8dfa18a6bdbd3cea2a12eeb Mon Sep 17 00:00:00 2001
From: Fei Peng <fei.peng@intel.com>
Date: Thu, 6 Dec 2018 17:42:17 -0800
Subject: [PATCH] Fix a bug that disabled Bmi1/2.X64

Commit migrated from https://github.com/dotnet/coreclr/commit/4c9b4f0537bfeb97c3f749bc0bd5c4560f090e9c
---
 src/coreclr/src/jit/compiler.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/coreclr/src/jit/compiler.cpp b/src/coreclr/src/jit/compiler.cpp
index 86a85ce..1e22c92 100644
--- a/src/coreclr/src/jit/compiler.cpp
+++ b/src/coreclr/src/jit/compiler.cpp
@@ -2567,6 +2567,9 @@ void Compiler::compSetProcessor()
                 if (configEnableISA(InstructionSet_BMI1))
                 {
                     opts.setSupportedISA(InstructionSet_BMI1);
+#ifdef _TARGET_AMD64_
+                    opts.setSupportedISA(InstructionSet_BMI1_X64);
+#endif
                 }
             }
             if (jitFlags.IsSet(JitFlags::JIT_FLAG_USE_BMI2))
@@ -2574,6 +2577,9 @@ void Compiler::compSetProcessor()
                 if (configEnableISA(InstructionSet_BMI2))
                 {
                     opts.setSupportedISA(InstructionSet_BMI2);
+#ifdef _TARGET_AMD64_
+                    opts.setSupportedISA(InstructionSet_BMI2_X64);
+#endif
                 }
             }
         }
-- 
2.7.4