From 8d7722ede284af5da0f4757141e261cdc465db47 Mon Sep 17 00:00:00 2001 From: Sameer Ajmani Date: Mon, 13 Feb 2017 14:59:45 -0500 Subject: [PATCH] cmd/go: add "syscall" to the set of packages that run extFiles++ This eliminates the need for syscall/asm.s, which is now empty. Change-Id: Ied060195e03e9653251f54ea8ef6572444b37fdf Reviewed-on: https://go-review.googlesource.com/36844 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/cmd/go/internal/work/build.go | 2 +- src/syscall/asm.s | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 src/syscall/asm.s diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go index 463206354b..e02b5f9025 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go @@ -2189,7 +2189,7 @@ func (gcToolchain) gc(b *Builder, p *load.Package, archive, obj string, asmhdr b extFiles := len(p.CgoFiles) + len(p.CFiles) + len(p.CXXFiles) + len(p.MFiles) + len(p.FFiles) + len(p.SFiles) + len(p.SysoFiles) + len(p.SwigFiles) + len(p.SwigCXXFiles) if p.Standard { switch p.ImportPath { - case "bytes", "internal/poll", "net", "os", "runtime/pprof", "sync", "time": + case "bytes", "internal/poll", "net", "os", "runtime/pprof", "sync", "syscall", "time": extFiles++ } } diff --git a/src/syscall/asm.s b/src/syscall/asm.s deleted file mode 100644 index c3bc40a594..0000000000 --- a/src/syscall/asm.s +++ /dev/null @@ -1,7 +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. - -// Dummy asm file to keep Windows building. -// TODO(sameer): delete this after updating go tool -// per Ian's comment in golang.org/cl/36716 -- 2.48.1