diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-07-03 00:07:15 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-07-03 00:07:15 -0700 |
| commit | b2cc30cc8af1f51d756f104cbec7d1fc8dd6d6e9 (patch) | |
| tree | 84c54967bd04b69ec561c7a3607f46e889db5784 | |
| parent | 2a8df6fb51dad4953df2c73ea9bf403d8814c8dc (diff) | |
| parent | e3ef45e8173526614d1213ff5673aa8dc242b2eb (diff) | |
| download | coreclr-b2cc30cc8af1f51d756f104cbec7d1fc8dd6d6e9.tar.gz coreclr-b2cc30cc8af1f51d756f104cbec7d1fc8dd6d6e9.tar.bz2 coreclr-b2cc30cc8af1f51d756f104cbec7d1fc8dd6d6e9.zip | |
Merge pull request #1200 from erozenfeld/CrossgenFix
Allow non-RIP-relative relocations in coreclr crossgen.
| -rw-r--r-- | src/zap/zapinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp index 151ac02799..0e48eda475 100644 --- a/src/zap/zapinfo.cpp +++ b/src/zap/zapinfo.cpp @@ -3312,7 +3312,7 @@ void ZapInfo::recordRelocation(void *location, void *target, break; case IMAGE_REL_BASED_PTR: -#ifdef _TARGET_AMD64_ +#if defined(_TARGET_AMD64_) && !defined(FEATURE_CORECLR) _ASSERTE(!"Why we are not using RIP relative address?"); #endif *(UNALIGNED TADDR *)location = (TADDR)targetOffset; |