Only patch x86_64 GOT relocations when relaxation succeeds

Author: savannahostrowski

Python/jit.c

@@ -400,22 +400,21 @@ patch_x86_64_32rx(unsigned char *location, uint64_t value)
         if (loc8[-2] == 0x8B) {
             // mov reg, dword ptr [rip + AAA] -> lea reg, [rip + XXX]
             loc8[-2] = 0x8D;
-            value = relaxed;
+            patch_32r(location, relaxed);
         }
         else if (loc8[-2] == 0xFF && loc8[-1] == 0x15) {
             // call qword ptr [rip + AAA] -> nop; call XXX
             loc8[-2] = 0x90;
             loc8[-1] = 0xE8;
-            value = relaxed;
+            patch_32r(location, relaxed);
         }
         else if (loc8[-2] == 0xFF && loc8[-1] == 0x25) {
             // jmp qword ptr [rip + AAA] -> nop; jmp XXX
             loc8[-2] = 0x90;
             loc8[-1] = 0xE9;
-            value = relaxed;
+            patch_32r(location, relaxed);
         }
     }
-    patch_32r(location, value);
 }
 
 void patch_aarch64_trampoline(unsigned char *location, int ordinal, jit_state *state);

Tools/jit/_targets.py

@@ -585,7 +585,6 @@ def get_target(host: str) -> _COFF32 | _COFF64 | _ELF | _MachO:
     elif re.fullmatch(r"x86_64-apple-darwin.*", host):
         host = "x86_64-apple-darwin"
         condition = "defined(__x86_64__) && defined(__APPLE__)"
-        args = ["-fno-plt"]
         optimizer = _optimizers.OptimizerX86
         target = _MachO(host, condition, optimizer=optimizer)
     elif re.fullmatch(r"x86_64-pc-windows-msvc", host):