Remove patches, no longer can make owned relocations

Author: Sythivo

build.zig

@@ -57,7 +57,6 @@ pub fn build(b: *std.Build) !void {
     });
     lib.linkLibC();
     lib.addIncludePath(b.path("src/config"));
-    lib.addIncludePath(b.path("src/patch"));
     lib.addIncludePath(tcc_dep.path("."));
     lib.addIncludePath(tcc_dep.path("include"));
 
@@ -152,7 +151,6 @@ pub fn build(b: *std.Build) !void {
         .files = C_SOURCES.items,
         .flags = FLAGS.items,
     });
-    lib.addCSourceFile(.{ .file = b.path("src/patch/tccrun.c"), .flags = FLAGS.items });
 
     const module = b.addModule("tinycc", .{
         .root_source_file = b.path("src/lib.zig"),
@@ -181,6 +179,7 @@ pub fn build(b: *std.Build) !void {
 const SOURCES = [_][]const u8{
     "libtcc.c",
     "tccpp.c",
+    "tccrun.c",
     "tccgen.c",
     "tccdbg.c",
     "tccelf.c",

build.zig.zon

@@ -3,7 +3,7 @@
     .version = "0.0.1",
     .dependencies = .{
         .tinycc = .{
-            .url = "https://codeload.github.com/TinyCC/tinycc/tar.gz/c6afdff7ab4dfd338a30f6aab3288e3a2d6274de",
+            .url = "https://codeload.github.com/TinyCC/tinycc/tar.gz/6ca228339cbae14203b255e3e27f56586d2b10dc",
             .hash = "N-V-__8AAPoeQACt9PObjqzWO2RLVHoL6LMnzJrdYoi-T52O",
         },
     },

src/lib.zig

@@ -23,7 +23,6 @@ pub extern fn tcc_add_symbol(s: *TCCState, name: [*:0]const u8, val: *const anyo
 pub extern fn tcc_output_file(s: *TCCState, filename: [*:0]const u8) c_int;
 pub extern fn tcc_run(s: *TCCState, argc: c_int, argv: [*c][*c]u8) c_int;
 pub extern fn tcc_relocate(s1: *TCCState) c_int;
-pub extern fn tcc_relocate2(s1: *TCCState, ptr: ?*anyopaque, mode: c_int) c_int;
 pub extern fn tcc_get_symbol(s: *TCCState, name: [*:0]const u8) ?*anyopaque;
 pub extern fn tcc_list_symbols(s: *TCCState, ctx: ?*anyopaque, symbol_cb: TCCSymbolCallbackFunc) void;
 
@@ -151,23 +150,12 @@ pub const TCCState = opaque {
     }
 
     /// do all relocations (needed before using get_symbol())
-    pub fn relocate(self: *TCCState, position: TCCRelocation) !void {
-        const ret = switch (position) {
-            .auto => tcc_relocate(self),
-            .addr => |ptr| tcc_relocate2(self, ptr, 1),
-        };
+    pub fn relocate(self: *TCCState) !void {
+        const ret = tcc_relocate(self);
         if (ret == -1)
             return error.RelocateError;
     }
 
-    /// return required memory size for relocation
-    pub fn relocationSize(self: *TCCState) !c_int {
-        const size = tcc_relocate2(self, null, 2);
-        if (size == -1)
-            return error.RelocateSizeError;
-        return size;
-    }
-
     /// return symbol value or NULL if not found
     pub fn get_symbol(self: *TCCState, name: [:0]const u8) ?*anyopaque {
         return tcc_get_symbol(self, name.ptr);
@@ -178,19 +166,11 @@ pub const TCCState = opaque {
         tcc_list_symbols(self, ctx, symbol_cb);
     }
 
-    pub fn relocateAlloc(self: *TCCState, allocator: std.mem.Allocator) !DynMem {
-        const bytes = try self.relocationSize();
-        const mem = try DynMem.alloc(allocator, @intCast(bytes));
-        errdefer mem.free();
-        try self.relocate(.{ .addr = @ptrCast(@alignCast(mem.mem.ptr)) });
-        return mem;
-    }
-
-    pub fn compileStringOnceAlloc(self: *TCCState, allocator: std.mem.Allocator, buf: []const u8) !DynMem {
+    pub fn compileStringOnce(self: *TCCState, allocator: std.mem.Allocator, buf: []const u8) !void {
         const zbytes = try allocator.dupeZ(u8, buf);
         defer allocator.free(zbytes);
         try self.compile_string(zbytes);
-        return try self.relocateAlloc(allocator);
+        return try self.relocate();
     }
 
     /// free a TCC compilation context
@@ -234,7 +214,7 @@ test "tcc - compile" {
         \\}
     );
 
-    try tcc.relocate(.auto);
+    try tcc.relocate();
 
     const Fn = *const fn () callconv(.c) c_int;
 
@@ -245,7 +225,7 @@ test "tcc - compile" {
     try std.testing.expectEqual(res, 123);
 }
 
-test "tcc - compileStringOnceAlloc" {
+test "tcc - compileStringOnce" {
     const allocator = std.testing.allocator;
 
     const tcc = try new();
@@ -254,12 +234,11 @@ test "tcc - compileStringOnceAlloc" {
     tcc.set_options("-std=c11 -nostdlib -Wl,--export-all-symbols");
     tcc.set_output_type(TCC_OUTPUT_MEMORY);
 
-    const mem = try tcc.compileStringOnceAlloc(allocator,
+    try tcc.compileStringOnce(allocator,
         \\int blank() {
         \\  return 234;
         \\}
     );
-    defer mem.free();
 
     const Fn = *const fn () callconv(.c) c_int;