diff options
| author | Rob Pike <r@golang.org> | 2009-08-14 10:46:04 -0700 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2009-08-14 10:46:04 -0700 |
| commit | 00274a13cb76fc826f65978f3ab6fa1f90e46dab (patch) | |
| tree | a0de514e464c4c5efa9fd90c1e14d9443e9b2a06 /src/cmd/nm | |
| parent | ce1dd6cce375c65ecbdd11276e69f0e6de9d424b (diff) | |
| download | go-00274a13cb76fc826f65978f3ab6fa1f90e46dab.tar.xz | |
rename libmach_amd64 libmach
R=rsc
OCL=33273
CL=33276
Diffstat (limited to 'src/cmd/nm')
| -rw-r--r-- | src/cmd/nm/Makefile | 2 | ||||
| -rw-r--r-- | src/cmd/nm/nm.c | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/cmd/nm/Makefile b/src/cmd/nm/Makefile index 8ed55ff3fe..00d9beebfe 100644 --- a/src/cmd/nm/Makefile +++ b/src/cmd/nm/Makefile @@ -13,7 +13,7 @@ OFILES=\ nm.$O\ $(TARG): $(OFILES) - $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach_amd64 -lbio -l9 + $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9 clean: rm -f $(OFILES) $(TARG) diff --git a/src/cmd/nm/nm.c b/src/cmd/nm/nm.c index 57e6636a32..52a73d64a2 100644 --- a/src/cmd/nm/nm.c +++ b/src/cmd/nm/nm.c @@ -1,25 +1,25 @@ // Inferno utils/nm/nm.c // http://code.google.com/p/inferno-os/source/browse/utils/nm/nm.c -// -// Copyright © 1994-1999 Lucent Technologies Inc. All rights reserved. -// Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net) -// Portions Copyright © 1997-1999 Vita Nuova Limited -// Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com) -// Portions Copyright © 2004,2006 Bruce Ellis -// Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net) -// Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others -// Portions Copyright © 2009 The Go Authors. All rights reserved. -// +// +// Copyright © 1994-1999 Lucent Technologies Inc. All rights reserved. +// Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net) +// Portions Copyright © 1997-1999 Vita Nuova Limited +// Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com) +// Portions Copyright © 2004,2006 Bruce Ellis +// Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net) +// Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others +// Portions Copyright © 2009 The Go Authors. All rights reserved. +// // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal // in the Software without restriction, including without limitation the rights // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell // copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: -// +// // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -35,7 +35,7 @@ #include <libc.h> #include <ar.h> #include <bio.h> -#include <mach_amd64.h> +#include <mach.h> enum{ CHUNK = 256 /* must be power of 2 */ |