Merge remote-tracking branch 'origin/master' into llvm8

11 files changed, 258 insertions, 750 deletions

diff --git a/std/c/freebsd.zig b/std/c/freebsd.zig
index 421e964827..eae5516db3 100644
--- a/std/c/freebsd.zig
+++ b/std/c/freebsd.zig
@@ -1,5 +1,3 @@
-const timespec = @import("../os/freebsd/index.zig").timespec;
-
 extern "c" fn __error() *c_int;
 pub const _errno = __error;
 
@@ -15,6 +13,15 @@ pub extern "c" fn kevent(
 pub extern "c" fn sysctl(name: [*]c_int, namelen: c_uint, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
 pub extern "c" fn sysctlbyname(name: [*]const u8, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
 pub extern "c" fn sysctlnametomib(name: [*]const u8, mibp: ?*c_int, sizep: ?*usize) c_int;
+pub extern "c" fn getdirentries(fd: c_int, buf_ptr: [*]u8, nbytes: usize, basep: *i64) usize;
+pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
+pub extern "c" fn pipe2(arg0: *[2]c_int, arg1: u32) c_int;
+pub extern "c" fn preadv(fd: c_int, iov: *const c_void, iovcnt: c_int, offset: usize) isize;
+pub extern "c" fn pwritev(fd: c_int, iov: *const c_void, iovcnt: c_int, offset: usize) isize;
+pub extern "c" fn openat(fd: c_int, path: ?[*]const u8, flags: c_int) c_int;
+pub extern "c" fn setgid(ruid: c_uint, euid: c_uint) c_int;
+pub extern "c" fn setuid(uid: c_uint) c_int;
+pub extern "c" fn kill(pid: c_int, sig: c_int) c_int;
 
 /// Renamed from `kevent` to `Kevent` to avoid conflict with function name.
 pub const Kevent = extern struct {
@@ -31,3 +38,56 @@ pub const pthread_attr_t = extern struct {
     __size: [56]u8,
     __align: c_long,
 };
+
+pub const msghdr = extern struct {
+    msg_name: *u8,
+    msg_namelen: socklen_t,
+    msg_iov: *iovec,
+    msg_iovlen: i32,
+    __pad1: i32,
+    msg_control: *u8,
+    msg_controllen: socklen_t,
+    __pad2: socklen_t,
+    msg_flags: i32,
+};
+
+pub const Stat = extern struct {
+    dev: u64,
+    ino: u64,
+    nlink: usize,
+
+    mode: u16,
+    __pad0: u16,
+    uid: u32,
+    gid: u32,
+    __pad1: u32,
+    rdev: u64,
+
+    atim: timespec,
+    mtim: timespec,
+    ctim: timespec,
+    birthtim: timespec,
+
+    size: i64,
+    blocks: i64,
+    blksize: isize,
+    flags: u32,
+    gen: u64,
+    __spare: [10]u64,
+};
+
+pub const timespec = extern struct {
+    tv_sec: isize,
+    tv_nsec: isize,
+};
+
+pub const dirent = extern struct {
+    d_fileno: usize,
+    d_off: i64,
+    d_reclen: u16,
+    d_type: u8,
+    d_pad0: u8,
+    d_namlen: u16,
+    d_pad1: u16,
+    d_name: [256]u8,
+};
diff --git a/std/debug/index.zig b/std/debug/index.zig
index 73c6ea7b56..3050d15c59 100644
--- a/std/debug/index.zig
+++ b/std/debug/index.zig
@@ -264,7 +264,7 @@ pub fn writeCurrentStackTraceWindows(
 pub fn printSourceAtAddress(debug_info: *DebugInfo, out_stream: var, address: usize, tty_color: bool) !void {
     switch (builtin.os) {
         builtin.Os.macosx => return printSourceAtAddressMacOs(debug_info, out_stream, address, tty_color),
-        builtin.Os.linux => return printSourceAtAddressLinux(debug_info, out_stream, address, tty_color),
+        builtin.Os.linux, builtin.Os.freebsd => return printSourceAtAddressLinux(debug_info, out_stream, address, tty_color),
         builtin.Os.windows => return printSourceAtAddressWindows(debug_info, out_stream, address, tty_color),
         else => return error.UnsupportedOperatingSystem,
     }
@@ -717,7 +717,7 @@ pub const OpenSelfDebugInfoError = error{
 
 pub fn openSelfDebugInfo(allocator: *mem.Allocator) !DebugInfo {
     switch (builtin.os) {
-        builtin.Os.linux => return openSelfDebugInfoLinux(allocator),
+        builtin.Os.linux, builtin.Os.freebsd => return openSelfDebugInfoLinux(allocator),
         builtin.Os.macosx, builtin.Os.ios => return openSelfDebugInfoMacOs(allocator),
         builtin.Os.windows => return openSelfDebugInfoWindows(allocator),
         else => return error.UnsupportedOperatingSystem,
@@ -1135,14 +1135,13 @@ pub const DebugInfo = switch (builtin.os) {
             return self.ofiles.allocator;
         }
     },
-    builtin.Os.windows => struct {
+    builtin.Os.uefi, builtin.Os.windows => struct {
         pdb: pdb.Pdb,
         coff: *coff.Coff,
         sect_contribs: []pdb.SectionContribEntry,
         modules: []Module,
     },
-    builtin.Os.linux => DwarfInfo,
-    builtin.Os.freebsd => struct {},
+    builtin.Os.linux, builtin.Os.freebsd => DwarfInfo,
     else => @compileError("Unsupported OS"),
 };
 
diff --git a/std/os/freebsd/index.zig b/std/os/freebsd/index.zig
index 34a3414a48..603265b956 100644
--- a/std/os/freebsd/index.zig
+++ b/std/os/freebsd/index.zig
@@ -1,17 +1,20 @@
-const assert = @import("../debug.zig").assert;
 const builtin = @import("builtin");
-const arch = switch (builtin.arch) {
-    builtin.Arch.x86_64 => @import("x86_64.zig"),
-    else => @compileError("unsupported arch"),
-};
-pub use @import("syscall.zig");
+
 pub use @import("errno.zig");
 
 const std = @import("../../index.zig");
 const c = std.c;
+
+const assert = std.debug.assert;
 const maxInt = std.math.maxInt;
 pub const Kevent = c.Kevent;
 
+pub const CTL_KERN = 1;
+pub const CTL_DEBUG = 5;
+
+pub const KERN_PROC = 14; // struct: process entries
+pub const KERN_PROC_PATHNAME = 12; // path to executable
+
 pub const PATH_MAX = 1024;
 
 pub const STDIN_FILENO = 0;
@@ -95,26 +98,33 @@ pub const SIGLIBRT = 33;
 pub const SIGRTMIN = 65;
 pub const SIGRTMAX = 126;
 
-pub const O_RDONLY = 0o0;
-pub const O_WRONLY = 0o1;
-pub const O_RDWR = 0o2;
-pub const O_ACCMODE = 0o3;
-
-pub const O_CREAT = 0o100;
-pub const O_EXCL = 0o200;
-pub const O_NOCTTY = 0o400;
-pub const O_TRUNC = 0o1000;
-pub const O_APPEND = 0o2000;
-pub const O_NONBLOCK = 0o4000;
+// access function
+pub const F_OK = 0; // test for existence of file
+pub const X_OK = 1; // test for execute or search permission
+pub const W_OK = 2; // test for write permission
+pub const R_OK = 4; // test for read permission
+
+
+pub const O_RDONLY = 0x0000;
+pub const O_WRONLY = 0x0001;
+pub const O_RDWR = 0x0002;
+pub const O_ACCMODE = 0x0003;
+
+pub const O_CREAT = 0x0200;
+pub const O_EXCL = 0x0800;
+pub const O_NOCTTY = 0x8000;
+pub const O_TRUNC = 0x0400;
+pub const O_APPEND = 0x0008;
+pub const O_NONBLOCK = 0x0004;
 pub const O_DSYNC = 0o10000;
-pub const O_SYNC = 0o4010000;
+pub const O_SYNC = 0x0080;
 pub const O_RSYNC = 0o4010000;
 pub const O_DIRECTORY = 0o200000;
-pub const O_NOFOLLOW = 0o400000;
-pub const O_CLOEXEC = 0o2000000;
+pub const O_NOFOLLOW = 0x0100;
+pub const O_CLOEXEC = 0x00100000;
 
-pub const O_ASYNC = 0o20000;
-pub const O_DIRECT = 0o40000;
+pub const O_ASYNC = 0x0040;
+pub const O_DIRECT = 0x00010000;
 pub const O_LARGEFILE = 0;
 pub const O_NOATIME = 0o1000000;
 pub const O_PATH = 0o10000000;
@@ -539,96 +549,117 @@ pub fn getErrno(r: usize) usize {
 }
 
 pub fn dup2(old: i32, new: i32) usize {
-    return arch.syscall2(SYS_dup2, @bitCast(usize, isize(old)), @bitCast(usize, isize(new)));
+    return errnoWrap(c.dup2(old, new));
 }
 
 pub fn chdir(path: [*]const u8) usize {
-    return arch.syscall1(SYS_chdir, @ptrToInt(path));
+    return errnoWrap(c.chdir(path));
 }
 
 pub fn execve(path: [*]const u8, argv: [*]const ?[*]const u8, envp: [*]const ?[*]const u8) usize {
-    return arch.syscall3(SYS_execve, @ptrToInt(path), @ptrToInt(argv), @ptrToInt(envp));
+    return errnoWrap(c.execve(path, argv, envp));
 }
 
 pub fn fork() usize {
-    return arch.syscall0(SYS_fork);
+    return errnoWrap(c.fork());
+}
+
+pub fn access(path: [*]const u8, mode: u32) usize {
+    return errnoWrap(c.access(path, mode));
 }
 
 pub fn getcwd(buf: [*]u8, size: usize) usize {
-    return arch.syscall2(SYS___getcwd, @ptrToInt(buf), size);
+    return if (c.getcwd(buf, size) == null) @bitCast(usize, -isize(c._errno().*)) else 0;
 }
 
 pub fn getdents(fd: i32, dirp: [*]u8, count: usize) usize {
-    return arch.syscall3(SYS_getdents, @bitCast(usize, isize(fd)), @ptrToInt(dirp), count);
+    return errnoWrap(@bitCast(isize, c.getdents(fd, drip, count)));
+}
+
+pub fn getdirentries(fd: i32, buf_ptr: [*]u8, buf_len: usize, basep: *i64) usize {
+    return errnoWrap(@bitCast(isize, c.getdirentries(fd, buf_ptr, buf_len, basep)));
+}
+
+pub fn realpath(noalias filename: [*]const u8, noalias resolved_name: [*]u8) usize {
+    return if (c.realpath(filename, resolved_name) == null) @bitCast(usize, -isize(c._errno().*)) else 0;
 }
 
 pub fn isatty(fd: i32) bool {
-    var wsz: winsize = undefined;
-    return arch.syscall3(SYS_ioctl, @bitCast(usize, isize(fd)), TIOCGWINSZ, @ptrToInt(&wsz)) == 0;
+    return c.isatty(fd) != 0;
 }
 
 pub fn readlink(noalias path: [*]const u8, noalias buf_ptr: [*]u8, buf_len: usize) usize {
-    return arch.syscall3(SYS_readlink, @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);
+    return errnoWrap(c.readlink(path, buf_ptr, buf_len));
 }
 
 pub fn mkdir(path: [*]const u8, mode: u32) usize {
-    return arch.syscall2(SYS_mkdir, @ptrToInt(path), mode);
+    return errnoWrap(c.mkdir(path, mode));
 }
 
-pub fn mmap(address: ?*u8, length: usize, prot: usize, flags: usize, fd: i32, offset: isize) usize {
-    return arch.syscall6(SYS_mmap, @ptrToInt(address), length, prot, flags, @bitCast(usize, isize(fd)), @bitCast(usize, offset));
+pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, offset: isize) usize {
+    const ptr_result = c.mmap(
+        @ptrCast(*c_void, address),
+        length,
+        @bitCast(c_int, @intCast(c_uint, prot)),
+        @bitCast(c_int, c_uint(flags)),
+        fd,
+        offset,
+    );
+    const isize_result = @bitCast(isize, @ptrToInt(ptr_result));
+    return errnoWrap(isize_result);
 }
 
 pub fn munmap(address: usize, length: usize) usize {
-    return arch.syscall2(SYS_munmap, address, length);
+    return errnoWrap(c.munmap(@intToPtr(*c_void, address), length));
 }
 
-pub fn read(fd: i32, buf: [*]u8, count: usize) usize {
-    return arch.syscall3(SYS_read, @bitCast(usize, isize(fd)), @ptrToInt(buf), count);
+pub fn read(fd: i32, buf: [*]u8, nbyte: usize) usize {
+    return errnoWrap(c.read(fd, @ptrCast(*c_void, buf), nbyte));
 }
 
 pub fn rmdir(path: [*]const u8) usize {
-    return arch.syscall1(SYS_rmdir, @ptrToInt(path));
+    return errnoWrap(c.rmdir(path));
 }
 
 pub fn symlink(existing: [*]const u8, new: [*]const u8) usize {
-    return arch.syscall2(SYS_symlink, @ptrToInt(existing), @ptrToInt(new));
+    return errnoWrap(c.symlink(existing, new));
 }
 
-pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: usize) usize {
-    return arch.syscall4(SYS_pread, @bitCast(usize, isize(fd)), @ptrToInt(buf), count, offset);
+pub fn pread(fd: i32, buf: [*]u8, nbyte: usize, offset: u64) usize {
+    return errnoWrap(c.pread(fd, @ptrCast(*c_void, buf), nbyte, offset));
 }
 
 pub fn preadv(fd: i32, iov: [*]const iovec, count: usize, offset: usize) usize {
-    return arch.syscall4(SYS_preadv, @bitCast(usize, isize(fd)), @ptrToInt(iov), count, offset);
+    return errnoWrap(c.preadv(fd, @ptrCast(*const c_void, iov), @intCast(c_int, count), offset));
 }
 
 pub fn pipe(fd: *[2]i32) usize {
     return pipe2(fd, 0);
 }
 
-pub fn pipe2(fd: *[2]i32, flags: usize) usize {
-    return arch.syscall2(SYS_pipe2, @ptrToInt(fd), flags);
+pub fn pipe2(fd: *[2]i32, flags: u32) usize {
+    comptime assert(i32.bit_count == c_int.bit_count);
+    return errnoWrap(c.pipe2(@ptrCast(*[2]c_int, fd), flags));
 }
 
-pub fn write(fd: i32, buf: [*]const u8, count: usize) usize {
-    return arch.syscall3(SYS_write, @bitCast(usize, isize(fd)), @ptrToInt(buf), count);
+pub fn write(fd: i32, buf: [*]const u8, nbyte: usize) usize {
+    return errnoWrap(c.write(fd, @ptrCast(*const c_void, buf), nbyte));
 }
 
-pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {
-    return arch.syscall4(SYS_pwrite, @bitCast(usize, isize(fd)), @ptrToInt(buf), count, offset);
+pub fn pwrite(fd: i32, buf: [*]const u8, nbyte: usize, offset: u64) usize {
+    return errnoWrap(c.pwrite(fd, @ptrCast(*const c_void, buf), nbyte, offset));
 }
 
 pub fn pwritev(fd: i32, iov: [*]const iovec_const, count: usize, offset: usize) usize {
-    return arch.syscall4(SYS_pwritev, @bitCast(usize, isize(fd)), @ptrToInt(iov), count, offset);
+    return errnoWrap(c.pwritev(fd, @ptrCast(*const c_void, iov), @intCast(c_int, count), offset));
 }
 
 pub fn rename(old: [*]const u8, new: [*]const u8) usize {
-    return arch.syscall2(SYS_rename, @ptrToInt(old), @ptrToInt(new));
+    return errnoWrap(c.rename(old, new));
 }
 
-pub fn open(path: [*]const u8, flags: u32, perm: usize) usize {
-    return arch.syscall3(SYS_open, @ptrToInt(path), flags, perm);
+pub fn open(path: [*]const u8, flags: u32, mode: usize) usize {
+    return errnoWrap(c.open(path, @bitCast(c_int, flags), mode));
 }
 
 pub fn create(path: [*]const u8, perm: usize) usize {
@@ -636,56 +667,52 @@ pub fn create(path: [*]const u8, perm: usize) usize {
 }
 
 pub fn openat(dirfd: i32, path: [*]const u8, flags: usize, mode: usize) usize {
-    return arch.syscall4(SYS_openat, @bitCast(usize, isize(dirfd)), @ptrToInt(path), flags, mode);
+    return errnoWrap(c.openat(@bitCast(usize, isize(dirfd)), @ptrToInt(path), flags, mode));
 }
 
 pub fn close(fd: i32) usize {
-    return arch.syscall1(SYS_close, @bitCast(usize, isize(fd)));
-}
-
-pub fn lseek(fd: i32, offset: isize, ref_pos: usize) usize {
-    return arch.syscall3(SYS_lseek, @bitCast(usize, isize(fd)), @bitCast(usize, offset), ref_pos);
+    return errnoWrap(c.close(fd));
 }
 
-pub fn exit(status: i32) noreturn {
-    _ = arch.syscall1(SYS_exit, @bitCast(usize, isize(status)));
-    unreachable;
+pub fn lseek(fd: i32, offset: isize, whence: c_int) usize {
+    return errnoWrap(c.lseek(fd, offset, whence));
 }
 
-pub fn getrandom(buf: [*]u8, count: usize, flags: u32) usize {
-    return arch.syscall3(SYS_getrandom, @ptrToInt(buf), count, usize(flags));
+pub fn exit(code: i32) noreturn {
+    c.exit(code);
 }
 
 pub fn kill(pid: i32, sig: i32) usize {
-    return arch.syscall2(SYS_kill, @bitCast(usize, isize(pid)), @bitCast(usize, isize(sig)));
+    return errnoWrap(c.kill(pid, sig));
 }
 
 pub fn unlink(path: [*]const u8) usize {
-    return arch.syscall1(SYS_unlink, @ptrToInt(path));
+    return errnoWrap(c.unlink(path));
 }
 
-pub fn waitpid(pid: i32, status: *i32, options: i32) usize {
-    return arch.syscall4(SYS_wait4, @bitCast(usize, isize(pid)), @ptrToInt(status), @bitCast(usize, isize(options)), 0);
+pub fn waitpid(pid: i32, status: *i32, options: u32) usize {
+    comptime assert(i32.bit_count == c_int.bit_count);
+    return errnoWrap(c.waitpid(pid, @ptrCast(*c_int, status), @bitCast(c_int, options)));
 }
 
 pub fn nanosleep(req: *const timespec, rem: ?*timespec) usize {
-    return arch.syscall2(SYS_nanosleep, @ptrToInt(req), @ptrToInt(rem));
+    return errnoWrap(c.nanosleep(req, rem));
 }
 
 pub fn setuid(uid: u32) usize {
-    return arch.syscall1(SYS_setuid, uid);
+    return errnoWrap(c.setuid(uid));
 }
 
 pub fn setgid(gid: u32) usize {
-    return arch.syscall1(SYS_setgid, gid);
+    return errnoWrap(c.setgid(gid));
 }
 
 pub fn setreuid(ruid: u32, euid: u32) usize {
-    return arch.syscall2(SYS_setreuid, ruid, euid);
+    return errnoWrap(c.setreuid(ruid, euid));
 }
 
 pub fn setregid(rgid: u32, egid: u32) usize {
-    return arch.syscall2(SYS_setregid, rgid, egid);
+    return errnoWrap(c.setregid(rgid, egid));
 }
 
 const NSIG = 32;
@@ -730,25 +757,16 @@ pub const sigset_t = extern struct {
 };
 
 pub fn raise(sig: i32) usize {
-    // TODO have a chat with the freebsd folks and make sure there's no bug in
-    // their libc. musl-libc blocks signals in between these calls because
-    // if a signal handler runs and forks between the gettid and sending the
-    // signal, the parent will get 2 signals, one from itself and one from the child
-    // if the protection does not belong here, then it belongs in abort(),
-    // like it does in freebsd's libc.
-    var id: usize = undefined;
-    const rc = arch.syscall1(SYS_thr_self, @ptrToInt(&id));
-    if (getErrno(rc) != 0) return rc;
-    return arch.syscall2(SYS_thr_kill, id, @bitCast(usize, isize(sig)));
+    return errnoWrap(c.raise(sig));
 }
 
-pub const Stat = arch.Stat;
-pub const timespec = arch.timespec;
+pub const Stat = c.Stat;
+pub const dirent = c.dirent;
+pub const timespec = c.timespec;
 
-pub fn fstat(fd: i32, stat_buf: *Stat) usize {
-    return arch.syscall2(SYS_fstat, @bitCast(usize, isize(fd)), @ptrToInt(stat_buf));
+pub fn fstat(fd: i32, buf: *c.Stat) usize {
+    return errnoWrap(c.fstat(fd, buf));
 }
-
 pub const iovec = extern struct {
     iov_base: [*]u8,
     iov_len: usize,
diff --git a/std/os/freebsd/syscall.zig b/std/os/freebsd/syscall.zig
deleted file mode 100644
index 6cdd71de3b..0000000000
--- a/std/os/freebsd/syscall.zig
+++ /dev/null
@@ -1,493 +0,0 @@
-pub const SYS_syscall = 0;
-pub const SYS_exit = 1;
-pub const SYS_fork = 2;
-pub const SYS_read = 3;
-pub const SYS_write = 4;
-pub const SYS_open = 5;
-pub const SYS_close = 6;
-pub const SYS_wait4 = 7;
-// 8 is old creat
-pub const SYS_link = 9;
-pub const SYS_unlink = 10;
-// 11 is obsolete execv
-pub const SYS_chdir = 12;
-pub const SYS_fchdir = 13;
-pub const SYS_freebsd11_mknod = 14;
-pub const SYS_chmod = 15;
-pub const SYS_chown = 16;
-pub const SYS_break = 17;
-// 18 is freebsd4 getfsstat
-// 19 is old lseek
-pub const SYS_getpid = 20;
-pub const SYS_mount = 21;
-pub const SYS_unmount = 22;
-pub const SYS_setuid = 23;
-pub const SYS_getuid = 24;
-pub const SYS_geteuid = 25;
-pub const SYS_ptrace = 26;
-pub const SYS_recvmsg = 27;
-pub const SYS_sendmsg = 28;
-pub const SYS_recvfrom = 29;
-pub const SYS_accept = 30;
-pub const SYS_getpeername = 31;
-pub const SYS_getsockname = 32;
-pub const SYS_access = 33;
-pub const SYS_chflags = 34;
-pub const SYS_fchflags = 35;
-pub const SYS_sync = 36;
-pub const SYS_kill = 37;
-// 38 is old stat
-pub const SYS_getppid = 39;
-// 40 is old lstat
-pub const SYS_dup = 41;
-pub const SYS_freebsd10_pipe = 42;
-pub const SYS_getegid = 43;
-pub const SYS_profil = 44;
-pub const SYS_ktrace = 45;
-// 46 is old sigaction
-pub const SYS_getgid = 47;
-// 48 is old sigprocmask
-pub const SYS_getlogin = 49;
-pub const SYS_setlogin = 50;
-pub const SYS_acct = 51;
-// 52 is old sigpending
-pub const SYS_sigaltstack = 53;
-pub const SYS_ioctl = 54;
-pub const SYS_reboot = 55;
-pub const SYS_revoke = 56;
-pub const SYS_symlink = 57;
-pub const SYS_readlink = 58;
-pub const SYS_execve = 59;
-pub const SYS_umask = 60;
-pub const SYS_chroot = 61;
-// 62 is old fstat
-// 63 is old getkerninfo
-// 64 is old getpagesize
-pub const SYS_msync = 65;
-pub const SYS_vfork = 66;
-// 67 is obsolete vread
-// 68 is obsolete vwrite
-// 69 is obsolete sbrk (still present on some platforms)
-pub const SYS_sstk = 70;
-// 71 is old mmap
-pub const SYS_vadvise = 72;
-pub const SYS_munmap = 73;
-pub const SYS_mprotect = 74;
-pub const SYS_madvise = 75;
-// 76 is obsolete vhangup
-// 77 is obsolete vlimit
-pub const SYS_mincore = 78;
-pub const SYS_getgroups = 79;
-pub const SYS_setgroups = 80;
-pub const SYS_getpgrp = 81;
-pub const SYS_setpgid = 82;
-pub const SYS_setitimer = 83;
-// 84 is old wait
-pub const SYS_swapon = 85;
-pub const SYS_getitimer = 86;
-// 87 is old gethostname
-// 88 is old sethostname
-pub const SYS_getdtablesize = 89;
-pub const SYS_dup2 = 90;
-pub const SYS_fcntl = 92;
-pub const SYS_select = 93;
-pub const SYS_fsync = 95;
-pub const SYS_setpriority = 96;
-pub const SYS_socket = 97;
-pub const SYS_connect = 98;
-// 99 is old accept
-pub const SYS_getpriority = 100;
-// 101 is old send
-// 102 is old recv
-// 103 is old sigreturn
-pub const SYS_bind = 104;
-pub const SYS_setsockopt = 105;
-pub const SYS_listen = 106;
-// 107 is obsolete vtimes
-// 108 is old sigvec
-// 109 is old sigblock
-// 110 is old sigsetmask
-// 111 is old sigsuspend
-// 112 is old sigstack
-// 113 is old recvmsg
-// 114 is old sendmsg
-// 115 is obsolete vtrace
-pub const SYS_gettimeofday = 116;
-pub const SYS_getrusage = 117;
-pub const SYS_getsockopt = 118;
-pub const SYS_readv = 120;
-pub const SYS_writev = 121;
-pub const SYS_settimeofday = 122;
-pub const SYS_fchown = 123;
-pub const SYS_fchmod = 124;
-// 125 is old recvfrom
-pub const SYS_setreuid = 126;
-pub const SYS_setregid = 127;
-pub const SYS_rename = 128;
-// 129 is old truncate
-// 130 is old ftruncate
-pub const SYS_flock = 131;
-pub const SYS_mkfifo = 132;
-pub const SYS_sendto = 133;
-pub const SYS_shutdown = 134;
-pub const SYS_socketpair = 135;
-pub const SYS_mkdir = 136;
-pub const SYS_rmdir = 137;
-pub const SYS_utimes = 138;
-// 139 is obsolete 4.2 sigreturn
-pub const SYS_adjtime = 140;
-// 141 is old getpeername
-// 142 is old gethostid
-// 143 is old sethostid
-// 144 is old getrlimit
-// 145 is old setrlimit
-// 146 is old killpg
-pub const SYS_setsid = 147;
-pub const SYS_quotactl = 148;
-// 149 is old quota
-// 150 is old getsockname
-pub const SYS_nlm_syscall = 154;
-pub const SYS_nfssvc = 155;
-// 156 is old getdirentries
-// 157 is freebsd4 statfs
-// 158 is freebsd4 fstatfs
-pub const SYS_lgetfh = 160;
-pub const SYS_getfh = 161;
-// 162 is freebsd4 getdomainname
-// 163 is freebsd4 setdomainname
-// 164 is freebsd4 uname
-pub const SYS_sysarch = 165;
-pub const SYS_rtprio = 166;
-pub const SYS_semsys = 169;
-pub const SYS_msgsys = 170;
-pub const SYS_shmsys = 171;
-// 173 is freebsd6 pread
-// 174 is freebsd6 pwrite
-pub const SYS_setfib = 175;
-pub const SYS_ntp_adjtime = 176;
-pub const SYS_setgid = 181;
-pub const SYS_setegid = 182;
-pub const SYS_seteuid = 183;
-// 184 is obsolete lfs_bmapv
-// 185 is obsolete lfs_markv
-// 186 is obsolete lfs_segclean
-// 187 is obsolete lfs_segwait
-pub const SYS_freebsd11_stat = 188;
-pub const SYS_freebsd11_fstat = 189;
-pub const SYS_freebsd11_lstat = 190;
-pub const SYS_pathconf = 191;
-pub const SYS_fpathconf = 192;
-pub const SYS_getrlimit = 194;
-pub const SYS_setrlimit = 195;
-pub const SYS_freebsd11_getdirentries = 196;
-// 197 is freebsd6 mmap
-pub const SYS___syscall = 198;
-// 199 is freebsd6 lseek
-// 200 is freebsd6 truncate
-// 201 is freebsd6 ftruncate
-pub const SYS___sysctl = 202;
-pub const SYS_mlock = 203;
-pub const SYS_munlock = 204;
-pub const SYS_undelete = 205;
-pub const SYS_futimes = 206;
-pub const SYS_getpgid = 207;
-pub const SYS_poll = 209;
-pub const SYS_freebsd7___semctl = 220;
-pub const SYS_semget = 221;
-pub const SYS_semop = 222;
-pub const SYS_freebsd7_msgctl = 224;
-pub const SYS_msgget = 225;
-pub const SYS_msgsnd = 226;
-pub const SYS_msgrcv = 227;
-pub const SYS_shmat = 228;
-pub const SYS_freebsd7_shmctl = 229;
-pub const SYS_shmdt = 230;
-pub const SYS_shmget = 231;
-pub const SYS_clock_gettime = 232;
-pub const SYS_clock_settime = 233;
-pub const SYS_clock_getres = 234;
-pub const SYS_ktimer_create = 235;
-pub const SYS_ktimer_delete = 236;
-pub const SYS_ktimer_settime = 237;
-pub const SYS_ktimer_gettime = 238;
-pub const SYS_ktimer_getoverrun = 239;
-pub const SYS_nanosleep = 240;
-pub const SYS_ffclock_getcounter = 241;
-pub const SYS_ffclock_setestimate = 242;
-pub const SYS_ffclock_getestimate = 243;
-pub const SYS_clock_nanosleep = 244;
-pub const SYS_clock_getcpuclockid2 = 247;
-pub const SYS_ntp_gettime = 248;
-pub const SYS_minherit = 250;
-pub const SYS_rfork = 251;
-// 252 is obsolete openbsd_poll
-pub const SYS_issetugid = 253;
-pub const SYS_lchown = 254;
-pub const SYS_aio_read = 255;
-pub const SYS_aio_write = 256;
-pub const SYS_lio_listio = 257;
-pub const SYS_freebsd11_getdents = 272;
-pub const SYS_lchmod = 274;
-// 275 is obsolete netbsd_lchown
-pub const SYS_lutimes = 276;
-// 277 is obsolete netbsd_msync
-pub const SYS_freebsd11_nstat = 278;
-pub const SYS_freebsd11_nfstat = 279;
-pub const SYS_freebsd11_nlstat = 280;
-pub const SYS_preadv = 289;
-pub const SYS_pwritev = 290;
-// 297 is freebsd4 fhstatfs
-pub const SYS_fhopen = 298;
-pub const SYS_freebsd11_fhstat = 299;
-pub const SYS_modnext = 300;
-pub const SYS_modstat = 301;
-pub const SYS_modfnext = 302;
-pub const SYS_modfind = 303;
-pub const SYS_kldload = 304;
-pub const SYS_kldunload = 305;
-pub const SYS_kldfind = 306;
-pub const SYS_kldnext = 307;
-pub const SYS_kldstat = 308;
-pub const SYS_kldfirstmod = 309;
-pub const SYS_getsid = 310;
-pub const SYS_setresuid = 311;
-pub const SYS_setresgid = 312;
-// 313 is obsolete signanosleep
-pub const SYS_aio_return = 314;
-pub const SYS_aio_suspend = 315;
-pub const SYS_aio_cancel = 316;
-pub const SYS_aio_error = 317;
-// 318 is freebsd6 aio_read
-// 319 is freebsd6 aio_write
-// 320 is freebsd6 lio_listio
-pub const SYS_yield = 321;
-// 322 is obsolete thr_sleep
-// 323 is obsolete thr_wakeup
-pub const SYS_mlockall = 324;
-pub const SYS_munlockall = 325;
-pub const SYS___getcwd = 326;
-pub const SYS_sched_setparam = 327;
-pub const SYS_sched_getparam = 328;
-pub const SYS_sched_setscheduler = 329;
-pub const SYS_sched_getscheduler = 330;
-pub const SYS_sched_yield = 331;
-pub const SYS_sched_get_priority_max = 332;
-pub const SYS_sched_get_priority_min = 333;
-pub const SYS_sched_rr_get_interval = 334;
-pub const SYS_utrace = 335;
-// 336 is freebsd4 sendfile
-pub const SYS_kldsym = 337;
-pub const SYS_jail = 338;
-pub const SYS_nnpfs_syscall = 339;
-pub const SYS_sigprocmask = 340;
-pub const SYS_sigsuspend = 341;
-// 342 is freebsd4 sigaction
-pub const SYS_sigpending = 343;
-// 344 is freebsd4 sigreturn
-pub const SYS_sigtimedwait = 345;
-pub const SYS_sigwaitinfo = 346;
-pub const SYS___acl_get_file = 347;
-pub const SYS___acl_set_file = 348;
-pub const SYS___acl_get_fd = 349;
-pub const SYS___acl_set_fd = 350;
-pub const SYS___acl_delete_file = 351;
-pub const SYS___acl_delete_fd = 352;
-pub const SYS___acl_aclcheck_file = 353;
-pub const SYS___acl_aclcheck_fd = 354;
-pub const SYS_extattrctl = 355;
-pub const SYS_extattr_set_file = 356;
-pub const SYS_extattr_get_file = 357;
-pub const SYS_extattr_delete_file = 358;
-pub const SYS_aio_waitcomplete = 359;
-pub const SYS_getresuid = 360;
-pub const SYS_getresgid = 361;
-pub const SYS_kqueue = 362;
-pub const SYS_freebsd11_kevent = 363;
-// 364 is obsolete __cap_get_proc
-// 365 is obsolete __cap_set_proc
-// 366 is obsolete __cap_get_fd
-// 367 is obsolete __cap_get_file
-// 368 is obsolete __cap_set_fd
-// 369 is obsolete __cap_set_file
-pub const SYS_extattr_set_fd = 371;
-pub const SYS_extattr_get_fd = 372;
-pub const SYS_extattr_delete_fd = 373;
-pub const SYS___setugid = 374;
-pub const SYS_eaccess = 376;
-pub const SYS_afs3_syscall = 377;
-pub const SYS_nmount = 378;
-// 379 is obsolete kse_exit
-// 380 is obsolete kse_wakeup
-// 381 is obsolete kse_create
-// 382 is obsolete kse_thr_interrupt
-// 383 is obsolete kse_release
-pub const SYS___mac_get_proc = 384;
-pub const SYS___mac_set_proc = 385;
-pub const SYS___mac_get_fd = 386;
-pub const SYS___mac_get_file = 387;
-pub const SYS___mac_set_fd = 388;
-pub const SYS___mac_set_file = 389;
-pub const SYS_kenv = 390;
-pub const SYS_lchflags = 391;
-pub const SYS_uuidgen = 392;
-pub const SYS_sendfile = 393;
-pub const SYS_mac_syscall = 394;
-pub const SYS_freebsd11_getfsstat = 395;
-pub const SYS_freebsd11_statfs = 396;
-pub const SYS_freebsd11_fstatfs = 397;
-pub const SYS_freebsd11_fhstatfs = 398;
-pub const SYS_ksem_close = 400;
-pub const SYS_ksem_post = 401;
-pub const SYS_ksem_wait = 402;
-pub const SYS_ksem_trywait = 403;
-pub const SYS_ksem_init = 404;
-pub const SYS_ksem_open = 405;
-pub const SYS_ksem_unlink = 406;
-pub const SYS_ksem_getvalue = 407;
-pub const SYS_ksem_destroy = 408;
-pub const SYS___mac_get_pid = 409;
-pub const SYS___mac_get_link = 410;
-pub const SYS___mac_set_link = 411;
-pub const SYS_extattr_set_link = 412;
-pub const SYS_extattr_get_link = 413;
-pub const SYS_extattr_delete_link = 414;
-pub const SYS___mac_execve = 415;
-pub const SYS_sigaction = 416;
-pub const SYS_sigreturn = 417;
-pub const SYS_getcontext = 421;
-pub const SYS_setcontext = 422;
-pub const SYS_swapcontext = 423;
-pub const SYS_swapoff = 424;
-pub const SYS___acl_get_link = 425;
-pub const SYS___acl_set_link = 426;
-pub const SYS___acl_delete_link = 427;
-pub const SYS___acl_aclcheck_link = 428;
-pub const SYS_sigwait = 429;
-pub const SYS_thr_create = 430;
-pub const SYS_thr_exit = 431;
-pub const SYS_thr_self = 432;
-pub const SYS_thr_kill = 433;
-pub const SYS_jail_attach = 436;
-pub const SYS_extattr_list_fd = 437;
-pub const SYS_extattr_list_file = 438;
-pub const SYS_extattr_list_link = 439;
-// 440 is obsolete kse_switchin
-pub const SYS_ksem_timedwait = 441;
-pub const SYS_thr_suspend = 442;
-pub const SYS_thr_wake = 443;
-pub const SYS_kldunloadf = 444;
-pub const SYS_audit = 445;
-pub const SYS_auditon = 446;
-pub const SYS_getauid = 447;
-pub const SYS_setauid = 448;
-pub const SYS_getaudit = 449;
-pub const SYS_setaudit = 450;
-pub const SYS_getaudit_addr = 451;
-pub const SYS_setaudit_addr = 452;
-pub const SYS_auditctl = 453;
-pub const SYS__umtx_op = 454;
-pub const SYS_thr_new = 455;
-pub const SYS_sigqueue = 456;
-pub const SYS_kmq_open = 457;
-pub const SYS_kmq_setattr = 458;
-pub const SYS_kmq_timedreceive = 459;
-pub const SYS_kmq_timedsend = 460;
-pub const SYS_kmq_notify = 461;
-pub const SYS_kmq_unlink = 462;
-pub const SYS_abort2 = 463;
-pub const SYS_thr_set_name = 464;
-pub const SYS_aio_fsync = 465;
-pub const SYS_rtprio_thread = 466;
-pub const SYS_sctp_peeloff = 471;
-pub const SYS_sctp_generic_sendmsg = 472;
-pub const SYS_sctp_generic_sendmsg_iov = 473;
-pub const SYS_sctp_generic_recvmsg = 474;
-pub const SYS_pread = 475;
-pub const SYS_pwrite = 476;
-pub const SYS_mmap = 477;
-pub const SYS_lseek = 478;
-pub const SYS_truncate = 479;
-pub const SYS_ftruncate = 480;
-pub const SYS_thr_kill2 = 481;
-pub const SYS_shm_open = 482;
-pub const SYS_shm_unlink = 483;
-pub const SYS_cpuset = 484;
-pub const SYS_cpuset_setid = 485;
-pub const SYS_cpuset_getid = 486;
-pub const SYS_cpuset_getaffinity = 487;
-pub const SYS_cpuset_setaffinity = 488;
-pub const SYS_faccessat = 489;
-pub const SYS_fchmodat = 490;
-pub const SYS_fchownat = 491;
-pub const SYS_fexecve = 492;
-pub const SYS_freebsd11_fstatat = 493;
-pub const SYS_futimesat = 494;
-pub const SYS_linkat = 495;
-pub const SYS_mkdirat = 496;
-pub const SYS_mkfifoat = 497;
-pub const SYS_freebsd11_mknodat = 498;
-pub const SYS_openat = 499;
-pub const SYS_readlinkat = 500;
-pub const SYS_renameat = 501;
-pub const SYS_symlinkat = 502;
-pub const SYS_unlinkat = 503;
-pub const SYS_posix_openpt = 504;
-pub const SYS_gssd_syscall = 505;
-pub const SYS_jail_get = 506;
-pub const SYS_jail_set = 507;
-pub const SYS_jail_remove = 508;
-pub const SYS_closefrom = 509;
-pub const SYS___semctl = 510;
-pub const SYS_msgctl = 511;
-pub const SYS_shmctl = 512;
-pub const SYS_lpathconf = 513;
-// 514 is obsolete cap_new
-pub const SYS___cap_rights_get = 515;
-pub const SYS_cap_enter = 516;
-pub const SYS_cap_getmode = 517;
-pub const SYS_pdfork = 518;
-pub const SYS_pdkill = 519;
-pub const SYS_pdgetpid = 520;
-pub const SYS_pselect = 522;
-pub const SYS_getloginclass = 523;
-pub const SYS_setloginclass = 524;
-pub const SYS_rctl_get_racct = 525;
-pub const SYS_rctl_get_rules = 526;
-pub const SYS_rctl_get_limits = 527;
-pub const SYS_rctl_add_rule = 528;
-pub const SYS_rctl_remove_rule = 529;
-pub const SYS_posix_fallocate = 530;
-pub const SYS_posix_fadvise = 531;
-pub const SYS_wait6 = 532;
-pub const SYS_cap_rights_limit = 533;
-pub const SYS_cap_ioctls_limit = 534;
-pub const SYS_cap_ioctls_get = 535;
-pub const SYS_cap_fcntls_limit = 536;
-pub const SYS_cap_fcntls_get = 537;
-pub const SYS_bindat = 538;
-pub const SYS_connectat = 539;
-pub const SYS_chflagsat = 540;
-pub const SYS_accept4 = 541;
-pub const SYS_pipe2 = 542;
-pub const SYS_aio_mlock = 543;
-pub const SYS_procctl = 544;
-pub const SYS_ppoll = 545;
-pub const SYS_futimens = 546;
-pub const SYS_utimensat = 547;
-// 548 is obsolete numa_getaffinity
-// 549 is obsolete numa_setaffinity
-pub const SYS_fdatasync = 550;
-pub const SYS_fstat = 551;
-pub const SYS_fstatat = 552;
-pub const SYS_fhstat = 553;
-pub const SYS_getdirentries = 554;
-pub const SYS_statfs = 555;
-pub const SYS_fstatfs = 556;
-pub const SYS_getfsstat = 557;
-pub const SYS_fhstatfs = 558;
-pub const SYS_mknodat = 559;
-pub const SYS_kevent = 560;
-pub const SYS_cpuset_getdomain = 561;
-pub const SYS_cpuset_setdomain = 562;
-pub const SYS_getrandom = 563;
-pub const SYS_MAXSYSCALL = 564;
diff --git a/std/os/freebsd/x86_64.zig b/std/os/freebsd/x86_64.zig
deleted file mode 100644
index 509075386f..0000000000
--- a/std/os/freebsd/x86_64.zig
+++ /dev/null
@@ -1,136 +0,0 @@
-const freebsd = @import("index.zig");
-const socklen_t = freebsd.socklen_t;
-const iovec = freebsd.iovec;
-
-pub const SYS_sbrk = 69;
-
-pub fn syscall0(number: usize) usize {
-    return asm volatile ("syscall"
-        : [ret] "={rax}" (-> usize)
-        : [number] "{rax}" (number)
-        : "rcx", "r11"
-    );
-}
-
-pub fn syscall1(number: usize, arg1: usize) usize {
-    return asm volatile ("syscall"
-        : [ret] "={rax}" (-> usize)
-        : [number] "{rax}" (number),
-          [arg1] "{rdi}" (arg1)
-        : "rcx", "r11"
-    );
-}
-
-pub fn syscall2(number: usize, arg1: usize, arg2: usize) usize {
-    return asm volatile ("syscall"
-        : [ret] "={rax}" (-> usize)
-        : [number] "{rax}" (number),
-          [arg1] "{rdi}" (arg1),
-          [arg2] "{rsi}" (arg2)
-        : "rcx", "r11"
-    );
-}
-
-pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {
-    return asm volatile ("syscall"
-        : [ret] "={rax}" (-> usize)
-        : [number] "{rax}" (number),
-          [arg1] "{rdi}" (arg1),
-          [arg2] "{rsi}" (arg2),
-          [arg3] "{rdx}" (arg3)
-        : "rcx", "r11"
-    );
-}
-
-pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
-    return asm volatile ("syscall"
-        : [ret] "={rax}" (-> usize)
-        : [number] "{rax}" (number),
-          [arg1] "{rdi}" (arg1),
-          [arg2] "{rsi}" (arg2),
-          [arg3] "{rdx}" (arg3),
-          [arg4] "{r10}" (arg4)
-        : "rcx", "r11"
-    );
-}
-
-pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
-    return asm volatile ("syscall"
-        : [ret] "={rax}" (-> usize)
-        : [number] "{rax}" (number),
-          [arg1] "{rdi}" (arg1),
-          [arg2] "{rsi}" (arg2),
-          [arg3] "{rdx}" (arg3),
-          [arg4] "{r10}" (arg4),
-          [arg5] "{r8}" (arg5)
-        : "rcx", "r11"
-    );
-}
-
-pub fn syscall6(
-    number: usize,
-    arg1: usize,
-    arg2: usize,
-    arg3: usize,
-    arg4: usize,
-    arg5: usize,
-    arg6: usize,
-) usize {
-    return asm volatile ("syscall"
-        : [ret] "={rax}" (-> usize)
-        : [number] "{rax}" (number),
-          [arg1] "{rdi}" (arg1),
-          [arg2] "{rsi}" (arg2),
-          [arg3] "{rdx}" (arg3),
-          [arg4] "{r10}" (arg4),
-          [arg5] "{r8}" (arg5),
-          [arg6] "{r9}" (arg6)
-        : "rcx", "r11"
-    );
-}
-
-pub nakedcc fn restore_rt() void {
-    asm volatile ("syscall"
-        :
-        : [number] "{rax}" (usize(SYS_rt_sigreturn))
-        : "rcx", "r11"
-    );
-}
-
-pub const msghdr = extern struct {
-    msg_name: *u8,
-    msg_namelen: socklen_t,
-    msg_iov: *iovec,
-    msg_iovlen: i32,
-    __pad1: i32,
-    msg_control: *u8,
-    msg_controllen: socklen_t,
-    __pad2: socklen_t,
-    msg_flags: i32,
-};
-
-/// Renamed to Stat to not conflict with the stat function.
-pub const Stat = extern struct {
-    dev: u64,
-    ino: u64,
-    nlink: usize,
-
-    mode: u32,
-    uid: u32,
-    gid: u32,
-    __pad0: u32,
-    rdev: u64,
-    size: i64,
-    blksize: isize,
-    blocks: i64,
-
-    atim: timespec,
-    mtim: timespec,
-    ctim: timespec,
-    __unused: [3]isize,
-};
-
-pub const timespec = extern struct {
-    tv_sec: isize,
-    tv_nsec: isize,
-};
diff --git a/std/os/index.zig b/std/os/index.zig
index b19679c969..78d543583d 100644
--- a/std/os/index.zig
+++ b/std/os/index.zig
@@ -18,6 +18,7 @@ test "std.os" {
     _ = @import("test.zig");
     _ = @import("time.zig");
     _ = @import("windows/index.zig");
+    _ = @import("uefi.zig");
     _ = @import("get_app_data_dir.zig");
 }
 
@@ -26,6 +27,8 @@ pub const darwin = @import("darwin.zig");
 pub const linux = @import("linux/index.zig");
 pub const freebsd = @import("freebsd/index.zig");
 pub const zen = @import("zen.zig");
+pub const uefi = @import("uefi.zig");
+
 pub const posix = switch (builtin.os) {
     Os.linux => linux,
     Os.macosx, Os.ios => darwin,
@@ -33,6 +36,7 @@ pub const posix = switch (builtin.os) {
     Os.zen => zen,
     else => @compileError("Unsupported OS"),
 };
+
 pub const net = @import("net.zig");
 
 pub const ChildProcess = @import("child_process.zig").ChildProcess;
@@ -103,7 +107,7 @@ const math = std.math;
 /// library implementation.
 pub fn getRandomBytes(buf: []u8) !void {
     switch (builtin.os) {
-        Os.linux, Os.freebsd => while (true) {
+        Os.linux => while (true) {
             // TODO check libc version and potentially call c.getrandom.
             // See #397
             const errno = posix.getErrno(posix.getrandom(buf.ptr, buf.len, 0));
@@ -116,7 +120,7 @@ pub fn getRandomBytes(buf: []u8) !void {
                 else => return unexpectedErrorPosix(errno),
             }
         },
-        Os.macosx, Os.ios => return getRandomBytesDevURandom(buf),
+        Os.macosx, Os.ios, Os.freebsd => return getRandomBytesDevURandom(buf),
         Os.windows => {
             // Call RtlGenRandom() instead of CryptGetRandom() on Windows
             // https://github.com/rust-lang-nursery/rand/issues/111
@@ -187,6 +191,10 @@ pub fn abort() noreturn {
             }
             windows.ExitProcess(3);
         },
+        Os.uefi => {
+            // TODO there's gotta be a better thing to do here than loop forever
+            while (true) {}
+        },
         else => @compileError("Unsupported OS"),
     }
 }
@@ -1758,8 +1766,57 @@ pub const Dir = struct {
     }
 
     fn nextFreebsd(self: *Dir) !?Entry {
-        //self.handle.buf = try self.allocator.alloc(u8, page_size);
-        @compileError("TODO implement dirs for FreeBSD");
+        start_over: while (true) {
+            if (self.handle.index >= self.handle.end_index) {
+                if (self.handle.buf.len == 0) {
+                    self.handle.buf = try self.allocator.alloc(u8, page_size);
+                }
+
+                while (true) {
+                    const result = posix.getdirentries(self.handle.fd, self.handle.buf.ptr, self.handle.buf.len, &self.handle.seek);
+                    const err = posix.getErrno(result);
+                    if (err > 0) {
+                        switch (err) {
+                            posix.EBADF, posix.EFAULT, posix.ENOTDIR => unreachable,
+                            posix.EINVAL => {
+                                self.handle.buf = try self.allocator.realloc(u8, self.handle.buf, self.handle.buf.len * 2);
+                                continue;
+                            },
+                            else => return unexpectedErrorPosix(err),
+                        }
+                    }
+                    if (result == 0) return null;
+                    self.handle.index = 0;
+                    self.handle.end_index = result;
+                    break;
+                }
+            }
+            const freebsd_entry = @ptrCast(*align(1) posix.dirent, &self.handle.buf[self.handle.index]);
+            const next_index = self.handle.index + freebsd_entry.d_reclen;
+            self.handle.index = next_index;
+
+            const name = @ptrCast([*]u8, &freebsd_entry.d_name)[0..freebsd_entry.d_namlen];
+
+            if (mem.eql(u8, name, ".") or mem.eql(u8, name, "..")) {
+                continue :start_over;
+            }
+
+            const entry_kind = switch (freebsd_entry.d_type) {
+                posix.DT_BLK => Entry.Kind.BlockDevice,
+                posix.DT_CHR => Entry.Kind.CharacterDevice,
+                posix.DT_DIR => Entry.Kind.Directory,
+                posix.DT_FIFO => Entry.Kind.NamedPipe,
+                posix.DT_LNK => Entry.Kind.SymLink,
+                posix.DT_REG => Entry.Kind.File,
+                posix.DT_SOCK => Entry.Kind.UnixDomainSocket,
+                posix.DT_WHT => Entry.Kind.Whiteout,
+                else => Entry.Kind.Unknown,
+            };
+            return Entry{
+                .name = name,
+                .kind = entry_kind,
+            };
+        }
     }
 };
 
@@ -2247,7 +2304,20 @@ pub fn selfExePathW(out_buffer: *[windows_util.PATH_MAX_WIDE]u16) ![]u16 {
 pub fn selfExePath(out_buffer: *[MAX_PATH_BYTES]u8) ![]u8 {
     switch (builtin.os) {
         Os.linux => return readLink(out_buffer, "/proc/self/exe"),
-        Os.freebsd => return readLink(out_buffer, "/proc/curproc/file"),
+        Os.freebsd => {
+            var mib = [4]c_int{ posix.CTL_KERN, posix.KERN_PROC, posix.KERN_PROC_PATHNAME, -1};
+            var out_len: usize = out_buffer.len;
+            const err = posix.getErrno(posix.sysctl(&mib, 4, out_buffer, &out_len, null, 0));
+
+            if (err == 0 ) return mem.toSlice(u8, out_buffer);
+
+            return switch (err) {
+                posix.EFAULT => error.BadAdress,
+                posix.EPERM => error.PermissionDenied,
+                else => unexpectedErrorPosix(err),
+            };
+
+        },
         Os.windows => {
             var utf16le_buf: [windows_util.PATH_MAX_WIDE]u16 = undefined;
             const utf16le_slice = try selfExePathW(&utf16le_buf);
diff --git a/std/os/path.zig b/std/os/path.zig
index e61a0f84bc..31f949f0d6 100644
--- a/std/os/path.zig
+++ b/std/os/path.zig
@@ -1162,7 +1162,7 @@ pub fn realC(out_buffer: *[os.MAX_PATH_BYTES]u8, pathname: [*]const u8) RealErro
             const pathname_w = try windows_util.cStrToPrefixedFileW(pathname);
             return realW(out_buffer, pathname_w);
         },
-        Os.macosx, Os.ios => {
+        Os.freebsd, Os.macosx, Os.ios => {
             // TODO instead of calling the libc function here, port the implementation to Zig
             const err = posix.getErrno(posix.realpath(pathname, out_buffer));
             switch (err) {
@@ -1189,15 +1189,6 @@ pub fn realC(out_buffer: *[os.MAX_PATH_BYTES]u8, pathname: [*]const u8) RealErro
 
             return os.readLinkC(out_buffer, proc_path.ptr);
         },
-        Os.freebsd => { // XXX requires fdescfs
-            const fd = try os.posixOpenC(pathname, posix.O_PATH | posix.O_NONBLOCK | posix.O_CLOEXEC, 0);
-            defer os.close(fd);
-
-            var buf: ["/dev/fd/-2147483648\x00".len]u8 = undefined;
-            const proc_path = fmt.bufPrint(buf[0..], "/dev/fd/{}\x00", fd) catch unreachable;
-
-            return os.readLinkC(out_buffer, proc_path.ptr);
-        },
         else => @compileError("TODO implement os.path.real for " ++ @tagName(builtin.os)),
     }
 }
diff --git a/std/os/time.zig b/std/os/time.zig
index d9fe046a55..c3588838bc 100644
--- a/std/os/time.zig
+++ b/std/os/time.zig
@@ -13,7 +13,7 @@ pub const epoch = @import("epoch.zig");
 /// Sleep for the specified duration
 pub fn sleep(nanoseconds: u64) void {
     switch (builtin.os) {
-        Os.linux, Os.macosx, Os.ios => {
+        Os.linux, Os.macosx, Os.ios, Os.freebsd => {
             const s = nanoseconds / ns_per_s;
             const ns = nanoseconds % ns_per_s;
             posixSleep(@intCast(u63, s), @intCast(u63, ns));
diff --git a/std/os/uefi.zig b/std/os/uefi.zig
new file mode 100644
index 0000000000..8ed60d9c9b
--- /dev/null
+++ b/std/os/uefi.zig
@@ -0,0 +1,2 @@
+// TODO this is where the extern declarations go. For example, see
+// inc/efilib.h in gnu-efi-code
diff --git a/std/special/bootstrap.zig b/std/special/bootstrap.zig
index a15be317ab..129bde913f 100644
--- a/std/special/bootstrap.zig
+++ b/std/special/bootstrap.zig
@@ -20,17 +20,10 @@ comptime {
 
 nakedcc fn _start() noreturn {
     switch (builtin.arch) {
-        builtin.Arch.x86_64 => switch (builtin.os) {
-            builtin.Os.freebsd => {
-                argc_ptr = asm ("lea (%%rdi), %[argc]"
-                    : [argc] "=r" (-> [*]usize)
-                );
-            },
-            else => {
-                argc_ptr = asm ("lea (%%rsp), %[argc]"
-                    : [argc] "=r" (-> [*]usize)
-                );
-            },
+        builtin.Arch.x86_64 => {
+            argc_ptr = asm ("lea (%%rsp), %[argc]"
+                                : [argc] "=r" (-> [*]usize)
+                            );
         },
         builtin.Arch.i386 => {
             argc_ptr = asm ("lea (%%esp), %[argc]"
diff --git a/std/special/panic.zig b/std/special/panic.zig
index ca1caea73c..bd3ad971e0 100644
--- a/std/special/panic.zig
+++ b/std/special/panic.zig
@@ -13,6 +13,10 @@ pub fn panic(msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn
         builtin.Os.freestanding, builtin.Os.zen => {
             while (true) {}
         },
+        builtin.Os.uefi => {
+            // TODO look into using the debug info and logging helpful messages
+            std.os.abort();
+        },
         else => {
             const first_trace_addr = @ptrToInt(@returnAddress());
             std.debug.panicExtra(error_return_trace, first_trace_addr, "{}", msg);