Merge pull request dotnet#1200 from erozenfeld/CrossgenFix

Allow non-RIP-relative relocations in coreclr crossgen.
DrewScoggins · Jul 3, 2015 · b2cc30c · b2cc30c
2 parents 2a8df6f + e3ef45e
commit b2cc30c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;