From 98037a02384cdd9fa9c71210fb35d24b82e61f36 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Wed, 30 Nov 2022 17:20:34 +0200 Subject: [PATCH] compiler-rt: disable some exports for ofmt=c --- lib/compiler_rt/atomics.zig | 2 +- lib/compiler_rt/memcpy.zig | 5 ++++- lib/compiler_rt/memset.zig | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/compiler_rt/atomics.zig b/lib/compiler_rt/atomics.zig index 8f02600564..13ca3a7197 100644 --- a/lib/compiler_rt/atomics.zig +++ b/lib/compiler_rt/atomics.zig @@ -453,7 +453,7 @@ fn __atomic_fetch_nand_8(ptr: *u64, val: u64, model: i32) callconv(.C) u64 { } comptime { - if (supports_atomic_ops) { + if (supports_atomic_ops and builtin.object_format != .c) { @export(__atomic_load, .{ .name = "__atomic_load", .linkage = linkage }); @export(__atomic_store, .{ .name = "__atomic_store", .linkage = linkage }); @export(__atomic_exchange, .{ .name = "__atomic_exchange", .linkage = linkage }); diff --git a/lib/compiler_rt/memcpy.zig b/lib/compiler_rt/memcpy.zig index bbd69edc0c..8f58fe909c 100644 --- a/lib/compiler_rt/memcpy.zig +++ b/lib/compiler_rt/memcpy.zig @@ -1,8 +1,11 @@ const std = @import("std"); const common = @import("./common.zig"); +const builtin = @import("builtin"); comptime { - @export(memcpy, .{ .name = "memcpy", .linkage = common.linkage }); + if (builtin.object_format != .c) { + @export(memcpy, .{ .name = "memcpy", .linkage = common.linkage }); + } } pub fn memcpy(noalias dest: ?[*]u8, noalias src: ?[*]const u8, len: usize) callconv(.C) ?[*]u8 { diff --git a/lib/compiler_rt/memset.zig b/lib/compiler_rt/memset.zig index 1b535fee97..e88e74079a 100644 --- a/lib/compiler_rt/memset.zig +++ b/lib/compiler_rt/memset.zig @@ -1,9 +1,12 @@ const std = @import("std"); const common = @import("./common.zig"); +const builtin = @import("builtin"); comptime { - @export(memset, .{ .name = "memset", .linkage = common.linkage }); - @export(__memset, .{ .name = "__memset", .linkage = common.linkage }); + if (builtin.object_format != .c) { + @export(memset, .{ .name = "memset", .linkage = common.linkage }); + @export(__memset, .{ .name = "__memset", .linkage = common.linkage }); + } } pub fn memset(dest: ?[*]u8, c: u8, len: usize) callconv(.C) ?[*]u8 {