From 40756181e9ed42901256426214d55da94140e0a6 Mon Sep 17 00:00:00 2001
From: Alex Brainman <alex.brainman@gmail.com>
Date: Thu, 8 Jan 2015 17:27:46 +1100
Subject: [PATCH] windows: use go generate to build zsyscall_windows.go

Also remove some empty source files while we are at it.

Change-Id: Ia3a35b274a0428196aee63ee2daacc533285d0ea
Reviewed-on: https://go-review.googlesource.com/2530
Reviewed-by: Rob Pike <r@golang.org>
---
 windows/Makefile                 | 12 ------------
 windows/mkall_windows.bat        | 15 ---------------
 windows/syscall_windows.go       |  2 ++
 windows/syscall_windows_386.go   |  5 -----
 windows/syscall_windows_amd64.go |  5 -----
 windows/zsysnum_windows_386.go   |  3 ---
 windows/zsysnum_windows_amd64.go |  3 ---
 7 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 windows/Makefile
 delete mode 100644 windows/mkall_windows.bat
 delete mode 100644 windows/syscall_windows_386.go
 delete mode 100644 windows/syscall_windows_amd64.go
 delete mode 100644 windows/zsysnum_windows_386.go
 delete mode 100644 windows/zsysnum_windows_amd64.go

diff --git a/windows/Makefile b/windows/Makefile
deleted file mode 100644
index 10ce5bd3..00000000
--- a/windows/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2014 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-all: zsyscall_windows.go
-
-TMP=/tmp/mksyscall_windows
-
-zsyscall_windows.go: syscall_windows.go security_windows.go
-	go build -o $(TMP) $(GOROOT)/src/syscall/mksyscall_windows.go
-	GOOS=windows $(TMP) $^ | gofmt > $@
-	rm $(TMP)
diff --git a/windows/mkall_windows.bat b/windows/mkall_windows.bat
deleted file mode 100644
index 0c1c13c1..00000000
--- a/windows/mkall_windows.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-:: Copyright 2013 The Go Authors. All rights reserved.
-:: Use of this source code is governed by a BSD-style
-:: license that can be found in the LICENSE file.
-@echo off
-
-if exist syscall_windows.go goto dirok
-echo mkall_windows.bat must be run from go.sys\windows directory
-goto :end
-:dirok
-
-go build -o mksyscall_windows.exe %GOROOT%\src\pkg\syscall\mksyscall_windows.go
-mksyscall_windows.exe syscall_windows.go security_windows.go |gofmt >zsyscall_windows.go
-del mksyscall_windows.exe
-
-:end
diff --git a/windows/syscall_windows.go b/windows/syscall_windows.go
index b8c4b313..0b512dfd 100644
--- a/windows/syscall_windows.go
+++ b/windows/syscall_windows.go
@@ -14,6 +14,8 @@ import (
 	"unsafe"
 )
 
+//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go syscall_windows.go security_windows.go
+
 type Handle uintptr
 
 const InvalidHandle = ^Handle(0)
diff --git a/windows/syscall_windows_386.go b/windows/syscall_windows_386.go
deleted file mode 100644
index e512a36f..00000000
--- a/windows/syscall_windows_386.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
diff --git a/windows/syscall_windows_amd64.go b/windows/syscall_windows_amd64.go
deleted file mode 100644
index e512a36f..00000000
--- a/windows/syscall_windows_amd64.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
diff --git a/windows/zsysnum_windows_386.go b/windows/zsysnum_windows_386.go
deleted file mode 100644
index c10a1181..00000000
--- a/windows/zsysnum_windows_386.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// nothing to see here
-
-package windows
diff --git a/windows/zsysnum_windows_amd64.go b/windows/zsysnum_windows_amd64.go
deleted file mode 100644
index c10a1181..00000000
--- a/windows/zsysnum_windows_amd64.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// nothing to see here
-
-package windows