Skip to content

Commit b2cc30c

Browse files
committed
Merge pull request dotnet#1200 from erozenfeld/CrossgenFix
Allow non-RIP-relative relocations in coreclr crossgen.
2 parents 2a8df6f + e3ef45e commit b2cc30c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/zap/zapinfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3312,7 +3312,7 @@ void ZapInfo::recordRelocation(void *location, void *target,
33123312
break;
33133313

33143314
case IMAGE_REL_BASED_PTR:
3315-
#ifdef _TARGET_AMD64_
3315+
#if defined(_TARGET_AMD64_) && !defined(FEATURE_CORECLR)
33163316
_ASSERTE(!"Why we are not using RIP relative address?");
33173317
#endif
33183318
*(UNALIGNED TADDR *)location = (TADDR)targetOffset;

0 commit comments

Comments
 (0)