Browse Source

build: added new build files

kernel compiles and crashes

closes #37

to test use

	go get -u sevki.org/build/cmd/build
	build //sys/src/9/amd64:harvey
or

	build -v //sys/src/9/amd64:harvey

inside a editor like emacs or acme.

If you are building on OS X you should also have something like .build
file at the root of the project and add something like

	CC: gcc
	TOOLPREFIX: x86_64-elf-

Change-Id: Ib6f6156eee1936ceb5f8b0bfa64ed45589195c31
Signed-off-by: Sevki <sevki@spotify.com>
Sevki 8 years ago
parent
commit
69caa7df32
100 changed files with 733 additions and 97 deletions
  1. 2 0
      .gitignore
  2. 15 0
      BUILD
  3. 1 1
      sys/src/9/386/devether.c
  4. 1 1
      sys/src/9/386/devrtc.c
  5. 1 1
      sys/src/9/386/ether8169.c
  6. 1 1
      sys/src/9/386/etherigbe.c
  7. 1 1
      sys/src/9/386/etherm10g.c
  8. 1 1
      sys/src/9/386/i8042.c
  9. 1 1
      sys/src/9/386/sdiahci.c
  10. 1 1
      sys/src/9/386/vgavesa.c
  11. 537 0
      sys/src/9/amd64/BUILD
  12. 1 1
      sys/src/9/amd64/arch.c
  13. 1 1
      sys/src/9/amd64/cbscreen.c
  14. 1 1
      sys/src/9/amd64/cbvga.c
  15. 1 1
      sys/src/9/amd64/coreboot.c
  16. 1 1
      sys/src/9/amd64/devacpi.c
  17. 1 1
      sys/src/9/amd64/devarch.c
  18. 1 1
      sys/src/9/amd64/deviig.c
  19. 1 1
      sys/src/9/amd64/devusb.c
  20. 1 1
      sys/src/9/amd64/devvga.c
  21. 1 1
      sys/src/9/amd64/ether8139.c
  22. 1 1
      sys/src/9/amd64/ether82563.c
  23. 1 1
      sys/src/9/amd64/etherbcm.c.NO
  24. 1 1
      sys/src/9/amd64/main.c
  25. 1 1
      sys/src/9/amd64/mouse.c
  26. 1 1
      sys/src/9/amd64/pmcio.c
  27. 1 1
      sys/src/9/amd64/screen.c
  28. 1 1
      sys/src/9/amd64/sdata.c
  29. 2 2
      sys/src/9/amd64/syscall.c
  30. 1 1
      sys/src/9/amd64/trap.c
  31. 1 1
      sys/src/9/amd64/usbehcipc.c
  32. 1 1
      sys/src/9/amd64/usbohci.c
  33. 1 1
      sys/src/9/amd64/usbuhci.c
  34. 1 1
      sys/src/9/amd64/vga.c
  35. 1 1
      sys/src/9/amd64/vgax.c
  36. 82 0
      sys/src/9/boot/BUILD
  37. 1 1
      sys/src/9/ip/arp.c
  38. 1 1
      sys/src/9/ip/chandial.c
  39. 1 1
      sys/src/9/ip/devip.c
  40. 1 1
      sys/src/9/ip/esp.c
  41. 1 1
      sys/src/9/ip/ethermedium.c
  42. 1 1
      sys/src/9/ip/gre.c
  43. 1 1
      sys/src/9/ip/icmp.c
  44. 1 1
      sys/src/9/ip/icmp6.c
  45. 1 1
      sys/src/9/ip/igmp.c
  46. 1 1
      sys/src/9/ip/inferno.c
  47. 1 1
      sys/src/9/ip/ip.c
  48. 1 1
      sys/src/9/ip/ipaux.c
  49. 1 1
      sys/src/9/ip/ipifc.c
  50. 1 1
      sys/src/9/ip/ipmux.c
  51. 1 1
      sys/src/9/ip/iproute.c
  52. 1 1
      sys/src/9/ip/ipv6.c
  53. 1 1
      sys/src/9/ip/loopbackmedium.c
  54. 1 1
      sys/src/9/ip/netdevmedium.c
  55. 1 1
      sys/src/9/ip/netlog.c
  56. 1 1
      sys/src/9/ip/nullmedium.c
  57. 1 1
      sys/src/9/ip/pktmedium.c
  58. 1 1
      sys/src/9/ip/rudp.c
  59. 1 1
      sys/src/9/ip/tcp.c
  60. 1 1
      sys/src/9/ip/udp.c
  61. 1 1
      sys/src/9/port/chan.c
  62. 1 1
      sys/src/9/port/corebootscreen.c
  63. 1 1
      sys/src/9/port/cpu_buffer.c
  64. 1 1
      sys/src/9/port/dev.c
  65. 1 1
      sys/src/9/port/devcap.c
  66. 1 1
      sys/src/9/port/devcec.c
  67. 1 1
      sys/src/9/port/devcmd.c
  68. 1 1
      sys/src/9/port/devcons.c
  69. 1 1
      sys/src/9/port/devcoreboot.c
  70. 1 1
      sys/src/9/port/devdraw.c
  71. 1 1
      sys/src/9/port/devdup.c
  72. 1 1
      sys/src/9/port/devenv.c
  73. 1 1
      sys/src/9/port/devkexec.c
  74. 1 1
      sys/src/9/port/devkprof.c
  75. 1 1
      sys/src/9/port/devmnt.c
  76. 1 1
      sys/src/9/port/devmouse.c
  77. 1 1
      sys/src/9/port/devpci.c
  78. 1 1
      sys/src/9/port/devpipe.c
  79. 1 1
      sys/src/9/port/devpmc.c
  80. 1 1
      sys/src/9/port/devprobe.c
  81. 1 1
      sys/src/9/port/devproc.c
  82. 1 1
      sys/src/9/port/devregress.c
  83. 1 1
      sys/src/9/port/devroot.c
  84. 1 1
      sys/src/9/port/devsd.c
  85. 1 1
      sys/src/9/port/devsegment.c
  86. 1 1
      sys/src/9/port/devsrv.c
  87. 1 1
      sys/src/9/port/devssl.c
  88. 1 1
      sys/src/9/port/devtab.c
  89. 1 1
      sys/src/9/port/devtls.c
  90. 1 1
      sys/src/9/port/devtrace.c
  91. 1 1
      sys/src/9/port/devuart.c
  92. 1 1
      sys/src/9/port/devwd.c
  93. 1 1
      sys/src/9/port/devws.c
  94. 1 1
      sys/src/9/port/devzp.c
  95. 1 1
      sys/src/9/port/edf.c
  96. 1 1
      sys/src/9/port/elf64.c
  97. 1 1
      sys/src/9/port/ethermii.c
  98. 1 1
      sys/src/9/port/fault.c
  99. 1 1
      sys/src/9/port/hexdump.c
  100. 1 1
      sys/src/9/port/image.c

+ 2 - 0
.gitignore

@@ -14,6 +14,8 @@ amd64/lib
 
 acme/bin/amd64
 
+build_out
+
 sys/log
 
 sys/src/9/port/error.h

+ 15 - 0
BUILD

@@ -0,0 +1,15 @@
+objcopy(
+	name="harvey",
+	deps=[
+		"//sys/src/9/amd64:harvey"
+	],
+	in="elf64-x86-64",
+	out="elf32-i386",
+)
+kernel(
+	name="kernel",
+	deps=[
+		":harvey",
+		"//sys/src/9/amd64:init",
+	],
+)

+ 1 - 1
sys/src/9/386/devether.c

@@ -13,7 +13,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../port/netif.h"
 
 #include "etherif.h"

+ 1 - 1
sys/src/9/386/devrtc.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 /*
  *  real time clock and non-volatile ram

+ 1 - 1
sys/src/9/386/ether8169.c

@@ -22,7 +22,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../port/netif.h"
 
 #include "etherif.h"

+ 1 - 1
sys/src/9/386/etherigbe.c

@@ -30,7 +30,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../port/netif.h"
 
 #include "etherif.h"

+ 1 - 1
sys/src/9/386/etherm10g.c

@@ -20,7 +20,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "../port/netif.h"
 

+ 1 - 1
sys/src/9/386/i8042.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"io.h"
 

+ 1 - 1
sys/src/9/386/sdiahci.c

@@ -18,7 +18,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../port/sd.h"
 #include "ahci.h"
 

+ 1 - 1
sys/src/9/386/vgavesa.c

@@ -20,7 +20,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../../386/include/ureg.h"
 
 #define	Image	IMAGE

+ 537 - 0
sys/src/9/amd64/BUILD

@@ -0,0 +1,537 @@
+load("//sys/src/FLAGS", "LIB_COMPILER_FLAGS")
+
+CORE_SRCS = [
+    "entry.S",
+    "vsvm.c",
+    "l64v.S",
+    "l64fpu.S",
+    "cpuidamd64.S",
+    "l64acidt.S",
+    "l64idt.S",
+    "l64vsyscall.S",
+    "acore.c",
+    "apic.c",
+    "arch.c",
+    "archamd64.c",
+    "asm.c",
+    "backtrace.c",
+    "coreboot.c",
+    "ctype.c",
+    "devarch.c",
+    "fpu.c",
+    "i8254.c",
+    "i8259.c",
+    "ioapic.c",
+    "main.c",
+    "map.c",
+    "memory.c",
+    "mmu.c",
+    "mp.c",
+    "msi.c",
+    "multiboot.c",
+    "physalloc.c",
+    "pmcio.c",
+    "qmalloc.c",
+    "sipi.c",
+    "syscall.c",
+    "systab.c",
+    "tcore.c",
+    "trap.c"
+]
+
+PORT_SRCS = [
+    "//sys/src/9/port/alarm.c",
+    "//sys/src/9/port/allocb.c",
+    "//sys/src/9/port/cache.c",
+    "//sys/src/9/port/chan.c",
+    "//sys/src/9/port/cpu_buffer.c",
+    "//sys/src/9/port/dev.c",
+    "//sys/src/9/port/devcap.c",
+    "//sys/src/9/port/devcons.c",
+    "//sys/src/9/port/devcoreboot.c",
+    "//sys/src/9/port/devdraw.c",
+    "//sys/src/9/port/devdup.c",
+    "//sys/src/9/port/devenv.c",
+    "//sys/src/9/port/devkexec.c",
+    "//sys/src/9/port/devkprof.c",
+    "//sys/src/9/port/devmnt.c",
+    "//sys/src/9/port/devmouse.c",
+    "//sys/src/9/port/devpci.c",
+    "//sys/src/9/port/devpipe.c",
+    "//sys/src/9/port/devpmc.c",
+    "//sys/src/9/port/devproc.c",
+    "//sys/src/9/port/devregress.c",
+    "//sys/src/9/port/devroot.c",
+    "//sys/src/9/port/devsd.c",
+    "//sys/src/9/port/devsegment.c",
+    "//sys/src/9/port/devsrv.c",
+    "//sys/src/9/port/devssl.c",
+    "//sys/src/9/port/devtls.c",
+    "//sys/src/9/port/devtab.c",
+    "//sys/src/9/port/devtrace.c",
+    "//sys/src/9/port/devuart.c",
+    "//sys/src/9/port/devwd.c",
+    "//sys/src/9/port/devws.c",
+    "//sys/src/9/port/devzp.c",
+    "//sys/src/9/port/edf.c",
+    "//sys/src/9/port/elf64.c",
+    "//sys/src/9/port/ethermii.c",
+    "//sys/src/9/port/fault.c",
+    "//sys/src/9/port/fortuna.c",
+    "//sys/src/9/port/getput.c",
+    "//sys/src/9/port/hexdump.c",
+    "//sys/src/9/port/image.c",
+    "//sys/src/9/port/kdebug.c",
+    "//sys/src/9/port/kexec.c",
+    "//sys/src/9/port/ipchecksum.c",
+    "//sys/src/9/port/mul64fract.c",
+    "//sys/src/9/port/netif.c",
+    "//sys/src/9/port/page.c",
+    "//sys/src/9/port/pager.c",
+    "//sys/src/9/port/parse.c",
+    "//sys/src/9/port/pgrp.c",
+    "//sys/src/9/port/portclock.c",
+    "//sys/src/9/port/print.c",
+    "//sys/src/9/port/proc.c",
+    "//sys/src/9/port/ps.c",
+    "//sys/src/9/port/qio.c",
+    "//sys/src/9/port/qlock.c",
+    "//sys/src/9/port/random.c",
+    "//sys/src/9/port/rebootcmd.c",
+    "//sys/src/9/port/rmap.c",
+    "//sys/src/9/port/sdscsi.c",
+    "//sys/src/9/port/segment.c",
+    "//sys/src/9/port/sysauth.c",
+    "//sys/src/9/port/syscallfmt.c",
+    "//sys/src/9/port/sysfile.c",
+    "//sys/src/9/port/sysproc.c",
+    "//sys/src/9/port/sysseg.c",
+    "//sys/src/9/port/syssem.c",
+    "//sys/src/9/port/syszio.c",
+    "//sys/src/9/port/taslock.c",
+    "//sys/src/9/port/tod.c",
+    "//sys/src/9/port/usbehci.c",
+    "//sys/src/9/port/watermarks.c",
+]
+
+IP_SRCS = [
+    "//sys/src/9/ip/arp.c",
+    "//sys/src/9/ip/chandial.c",
+    "//sys/src/9/ip/devip.c",
+    "//sys/src/9/ip/ethermedium.c",
+    "//sys/src/9/ip/gre.c",
+    "//sys/src/9/ip/icmp6.c",
+    "//sys/src/9/ip/icmp.c",
+    "//sys/src/9/ip/inferno.c",
+    "//sys/src/9/ip/ipaux.c",
+    "//sys/src/9/ip/ip.c",
+    "//sys/src/9/ip/ipifc.c",
+    "//sys/src/9/ip/ipmux.c",
+    "//sys/src/9/ip/iproute.c",
+    "//sys/src/9/ip/ipv6.c",
+    "//sys/src/9/ip/loopbackmedium.c",
+    "//sys/src/9/ip/netdevmedium.c",
+    "//sys/src/9/ip/netlog.c",
+    "//sys/src/9/ip/nullmedium.c",
+    "//sys/src/9/ip/pktmedium.c",
+    "//sys/src/9/ip/ptclbsum.c",
+    "//sys/src/9/ip/rudp.c",
+    "//sys/src/9/ip/tcp.c",
+    "//sys/src/9/ip/udp.c"
+]
+AMD64_SRCS = [
+    "amd64cpu.c",
+    "cga.c",
+    "devacpi.c",
+    "devusb.c",
+    "devvga.c",
+    "ether8139.c",
+    "ether82563.c",
+    "mouse.c",
+    "screen.c",
+    "sdata.c",
+    "usbehcipc.c",
+    "usbohci.c",
+    "usbuhci.c",
+    "vga.c",
+    "vgax.c",
+]
+# don't want to start with a number
+I386_SRCS = [
+    "//sys/src/9/386/devether.c",
+    "//sys/src/9/386/devrtc.c",
+    "//sys/src/9/386/ether8169.c",
+    "//sys/src/9/386/ether82557.c",
+    "//sys/src/9/386/etherigbe.c",
+    "//sys/src/9/386/etherm10g.c",
+    "//sys/src/9/386/i8042.c",
+    "//sys/src/9/386/pci.c",
+    "//sys/src/9/386/sdiahci.c",
+    "//sys/src/9/386/uarti8250.c",
+    "//sys/src/9/386/uartpci.c",
+    "//sys/src/9/386/vgavesa.c"
+]
+
+AMD64SRCS = AMD64_SRCS + CORE_SRCS + I386_SRCS + IP_SRCS + PORT_SRCS
+
+strip(
+    name="bind",
+    deps=[
+        "//sys/src/cmd:bind",
+    ],
+)
+
+strip(
+    name="prep",
+    deps=[
+        "//sys/src/cmd/disk/prep:prep",
+    ],
+)
+strip(
+    name="boot",
+    deps=[
+        "//sys/src/9/boot:bootamd64cpu",
+    ],
+)
+strip(
+    name="cat",
+    deps=[
+        "//sys/src/cmd:cat",
+    ],
+)
+strip(
+    name="date",
+    deps=[
+        "//sys/src/cmd:date",
+    ],
+)
+strip(
+    name="echo",
+    deps=[
+        "//sys/src/cmd:echo",
+    ],
+)
+strip(
+    name="factotum",
+    deps=[
+        "//sys/src/cmd/auth/factotum:factotum",
+    ],
+)
+strip(
+    name="fdisk",
+    deps=[
+        "//sys/src/cmd/disk/prep:fdisk",
+    ],
+)
+strip(
+    name="ipconfig",
+    deps=[
+        "//sys/src/cmd/ip/ipconfig:ipconfig",
+    ],
+)
+strip(
+    name="screenconsole",
+    deps=[
+        "//sys/src/cmd/aux/console:screenconsole",
+    ],
+)
+strip(
+    name="ls",
+    deps=[
+        "//sys/src/cmd:ls",
+    ],
+)
+strip(
+    name="mount",
+    deps=[
+        "//sys/src/cmd:mount",
+    ],
+)
+strip(
+    name="rc",
+    deps=[
+        "//sys/src/cmd/rc:rc",
+    ],
+)
+strip(
+    name="ps",
+    deps=[
+        "//sys/src/cmd:ps",
+    ],
+)
+strip(
+    name="ed",
+    deps=[
+        "//sys/src/cmd:ed",
+    ],
+)
+strip(
+    name="realemu",
+    deps=[
+        "//sys/src/cmd/aux/realemu:realemu",
+    ],
+)
+strip(
+    name="vga",
+    deps=[
+        "//sys/src/cmd/aux/vga:vga",
+    ],
+)
+strip(
+    name="srv",
+    deps=[
+        "//sys/src/cmd:srv",
+    ],
+)
+
+strip(
+    name="usbd",
+    deps=[
+        "//sys/src/cmd/usb/usbd:usbd",
+    ],
+)
+
+strip(
+    name="venti",
+    deps=[
+        "//sys/src/cmd/venti/srv:venti",
+    ],
+)
+
+strip(
+    name="fossil",
+    deps=[
+        "//sys/src/cmd/fossil:fossil",
+    ],
+)
+
+mk_sys(
+    name="error",
+    mode="error.h",
+    arch="amd64",
+    sysconf="//sys/src/sysconf.json",
+)
+
+mk_sys(
+    name="sys",
+    mode="sys.h",
+    arch="amd64",
+    sysconf="//sys/src/sysconf.json",
+)
+
+mk_sys(
+    name="systab",
+    mode="systab.c",
+    arch="amd64",
+    sysconf="//sys/src/sysconf.json",
+)
+
+mk_sys(
+    name="errstr",
+    mode="errstr.h",
+    sysconf="//sys/src/sysconf.json",
+)
+
+
+cc_binary(
+    name="harvey",
+    copts=[
+        "-c",
+        "-mcmodel=kernel",
+        "-O0",
+        "-static",
+        "-fplan9-extensions",
+        "-mno-red-zone",
+        "-ffreestanding",
+        "-fno-builtin",
+        "-DKERNDATE=1433623937",
+        "-g",
+        "-fvar-tracking",
+        "-fvar-tracking-assignments",
+        "-Wall",
+        "-W",
+        "-Wno-sign-compare",
+        "-Wno-missing-field-initializers",
+        "-Wno-unused-parameter",
+        "-Wno-missing-braces",
+        "-Wno-parentheses",
+        "-Wno-unknown-pragmas",
+        "-Werror",
+        "-fasm",
+    ],
+    srcs=AMD64SRCS,
+    includes=[
+        "//sys/include",
+        "//amd64/include",
+        "//sys/src/9/amd64",
+    ],
+    deps=[
+        ":amd64cpu",
+        ":error",
+        ":errstr",
+        ":systab",
+        ":sys",
+        ":inith",
+        "//sys/src/libmemlayer:libkmemlayer",
+        "//sys/src/libmemdraw:libkmemdraw",
+        "//sys/src/libdraw:libkdraw",
+        "//sys/src/libc:libkc",
+        "//sys/src/libip:libkip",
+        "//sys/src/libsec:libksec",
+    ],
+    ld="kernel.ld",
+    linkopts=[
+        "-z",
+        "max-page-size=0x1000",
+        "-nostdlib",
+        "-g",
+        "-T",
+    ]
+)
+
+KERNEL_DEPS = [
+	":bind",
+	":boot",
+	":cat",
+	":date",
+	":echo",
+	":factotum",
+	":fdisk",
+	":fossil",
+	":ipconfig", 
+	":ls",
+	":mount",
+# nvram FILE ADDED
+	":prep",
+	":rc",
+	":ps",
+	":ed",
+# rcmain FILE ADDED
+	":screenconsole",
+	":realemu",
+	":vga",
+	":srv",
+# startdisk FILE ADDED
+	":usbd",
+	":venti",
+]
+
+config(
+    name="amd64cpu",
+    deps=KERNEL_DEPS,
+    code=[
+        "int cpuserver = 1;",
+        "uint32_t kerndate = 1;",
+    ],
+    ramfiles=[
+	"//util/nvram",
+	"//rc/lib/rcmain",
+	"//sys/src/9/amd64/startdisk",
+    ],
+    dev=[
+        "acpi",
+        "arch",
+        "cap",
+        "cons",
+        "coreboot",
+        "draw",
+        "dup",
+        "env",
+        "ether",
+        "ip",
+        "kprof",
+        "mnt",
+        "mouse",
+        "pci",
+        "pipe",
+        "pmc",
+        "proc",
+        "regress",
+        "root",
+        "rtc",
+        "sd",
+        "segment",
+        "srv",
+        "ssl",
+        "tls",
+        "uart",
+        "ws",
+        "usb",
+        "vga",
+        "zp",
+    ],
+    ip=[
+        "tcp",
+        "udp",
+        "ipifc",
+        "icmp",
+        "icmp6",
+        "gre",
+    ],
+    link=[
+        "ether8169",
+        "ether82557",
+        "ether82563",
+        "etherigbe",
+        "ether8139",
+        "ethermedium",
+        "loopbackmedium",
+        "netdevmedium",
+        "usbuhci",
+        "usbohci",
+        "usbehci",
+    ],
+    sd=[
+        "sdiahci",
+    ],
+    uart=[
+        "i8250",
+        "pci",
+    ],
+    vga=[
+        "vgavesa",
+    ],
+)
+
+elf_to_c(
+    name="inith",
+    deps=[
+        ":init",
+    ],
+    elf="bin/init",
+)
+
+cc_binary(
+    name="init",
+    copts=[
+        "-c",
+        "-g",
+        "-Wall",
+        "-Wno-missing-braces",
+        "-Wno-parentheses",
+        "-Wno-unknown-pragmas",
+        "-O0",
+        "-static",
+        "-fplan9-extensions",
+        "-mno-red-zone",
+        "-ffreestanding",
+        "-fno-builtin",
+        "-mcmodel=small",
+    ],
+    deps=[
+        "//sys/src/libc:libc"
+    ],
+    includes=[
+        "//sys/include",
+        "//amd64/include",
+    ],
+    linkopts=[
+        "-e_main",
+        "-static",
+        "-Ttext=0x200020",
+    ],
+    srcs=[
+        "init9.c",
+        "//sys/src/9/port/initcode.c",
+    ]
+)

+ 1 - 1
sys/src/9/amd64/arch.c

@@ -18,7 +18,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 #include "ureg.h"
 
 /* the rules are different for different compilers. We need to define up. */

+ 1 - 1
sys/src/9/amd64/cbscreen.c

@@ -14,7 +14,7 @@
 #include "fns.h"
 #include "io.h"
 #include "ureg.h"
-#include "../port/error.h"
+#include <error.h>
 
 #define	Image	IMAGE
 #include <draw.h>

+ 1 - 1
sys/src/9/amd64/cbvga.c

@@ -13,7 +13,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 
 #define	Image	IMAGE
 #include <draw.h>

+ 1 - 1
sys/src/9/amd64/coreboot.c

@@ -33,7 +33,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 #include "coreboot.h"
 
 /* this implements the architecture-dependent call needed for port/devcoreboot.c */

+ 1 - 1
sys/src/9/amd64/devacpi.c

@@ -13,7 +13,7 @@
 #include	"dat.h"
 #include	"fns.h"
 #include	"io.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include "mp.h"
 #include "acpi.h"
 

+ 1 - 1
sys/src/9/amd64/devarch.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ureg.h"
 

+ 1 - 1
sys/src/9/amd64/deviig.c

@@ -16,7 +16,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 
 #define	Image	IMAGE
 #include <draw.h>

+ 1 - 1
sys/src/9/amd64/devusb.c

@@ -53,7 +53,7 @@
 #include	"dat.h"
 #include	"fns.h"
 #include	"io.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"../port/usb.h"
 
 typedef struct Hcitype Hcitype;

+ 1 - 1
sys/src/9/amd64/devvga.c

@@ -16,7 +16,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 
 #define	Image	IMAGE
 #include <draw.h>

+ 1 - 1
sys/src/9/amd64/ether8139.c

@@ -18,7 +18,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../port/netif.h"
 
 #include "etherif.h"

+ 1 - 1
sys/src/9/amd64/ether82563.c

@@ -16,7 +16,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../port/netif.h"
 #include "etherif.h"
 

+ 1 - 1
sys/src/9/amd64/etherbcm.c.NO

@@ -21,7 +21,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../port/netif.h"
 
 #include "etherif.h"

+ 1 - 1
sys/src/9/amd64/main.c

@@ -13,7 +13,7 @@
 #include "dat.h"
 #include "fns.h"
 
-#include "init.h"
+#include <init.h>
 #include "apic.h"
 #include "io.h"
 #include "amd64.h"

+ 1 - 1
sys/src/9/amd64/mouse.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 #include "io.h"
 
 #define	Image	IMAGE

+ 1 - 1
sys/src/9/amd64/pmcio.c

@@ -16,7 +16,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include <error.h>
 #include	"amd64.h"
 #include	"../port/pmc.h"
 

+ 1 - 1
sys/src/9/amd64/screen.c

@@ -14,7 +14,7 @@
 #include "fns.h"
 #include "io.h"
 #include "ureg.h"
-#include "../port/error.h"
+#include <error.h>
 
 #define	Image	IMAGE
 #include <draw.h>

+ 1 - 1
sys/src/9/amd64/sdata.c

@@ -14,7 +14,7 @@
 #include "fns.h"
 #include "io.h"
 #include "ureg.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "../port/sd.h"
 

+ 2 - 2
sys/src/9/amd64/syscall.c

@@ -13,9 +13,9 @@
 #include "dat.h"
 #include "fns.h"
 
-#include "../port/error.h"
+#include <error.h>
 
-#include "../../libc/9syscall/sys.h"
+#include <sys.h>
 
 #include <tos.h>
 

+ 1 - 1
sys/src/9/amd64/trap.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include <error.h>
 
 #include	<tos.h>
 #include	"ureg.h"

+ 1 - 1
sys/src/9/amd64/usbehcipc.c

@@ -19,7 +19,7 @@
 #include	"dat.h"
 #include	"fns.h"
 #include	"io.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"../port/usb.h"
 #include	"../port/portusbehci.h"
 #include	"usbehci.h"

+ 1 - 1
sys/src/9/amd64/usbohci.c

@@ -25,7 +25,7 @@
 #include	"dat.h"
 #include	"fns.h"
 #include	"io.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"../port/usb.h"
 

+ 1 - 1
sys/src/9/amd64/usbuhci.c

@@ -23,7 +23,7 @@
 #include	"dat.h"
 #include	"fns.h"
 #include	"io.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"../port/usb.h"
 
 typedef struct Ctlio Ctlio;

+ 1 - 1
sys/src/9/amd64/vga.c

@@ -13,7 +13,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 
 #define	Image	IMAGE
 #include <draw.h>

+ 1 - 1
sys/src/9/amd64/vgax.c

@@ -13,7 +13,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 
 #define	Image	IMAGE
 #include <draw.h>

+ 82 - 0
sys/src/9/boot/BUILD

@@ -0,0 +1,82 @@
+load("//sys/src/FLAGS", "LIB_COMPILER_FLAGS")
+
+data_to_c(
+    name="amd64cpu",
+    bin="bin/bootamd64cpu",
+    prefix="ramfs_bootamd64cpu_",
+    deps=[
+        ":bootamd64cpu"
+    ]
+)
+
+cc_library(
+    name="libboot",
+    copts=[
+        "-g",
+        "-Wall",
+        "-Wno-missing-braces",
+        "-Wno-parentheses",
+        "-Wno-unknown-pragmas",
+        "-O0",
+        "-static",
+        "-fplan9-extensions",
+        "-mno-red-zone",
+        "-ffreestanding",
+        "-fno-builtin",
+        "-mcmodel=small"
+    ],
+    includes=[
+        "//sys/include",
+        "//sys/src/9/boot",
+        "//amd64/include",
+    ],
+    deps=[
+        ":bootamd64cpuc",
+    ],
+    srcs=[
+        "aux.c",
+        "bootauth.c",
+        "boot.c",
+        "bootcache.c",
+        "bootip.c",
+        "bootamd64cpu.c",
+        "bootrc.c",
+        "embed.c",
+        "local.c",
+        "paq.c",
+        "sac.c",
+        "settime.c"
+    ]
+)
+
+cc_binary(
+    name="bootamd64cpu",
+    copts=LIB_COMPILER_FLAGS,
+    includes=[
+        "//sys/include",
+        "//sys/src/9/boot",
+        "//amd64/include",
+    ],
+    srcs=[
+        "printstub.c",
+        "bootamd64cpu.c"
+    ],
+    deps=[
+        ":libboot",
+        ":bootamd64cpuc",
+        "//sys/src/libip:libip",
+        "//sys/src/libauth:libauth",
+        "//sys/src/libc:libc"
+    ],
+    linkopts=[
+        "-e_main",
+        "-static"
+    ]
+)
+
+mk_sys(
+    name="bootamd64cpuc",
+    mode="bootamd64cpu.c",
+    arch="amd64",
+    sysconf="//sys/src/sysconf.json",
+)

+ 1 - 1
sys/src/9/ip/arp.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 #include "ipv6.h"

+ 1 - 1
sys/src/9/ip/chandial.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"../ip/ip.h"
 
 typedef struct DS DS;

+ 1 - 1
sys/src/9/ip/devip.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"../ip/ip.h"
 
 enum

+ 1 - 1
sys/src/9/ip/esp.c

@@ -20,7 +20,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"ip.h"
 #include	"ipv6.h"

+ 1 - 1
sys/src/9/ip/ethermedium.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "../port/netif.h"
 #include "ip.h"

+ 1 - 1
sys/src/9/ip/gre.c

@@ -15,7 +15,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 

+ 1 - 1
sys/src/9/ip/icmp.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 

+ 1 - 1
sys/src/9/ip/icmp6.c

@@ -15,7 +15,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 #include "ip.h"
 #include "ipv6.h"
 

+ 1 - 1
sys/src/9/ip/igmp.c

@@ -16,7 +16,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 

+ 1 - 1
sys/src/9/ip/inferno.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 /*
  *  some hacks for commonality twixt inferno and plan9

+ 1 - 1
sys/src/9/ip/ip.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"ip.h"
 

+ 1 - 1
sys/src/9/ip/ipaux.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"ip.h"
 #include	"ipv6.h"
 

+ 1 - 1
sys/src/9/ip/ipifc.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 #include "ipv6.h"

+ 1 - 1
sys/src/9/ip/ipmux.c

@@ -15,7 +15,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 #include "ipv6.h"

+ 1 - 1
sys/src/9/ip/iproute.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"ip.h"
 

+ 1 - 1
sys/src/9/ip/ipv6.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"ip.h"
 #include	"ipv6.h"

+ 1 - 1
sys/src/9/ip/loopbackmedium.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 

+ 1 - 1
sys/src/9/ip/netdevmedium.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 

+ 1 - 1
sys/src/9/ip/netlog.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"../ip/ip.h"
 
 enum {

+ 1 - 1
sys/src/9/ip/nullmedium.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 

+ 1 - 1
sys/src/9/ip/pktmedium.c

@@ -12,7 +12,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ip.h"
 

+ 1 - 1
sys/src/9/ip/rudp.c

@@ -17,7 +17,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"ip.h"
 

+ 1 - 1
sys/src/9/ip/tcp.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"ip.h"
 

+ 1 - 1
sys/src/9/ip/udp.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"ip.h"
 #include	"ipv6.h"

+ 1 - 1
sys/src/9/port/chan.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 enum
 {

+ 1 - 1
sys/src/9/port/corebootscreen.c

@@ -19,7 +19,7 @@
 #include "fns.h"
 #include "io.h"
 #include "ureg.h"
-#include "../port/error.h"
+#include <error.h>
 
 #define	Image	IMAGE
 #include <draw.h>

+ 1 - 1
sys/src/9/port/cpu_buffer.c

@@ -23,7 +23,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include        "cpu_buffer.h"
 #include <oprofile.h>
 

+ 1 - 1
sys/src/9/port/dev.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 extern uint32_t	kerndate;
 

+ 1 - 1
sys/src/9/port/devcap.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	<libsec.h>
 

+ 1 - 1
sys/src/9/port/devcec.c

@@ -18,7 +18,7 @@
 #include "fns.h"
 #include "io.h"
 #include "ureg.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../port/netif.h"
 
 extern Dev cecdevtab;

+ 1 - 1
sys/src/9/port/devcmd.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"kexec.h"
 
 enum

+ 1 - 1
sys/src/9/port/devcons.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	<authsrv.h>
 

+ 1 - 1
sys/src/9/port/devcoreboot.c

@@ -32,7 +32,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include        "coreboot.h"
 /*
  * Some of this is x86 specific, and the rest of it is generic. Right now,

+ 1 - 1
sys/src/9/port/devdraw.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #define	Image	IMAGE
 #include	<draw.h>

+ 1 - 1
sys/src/9/port/devdup.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 /* Qid is (2*fd + (file is ctl))+1 */
 

+ 1 - 1
sys/src/9/port/devenv.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 enum
 {

+ 1 - 1
sys/src/9/port/devkexec.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"kexec.h"
 
 enum

+ 1 - 1
sys/src/9/port/devkprof.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include        "ureg.h"
 #include        "../port/portfns.h"
 

+ 1 - 1
sys/src/9/port/devmnt.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 /*
  * References are managed as follows:

+ 1 - 1
sys/src/9/port/devmouse.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #define	Image	IMAGE
 #include	<draw.h>

+ 1 - 1
sys/src/9/port/devpci.c

@@ -13,7 +13,7 @@
 #include	"dat.h"
 #include	"fns.h"
 #include	"io.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 enum {
 	Qtopdir = 0,

+ 1 - 1
sys/src/9/port/devpipe.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 typedef struct Pipe	Pipe;
 struct Pipe

+ 1 - 1
sys/src/9/port/devpmc.c

@@ -16,7 +16,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"amd64.h"
 #include	"pmc.h"
 

+ 1 - 1
sys/src/9/port/devprobe.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"probe.h"
 

+ 1 - 1
sys/src/9/port/devproc.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"../port/edf.h"
 #include	"tos.h"

+ 1 - 1
sys/src/9/port/devregress.c

@@ -3,7 +3,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "ureg.h"
 

+ 1 - 1
sys/src/9/port/devroot.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 enum
 {

+ 1 - 1
sys/src/9/port/devsd.c

@@ -17,7 +17,7 @@
 #include "fns.h"
 #include "io.h"
 #include "ureg.h"
-#include "../port/error.h"
+#include <error.h>
 
 #include "../port/sd.h"
 

+ 1 - 1
sys/src/9/port/devsegment.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 enum
 {

+ 1 - 1
sys/src/9/port/devsrv.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 
 typedef struct Srv Srv;

+ 1 - 1
sys/src/9/port/devssl.c

@@ -15,7 +15,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	<libsec.h>
 

+ 1 - 1
sys/src/9/port/devtab.c

@@ -15,7 +15,7 @@
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
-#include "../port/error.h"
+#include <error.h>
 
 extern Dev* devtab[];
 

+ 1 - 1
sys/src/9/port/devtls.c

@@ -15,7 +15,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	<libsec.h>
 

+ 1 - 1
sys/src/9/port/devtrace.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"netif.h"
 
 #pragma profile 0

+ 1 - 1
sys/src/9/port/devuart.c

@@ -13,7 +13,7 @@
 #include	"dat.h"
 #include	"fns.h"
 #include	"io.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 enum {
 	Qdir		= 0,

+ 1 - 1
sys/src/9/port/devwd.c

@@ -13,7 +13,7 @@
 #include	"dat.h"
 #include	"fns.h"
 #include	"io.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 enum {
 	Qdir,

+ 1 - 1
sys/src/9/port/devws.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 
 /*

+ 1 - 1
sys/src/9/port/devzp.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 enum
 {

+ 1 - 1
sys/src/9/port/edf.c

@@ -13,7 +13,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #include	"../port/edf.h"
 #include	<trace.h>

+ 1 - 1
sys/src/9/port/elf64.c

@@ -4,7 +4,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 #include	"getput.h"
 
 typedef struct Elf64_Ehdr Elf64_Ehdr;

+ 1 - 1
sys/src/9/port/ethermii.c

@@ -13,7 +13,7 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
-#include "../port/error.h"
+#include <error.h>
 #include "../port/netif.h"
 
 #include "etherif.h"

+ 1 - 1
sys/src/9/port/fault.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #undef DBG
 #define DBG if(0)print

+ 1 - 1
sys/src/9/port/hexdump.c

@@ -25,7 +25,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 static int isprint(int c)
 {

+ 1 - 1
sys/src/9/port/image.c

@@ -12,7 +12,7 @@
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
-#include	"../port/error.h"
+#include	<error.h>
 
 #define NFREECHAN	64
 #define IHASHSIZE	64

Some files were not shown because too many files changed in this diff