Use _TARGET_ARMARCH_

Chagne _TARGET_ARM_ and _TARGET_ARM64_ to _TARGET_ARMARCH_

diff --git a/src/jit/gentree.cpp b/src/jit/gentree.cpp
index 1d125b4..54382d8 100644 (file)
--- a/src/jit/gentree.cpp
+++ b/src/jit/gentree.cpp
@@ -5524,7 +5524,7 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree)
             }
 
 #ifdef FEATURE_READYTORUN_COMPILER
-#if defined(_TARGET_ARM64_) || defined(_TARGET_ARM_)
+#if defined(_TARGET_ARMARCH_)
             if (tree->gtCall.IsR2RRelativeIndir())
             {
                 ftreg |= RBM_R2R_INDIRECT_PARAM;

diff --git a/src/jit/lower.cpp b/src/jit/lower.cpp
index 3235305..035f094 100644 (file)
--- a/src/jit/lower.cpp
+++ b/src/jit/lower.cpp
@@ -2542,7 +2542,7 @@ GenTree* Lowering::LowerDirectCall(GenTreeCall* call)
             GenTree* indir    = Ind(cellAddr);
 
 #ifdef FEATURE_READYTORUN_COMPILER
-#if defined(_TARGET_ARM64_) || defined(_TARGET_ARM_)
+#if defined(_TARGET_ARMARCH_)
             // For arm64, we dispatch code same as VSD using X11 for indirection cell address,
             // which ZapIndirectHelperThunk expects.
             if (call->IsR2RRelativeIndir())

diff --git a/src/jit/target.h b/src/jit/target.h
index 7221e26..c207256 100644 (file)
--- a/src/jit/target.h
+++ b/src/jit/target.h
@@ -1379,7 +1379,6 @@ typedef unsigned short regPairNoSmall; // arm: need 12 bits
   // R2R indirect call. Use the same registers as VSD
   #define REG_R2R_INDIRECT_PARAM          REG_R4
   #define RBM_R2R_INDIRECT_PARAM          RBM_R4
-  #define PREDICT_REG_RER_INDIRECT_PARAM  PREDICT_REG_R4
 
   // Registers used by PInvoke frame setup
   #define REG_PINVOKE_FRAME        REG_R4