Imported Upstream version 1.1~hg20130304upstream/1.1_hg20130304

4 files changed, 55 insertions, 5 deletions

diff --git a/include/libc.h b/include/libc.h
index b464cb4c6..1440209e3 100644
--- a/include/libc.h
+++ b/include/libc.h
@@ -85,16 +85,12 @@ extern	char*	p9getenv(char*);
 extern	int	p9putenv(char*, char*);
 extern	int	getfields(char*, char**, int, int, char*);
 extern	int	gettokens(char *, char **, int, char *);
-extern	char*	getuser(void);
 extern	char*	p9getwd(char*, int);
 extern	void	p9longjmp(p9jmp_buf, int);
-extern	char*	mktemp(char*);
-extern	int		opentemp(char*);
 extern	void	p9notejmp(void*, p9jmp_buf, int);
 extern	void	perror(const char*);
 extern	int	postnote(int, int, char *);
 extern	double	p9pow10(int);
-extern	char*	searchpath(char*);
 extern	char*	p9ctime(long);
 #define p9setjmp(b)	sigsetjmp((void*)(b), 1)
 
@@ -293,6 +289,18 @@ extern	char*	getgoos(void);
 extern	char*	getgoarch(void);
 extern	char*	getgoroot(void);
 extern	char*	getgoversion(void);
+extern	char*	getgoarm(void);
+extern	char*	getgo386(void);
+
+extern	void	flagcount(char*, char*, int*);
+extern	void	flagint32(char*, char*, int32*);
+extern	void	flagint64(char*, char*, int64*);
+extern	void	flagstr(char*, char*, char**);
+extern	void	flagparse(int*, char***, void (*usage)(void));
+extern	void	flagfn0(char*, char*, void(*fn)(void));
+extern	void	flagfn1(char*, char*, void(*fn)(char*));
+extern	void	flagfn2(char*, char*, void(*fn)(char*, char*));
+extern	void	flagprint(int);
 
 #ifdef _WIN32
 
@@ -366,7 +374,7 @@ extern	char*	unsharp(char*);
 /* command line */
 extern char	*argv0;
 extern void __fixargv0(void);
-#define	ARGBEGIN	for((argv0?0:(argv0=(__fixargv0(),*argv))),argv++,argc--;\
+#define	ARGBEGIN	for((void)(argv0?0:(argv0=(__fixargv0(),*argv))),argv++,argc--;\
 			    argv[0] && argv[0][0]=='-' && argv[0][1];\
 			    argc--, argv++) {\
 				char *_args, *_argt;\
diff --git a/include/plan9/amd64/u.h b/include/plan9/amd64/u.h
new file mode 100644
index 000000000..f2430b535
--- /dev/null
+++ b/include/plan9/amd64/u.h
@@ -0,0 +1,14 @@
+// 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 "/amd64/include/u.h"
+
+typedef char   int8;
+typedef uchar  uint8;
+typedef short  int16;
+typedef ushort uint16;
+typedef int    int32;
+typedef uint   uint32;
+typedef vlong  int64;
+typedef uvlong uint64;
diff --git a/include/plan9/arm/u.h b/include/plan9/arm/u.h
new file mode 100644
index 000000000..c387ae7b1
--- /dev/null
+++ b/include/plan9/arm/u.h
@@ -0,0 +1,14 @@
+// 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 "/arm/include/u.h"
+
+typedef char   int8;
+typedef uchar  uint8;
+typedef short  int16;
+typedef ushort uint16;
+typedef int    int32;
+typedef uint   uint32;
+typedef vlong  int64;
+typedef uvlong uint64;
diff --git a/include/plan9/libc.h b/include/plan9/libc.h
index d13ddbcb7..e6f9839c8 100644
--- a/include/plan9/libc.h
+++ b/include/plan9/libc.h
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#define Runemax Plan9Runemax
 #include "/sys/include/libc.h"
+#undef Runemax
 #include "/sys/include/ctype.h"
 
 enum
@@ -14,3 +16,15 @@ char*	getgoos(void);
 char*	getgoarch(void);
 char*	getgoroot(void);
 char*	getgoversion(void);
+char*	getgoarm(void);
+char*	getgo386(void);
+
+void	flagcount(char*, char*, int*);
+void	flagint32(char*, char*, int32*);
+void	flagint64(char*, char*, int64*);
+void	flagstr(char*, char*, char**);
+void	flagparse(int*, char***, void (*usage)(void));
+void	flagfn0(char*, char*, void(*fn)(void));
+void	flagfn1(char*, char*, void(*fn)(char*));
+void	flagfn2(char*, char*, void(*fn)(char*, char*));
+void	flagprint(int);