Merge pull request #11366 from ruben-ayrapetyan/remove-zap-code-relocs-for-linux...
authorBruce Forstall <brucefo@microsoft.com>
Tue, 23 May 2017 16:38:03 +0000 (09:38 -0700)
committerGitHub <noreply@github.com>
Tue, 23 May 2017 16:38:03 +0000 (09:38 -0700)
Change relocations in ngen-ed code with PC-relative constants for Linux ARM32

1  2 
src/jit/codegen.h
src/jit/codegenarm.cpp
src/jit/codegencommon.cpp
src/jit/codegenlegacy.cpp
src/jit/emit.cpp
src/jit/emit.h
src/jit/emitarm.cpp
src/jit/instr.cpp

index 027f3fd,471434c..30a84e0
mode 100755,100644..100644
Simple merge
Simple merge
@@@ -13066,9 -13086,18 +13066,8 @@@ void CodeGen::genCodeForBBlist(
                  // Load the address where the finally funclet should return into LR.
                  // The funclet prolog/epilog will do "push {lr}" / "pop {pc}" to do
                  // the return.
-                 getEmitter()->emitIns_R_L(INS_movw, EA_4BYTE_DSP_RELOC, bbFinallyRet, REG_LR);
-                 getEmitter()->emitIns_R_L(INS_movt, EA_4BYTE_DSP_RELOC, bbFinallyRet, REG_LR);
+                 genMov32RelocatableDisplacement(bbFinallyRet, REG_LR);
                  regTracker.rsTrackRegTrash(REG_LR);
 -#endif // 0
  
                  // Jump to the finally BB
                  inst_JMP(EJ_jmp, block->bbJumpDest);
Simple merge
diff --cc src/jit/emit.h
Simple merge
Simple merge
Simple merge