projects
/
platform
/
upstream
/
coreclr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8cfd0cd
)
Allow non-RIP-relative relocations in coreclr crossgen.
author
Eugene Rozenfeld
<erozen@microsoft.com>
Thu, 2 Jul 2015 19:45:04 +0000
(12:45 -0700)
committer
Eugene Rozenfeld
<erozen@microsoft.com>
Thu, 2 Jul 2015 20:20:00 +0000
(13:20 -0700)
src/zap/zapinfo.cpp
patch
|
blob
|
history
diff --git
a/src/zap/zapinfo.cpp
b/src/zap/zapinfo.cpp
index
151ac02
..
0e48eda
100644
(file)
--- 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:
-#if
def _TARGET_AMD64_
+#if
defined(_TARGET_AMD64_) && !defined(FEATURE_CORECLR)
_ASSERTE(!"Why we are not using RIP relative address?");
#endif
*(UNALIGNED TADDR *)location = (TADDR)targetOffset;