diff options
author | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
commit | 6b31cfd20257f4d7226d5c4e95c67ed9b48ab58c (patch) | |
tree | fd7941be82dd45f113d8f0668e2c9b6a6ec3c77f /src/cmd/5c/Makefile | |
parent | 9cabb766eb4acbe2c11ad0084659710919f40c0d (diff) | |
parent | 0fdd42d52b29f44cf6cffa4c881ee8b40f9b3090 (diff) | |
download | go-6b31cfd20257f4d7226d5c4e95c67ed9b48ab58c.tar.gz |
[dev.cc] all: merge dev.power64 (7667e41f3ced) into dev.cc
This is to reduce the delta between dev.cc and dev.garbage to just garbage collector changes.
These are the files that had merge conflicts and have been edited by hand:
malloc.go
mem_linux.go
mgc.go
os1_linux.go
proc1.go
panic1.go
runtime1.go
LGTM=austin
R=austin
CC=golang-codereviews
https://codereview.appspot.com/174180043
Diffstat (limited to 'src/cmd/5c/Makefile')
-rw-r--r-- | src/cmd/5c/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/cmd/5c/Makefile b/src/cmd/5c/Makefile deleted file mode 100644 index 3f528d751..000000000 --- a/src/cmd/5c/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2012 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. - -include ../../Make.dist |