cbe: handle underscore prexfix on macos, don't mangle extern function names

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/zig.h b/lib/zig.h
index c188b6e5c7..032ad30053 100644
--- a/lib/zig.h
+++ b/lib/zig.h
@@ -203,7 +203,11 @@ typedef char bool;
     __pragma(comment(linker, "/alternatename:_" #symbol "=_" #name ))
 #endif /*_M_X64 */
 #else
+#if __APPLE__
+#define zig_import(sig, symbol, name) zig_extern sig __asm("_" #name);
+#else /* __APPLE__ */
 #define zig_import(sig, symbol, name) zig_extern sig __asm(#name);
+#endif /* __APPLE__ */
 #endif
 
 #define zig_expand_import(sig, symbol, name) zig_import(sig, symbol, name)
diff --git a/src/codegen/c.zig b/src/codegen/c.zig
index 735b58e2dd..46895d71a7 100644
--- a/src/codegen/c.zig
+++ b/src/codegen/c.zig
@@ -1978,7 +1978,7 @@ pub const DeclGen = struct {
         if (mod.decl_exports.get(decl_index)) |exports| {
             try writer.print("{ }", .{fmtIdent(mod.intern_pool.stringToSlice(exports.items[export_index].opts.name))});
         } else if (decl.getExternDecl(mod).unwrap()) |extern_decl_index| {
-            try writer.print("{ }", .{fmtIdent(mod.intern_pool.stringToSlice(mod.declPtr(extern_decl_index).name))});
+            try writer.print("{}", .{mod.declPtr(extern_decl_index).name.fmt(&mod.intern_pool)});
         } else {
             // MSVC has a limit of 4095 character token length limit, and fmtIdent can (worst case),
             // expand to 3x the length of its input, but let's cut it off at a much shorter limit.