Fix

Author: kiwiyou

.cargo/config.toml

@@ -1,3 +1,3 @@
 [build]
 target = "x86_64-unknown-linux-gnu"
-rustflags = ["-C", "link-args=-nostartfiles -nostdlib -static -fno-exceptions -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-stack-protector -fno-plt -Wl,--build-id=none,--gc-sections,--no-eh-frame-hdr,-Tlink.ld", "-C", "target-feature=+avx,+avx2,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+fma,+f16c,+aes", "-C", "target-cpu=haswell"]
+rustflags = ["-C", "link-args=-nostartfiles -nostdlib -fno-exceptions -static -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-stack-protector -fno-plt -Wl,--build-id=none,--gc-sections,--no-eh-frame-hdr,-Tlink.ld", "-C", "target-feature=+avx,+avx2,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+fma,+f16c,+aes", "-C", "relocation-model=pic", "-C", "target-cpu=haswell"]

scripts/gen.py

@@ -1,5 +1,4 @@
 import array
-import os
 import sys
 
 try:
@@ -8,9 +7,13 @@
     print(f"Usage: {sys.argv[0]} binary_path template_path", file=sys.stderr)
     sys.exit(1)
 
-code = bytearray((os.path.getsize(binary_path) + 7) // 8 * 8)
 with open(binary_path, "rb") as f:
-    f.readinto(code)
+    # remove prologue
+    code = f.read()[4:]
+
+rem = len(code) % 8
+if rem:
+    code += b"\x00" * (8 - rem)
 
 arr = array.array('Q')
 arr.frombytes(code)

scripts/remove-got.py

@@ -26,6 +26,8 @@ def distance_u32(start, end):
         break
 
 if got is None:
+    with open(args.output, "wb") as f:
+        f.write(binary)
     exit(0)
 
 objdump = subprocess.check_output(["objdump", "-Fd", args.binary_path]).decode("utf-8").splitlines()