--- old/src/cpu/x86/vm/relocInfo_x86.cpp	2015-08-12 14:09:02.000000000 +0200
+++ new/src/cpu/x86/vm/relocInfo_x86.cpp	2015-08-12 14:09:02.000000000 +0200
@@ -180,7 +180,7 @@
 
 void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
 #ifdef _LP64
-  if (!Assembler::is_polling_page_far()) {
+  if (!ThreadLocalSafepoints && !Assembler::is_polling_page_far()) {
     typedef Assembler::WhichOperand WhichOperand;
     WhichOperand which = (WhichOperand) format();
     // This format is imm but it is really disp32
@@ -202,7 +202,7 @@
 
 void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
 #ifdef _LP64
-  if (!Assembler::is_polling_page_far()) {
+  if (!ThreadLocalSafepoints && !Assembler::is_polling_page_far()) {
     typedef Assembler::WhichOperand WhichOperand;
     WhichOperand which = (WhichOperand) format();
     // This format is imm but it is really disp32