diff options
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/ar/Makefile | 2 | ||||
| -rw-r--r-- | src/cmd/ar/ar.c | 2 | ||||
| -rw-r--r-- | src/cmd/cov/Makefile | 2 | ||||
| -rw-r--r-- | src/cmd/cov/main.c | 2 | ||||
| -rw-r--r-- | src/cmd/nm/Makefile | 2 | ||||
| -rw-r--r-- | src/cmd/nm/nm.c | 26 | ||||
| -rw-r--r-- | src/cmd/prof/Makefile | 2 | ||||
| -rw-r--r-- | src/cmd/prof/main.c | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/src/cmd/ar/Makefile b/src/cmd/ar/Makefile index b6999aa37a..f0e51afdd4 100644 --- a/src/cmd/ar/Makefile +++ b/src/cmd/ar/Makefile @@ -13,7 +13,7 @@ OFILES=\ ar.$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/ar/ar.c b/src/cmd/ar/ar.c index 880f32986c..a9e16bcc00 100644 --- a/src/cmd/ar/ar.c +++ b/src/cmd/ar/ar.c @@ -39,7 +39,7 @@ #include <u.h> #include <libc.h> #include <bio.h> -#include <mach_amd64.h> +#include <mach.h> #include <ar.h> #undef select diff --git a/src/cmd/cov/Makefile b/src/cmd/cov/Makefile index fc98974731..4e02547dca 100644 --- a/src/cmd/cov/Makefile +++ b/src/cmd/cov/Makefile @@ -17,7 +17,7 @@ HFILES=\ tree.h\ $(TARG): $(OFILES) - $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach_amd64 -lregexp9 -lbio -l9 + $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lregexp9 -lbio -l9 clean: rm -f $(OFILES) $(TARG) diff --git a/src/cmd/cov/main.c b/src/cmd/cov/main.c index 073821e937..294bb149f2 100644 --- a/src/cmd/cov/main.c +++ b/src/cmd/cov/main.c @@ -15,7 +15,7 @@ #include "tree.h" #include <ureg_amd64.h> -#include <mach_amd64.h> +#include <mach.h> typedef struct Ureg Ureg; void 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 */ diff --git a/src/cmd/prof/Makefile b/src/cmd/prof/Makefile index 8d785b4aaf..193f5896cd 100644 --- a/src/cmd/prof/Makefile +++ b/src/cmd/prof/Makefile @@ -17,7 +17,7 @@ OFILES=\ # fns.h\ $(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/prof/main.c b/src/cmd/prof/main.c index 7b9213da8f..462aab9f6c 100644 --- a/src/cmd/prof/main.c +++ b/src/cmd/prof/main.c @@ -9,7 +9,7 @@ #include <ctype.h> #include <ureg_amd64.h> -#include <mach_amd64.h> +#include <mach.h> char* file = "6.out"; static Fhdr fhdr; |