diff --git a/include_core/omrport.h b/include_core/omrport.h index db121ce5b29..2643ebd35df 100644 --- a/include_core/omrport.h +++ b/include_core/omrport.h @@ -1479,28 +1479,6 @@ typedef enum OMRProcessorArchitecture { OMR_PROCESSOR_X86_AMD_FAMILY15H, OMR_PROCESSOR_X86_AMD_LAST = OMR_PROCESSOR_X86_AMD_FAMILY15H, - /** - * Keep the original macro definitions until all known downstream projects - * complete the switch to the new names - */ - // - OMR_PROCESSOR_X86_INTELPENTIUM = OMR_PROCESSOR_X86_INTEL_PENTIUM, - OMR_PROCESSOR_X86_INTELP6 = OMR_PROCESSOR_X86_INTEL_P6, - OMR_PROCESSOR_X86_INTELPENTIUM4 = OMR_PROCESSOR_X86_INTEL_PENTIUM4, - OMR_PROCESSOR_X86_INTELCORE2 = OMR_PROCESSOR_X86_INTEL_CORE2, - OMR_PROCESSOR_X86_INTELTULSA = OMR_PROCESSOR_X86_INTEL_TULSA, - OMR_PROCESSOR_X86_INTELNEHALEM = OMR_PROCESSOR_X86_INTEL_NEHALEM, - OMR_PROCESSOR_X86_INTELWESTMERE = OMR_PROCESSOR_X86_INTEL_WESTMERE, - OMR_PROCESSOR_X86_INTELSANDYBRIDGE = OMR_PROCESSOR_X86_INTEL_SANDYBRIDGE, - OMR_PROCESSOR_X86_INTELIVYBRIDGE = OMR_PROCESSOR_X86_INTEL_IVYBRIDGE, - OMR_PROCESSOR_X86_INTELHASWELL = OMR_PROCESSOR_X86_INTEL_HASWELL, - OMR_PROCESSOR_X86_INTELBROADWELL = OMR_PROCESSOR_X86_INTEL_BROADWELL, - OMR_PROCESSOR_X86_INTELSKYLAKE = OMR_PROCESSOR_X86_INTEL_SKYLAKE, - OMR_PROCESSOR_X86_AMDATHLONDURON = OMR_PROCESSOR_X86_AMD_ATHLONDURON, - OMR_PROCESSOR_X86_AMDOPTERON = OMR_PROCESSOR_X86_AMD_OPTERON, - OMR_PROCESSOR_X86_AMDFAMILY15H = OMR_PROCESSOR_X86_AMD_FAMILY15H, - // - OMR_PROCESSOR_X86_LAST = OMR_PROCESSOR_X86_AMD_FAMILY15H, OMR_PROCESSOR_RISCV32_UNKNOWN,