From c85afff5a82c2d67d12a85723bb73ec5368bf590 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 14 Jan 2020 23:11:10 +0100
Subject: [PATCH] Correct l_name field type

---
 lib/std/dynamic_library.zig | 2 +-
 lib/std/os/linux.zig        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/std/dynamic_library.zig b/lib/std/dynamic_library.zig
index 31f83833a4..db912ec922 100644
--- a/lib/std/dynamic_library.zig
+++ b/lib/std/dynamic_library.zig
@@ -24,7 +24,7 @@ pub const DynLib = switch (builtin.os) {
 // fashion.
 const LinkMap = extern struct {
     l_addr: usize,
-    l_name: [*]const u8,
+    l_name: [*:0]const u8,
     l_ld: ?*elf.Dyn,
     l_next: ?*LinkMap,
     l_prev: ?*LinkMap,
diff --git a/lib/std/os/linux.zig b/lib/std/os/linux.zig
index 94fad4cfb7..fcc1e62489 100644
--- a/lib/std/os/linux.zig
+++ b/lib/std/os/linux.zig
@@ -1042,7 +1042,7 @@ pub fn uname(uts: *utsname) usize {
 }
 
 // XXX: This should be weak
-extern const __ehdr_start: elf.Ehdr = undefined;
+extern const __ehdr_start: elf.Ehdr;
 
 pub fn dl_iterate_phdr(comptime T: type, callback: extern fn (info: *dl_phdr_info, size: usize, data: ?*T) i32, data: ?*T) isize {
     if (builtin.link_libc) {