diff src/cpu/ppc/vm/macroAssembler_ppc.cpp @ 23862:aa6d8e03b258

Merge
author asaha
date Fri, 05 Feb 2016 23:10:25 -0800
parents f87db3f01e3f
children
line wrap: on
line diff
--- a/src/cpu/ppc/vm/macroAssembler_ppc.cpp	Wed Jan 27 15:01:46 2016 +0100
+++ b/src/cpu/ppc/vm/macroAssembler_ppc.cpp	Fri Feb 05 23:10:25 2016 -0800
@@ -592,13 +592,6 @@
            "can't identify emitted call");
   } else {
     // variant 1:
-#if defined(ABI_ELFv2)
-    nop();
-    calculate_address_from_global_toc(R12, dest, true, true, false);
-    mtctr(R12);
-    nop();
-    nop();
-#else
     mr(R0, R11);  // spill R11 -> R0.
 
     // Load the destination address into CTR,
@@ -608,7 +601,6 @@
     mtctr(R11);
     mr(R11, R0);  // spill R11 <- R0.
     nop();
-#endif
 
     // do the call/jump
     if (link) {