aboutsummaryrefslogtreecommitdiff
path: root/src/glibc.zig
diff options
context:
space:
mode:
authorjoachimschmidt557 <joachim.schmidt557@outlook.com>2020-10-05 10:13:56 +0200
committerAndrew Kelley <andrew@ziglang.org>2020-10-05 04:48:58 -0400
commit7c5a24e08cd0bffd2a5cce6d1fd592a7d2bee678 (patch)
tree40b072ebb155f4c487f7c01b009a79d034e7df73 /src/glibc.zig
parent9952a072cc120f5dc134bb1070ad02dfab59cefa (diff)
downloadzig-7c5a24e08cd0bffd2a5cce6d1fd592a7d2bee678.tar.gz
zig-7c5a24e08cd0bffd2a5cce6d1fd592a7d2bee678.zip
Turn zig fmt back on in various src/ files
Diffstat (limited to 'src/glibc.zig')
-rw-r--r--src/glibc.zig27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/glibc.zig b/src/glibc.zig
index 1860726f93..108aeb6f77 100644
--- a/src/glibc.zig
+++ b/src/glibc.zig
@@ -689,9 +689,6 @@ pub const BuiltSharedObjects = struct {
const all_map_basename = "all.map";
-// TODO Turn back on zig fmt when https://github.com/ziglang/zig/issues/5948 is implemented.
-// zig fmt: off
-
pub fn buildSharedObjects(comp: *Compilation) !void {
const tracy = trace(@src());
defer tracy.end();
@@ -827,8 +824,9 @@ pub fn buildSharedObjects(comp: *Compilation) !void {
if (ver.patch == 0) {
const sym_plus_ver = try std.fmt.allocPrint(
- arena, "{s}_{d}_{d}",
- .{sym_name, ver.major, ver.minor},
+ arena,
+ "{s}_{d}_{d}",
+ .{ sym_name, ver.major, ver.minor },
);
try zig_body.writer().print(
\\.globl {s}
@@ -840,13 +838,19 @@ pub fn buildSharedObjects(comp: *Compilation) !void {
, .{
sym_plus_ver,
sym_plus_ver,
- sym_plus_ver, sym_name, at_sign_str, ver.major, ver.minor,
+ sym_plus_ver,
+ sym_name,
+ at_sign_str,
+ ver.major,
+ ver.minor,
sym_plus_ver,
sym_plus_ver,
});
} else {
- const sym_plus_ver = try std.fmt.allocPrint(arena, "{s}_{d}_{d}_{d}",
- .{sym_name, ver.major, ver.minor, ver.patch},
+ const sym_plus_ver = try std.fmt.allocPrint(
+ arena,
+ "{s}_{d}_{d}_{d}",
+ .{ sym_name, ver.major, ver.minor, ver.patch },
);
try zig_body.writer().print(
\\.globl {s}
@@ -858,7 +862,12 @@ pub fn buildSharedObjects(comp: *Compilation) !void {
, .{
sym_plus_ver,
sym_plus_ver,
- sym_plus_ver, sym_name, at_sign_str, ver.major, ver.minor, ver.patch,
+ sym_plus_ver,
+ sym_name,
+ at_sign_str,
+ ver.major,
+ ver.minor,
+ ver.patch,
sym_plus_ver,
sym_plus_ver,
});