summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Rozenfeld <erozen@microsoft.com>2015-07-02 12:45:04 -0700
committerEugene Rozenfeld <erozen@microsoft.com>2015-07-02 13:20:00 -0700
commite3ef45e8173526614d1213ff5673aa8dc242b2eb (patch)
treece42cd4de70a69fc941c68780cfba67b6de048d8
parent8cfd0cdd8e140d7fbc501d55a8717abeaf127a76 (diff)
downloadcoreclr-e3ef45e8173526614d1213ff5673aa8dc242b2eb.tar.gz
coreclr-e3ef45e8173526614d1213ff5673aa8dc242b2eb.tar.bz2
coreclr-e3ef45e8173526614d1213ff5673aa8dc242b2eb.zip
Allow non-RIP-relative relocations in coreclr crossgen.
-rw-r--r--src/zap/zapinfo.cpp2
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;