Merge pull request #5459 from dchopra001/depOldArchEnum

eclipse · Aug 14, 2020 · 7970637 · 7970637
2 parents c84f6f9 + 1bb4b62
commit 7970637
Show file tree

Hide file tree

Showing 7 changed files with 1,343 additions and 1,194 deletions.
diff --git a/compiler/z/codegen/OMRInstOpCode.hpp b/compiler/z/codegen/OMRInstOpCode.hpp
@@ -39,6 +39,7 @@ namespace OMR { typedef OMR::Z::InstOpCode InstOpCodeConnector; }
 #include "env/Processors.hpp"
 #include "il/DataTypes.hpp"
 #include "infra/Assert.hpp"
+#include "omrport.h"
 
 namespace TR { class CodeGenerator; }
 namespace TR { class Node; }
@@ -523,7 +524,7 @@ class InstOpCode: public OMR::InstOpCode
        *  \brief
        *      The minimum architecture level set (ALS) which introduced this instruction.
        */
-      CPU::Architecture minimumALS;
+      OMRProcessorArchitecture minimumALS;
 
       /**
        *  \brief
@@ -541,7 +542,7 @@ class InstOpCode: public OMR::InstOpCode
     * \return
     *    The minimum ALS of this instruction.
     */
-   CPU::Architecture getMinimumALS() const
+   OMRProcessorArchitecture getMinimumALS() const
       {
       return metadata[_mnemonic].minimumALS;
       }