Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixes
  • Loading branch information
kunalspathak committed Feb 1, 2024
commit db02c45dbfd04b65659cc7f76dbbacf7529a99b0
2 changes: 1 addition & 1 deletion src/coreclr/jit/codegenarm64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2342,7 +2342,7 @@ void CodeGen::genSetRegToConst(regNumber targetReg, var_types targetType, GenTre
else
{
attr = EA_SET_FLG(attr, EA_CNS_TLSGD_RELOC);
GetEmitter()->emitIns_R_R_I(INS_ldr, attr, tree->GetReg(), REG_R0, tree->AsIntCon()->gtIconVal);
GetEmitter()->emitIns_R_R_I(INS_ldr, attr, tree->GetRegNum(), REG_R0, tree->AsIntCon()->gtIconVal);
//GetEmitter()->emitInsLoadStoreOp(INS_lea, attr, targetReg, tree);
}
break;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/emitarm64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16158,7 +16158,7 @@ size_t emitter::emitOutputInstr(insGroup* ig, instrDesc* id, BYTE** dp)
dst += emitOutput_Instr(dst, code);
if (id->idIsTlsGD() && id->idIsLargeCns())
{
emitRecordRelocation(odst, (void*)emitGetInsSC(id), IMAGE_REL_AARCH64_TLSDESC_LD64_LO12);
emitRecordRelocation(dst, (void*)emitGetInsSC(id), IMAGE_REL_AARCH64_TLSDESC_LD64_LO12);
}
break;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ public static unsafe long ReadValue(RelocType relocType, void* location)
case RelocType.IMAGE_REL_TPOFF:
case RelocType.IMAGE_REL_FILE_ABSOLUTE:
case RelocType.IMAGE_REL_SYMBOL_SIZE:
case RelocType.IMAGE_REL_AARCH64_TLSDESC_LD64_LO12:
return *(int*)location;
case RelocType.IMAGE_REL_BASED_DIR64:
return *(long*)location;
Expand All @@ -553,7 +554,6 @@ public static unsafe long ReadValue(RelocType relocType, void* location)
return GetArm64Rel21((uint*)location);
case RelocType.IMAGE_REL_BASED_ARM64_PAGEOFFSET_12A:
return GetArm64Rel12((uint*)location);
case RelocType.IMAGE_REL_AARCH64_TLSDESC_LD64_LO12:
case RelocType.IMAGE_REL_AARCH64_TLSDESC_ADD_LO12:
case RelocType.IMAGE_REL_AARCH64_TLSLE_ADD_TPREL_HI12:
case RelocType.IMAGE_REL_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
Expand Down