gc: shuffle #includes

#include "go.h" (or "gg.h")

becomes

#include <u.h>
#include <libc.h>
#include "go.h"

so that go.y can #include <stdio.h>
after <u.h> but before "go.h".
This is necessary on Plan 9.

R=ken2
CC=golang-dev
https://golang.org/cl/4971041

src/cmd/5g/cgen.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 /*

src/cmd/5g/cgen64.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 /*

src/cmd/5g/galign.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 int	thechar	= '5';

src/cmd/5g/gg.h

@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#include <u.h>
-#include <libc.h>
-
 #ifndef	EXTERN
 #define	EXTERN	extern
 #endif

src/cmd/5g/ggen.c

@@ -4,6 +4,8 @@
 
 #undef	EXTERN
 #define	EXTERN
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 #include "opt.h"
 

src/cmd/5g/gobj.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 void

src/cmd/5g/gsubr.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 // TODO(kaib): Can make this bigger if we move

src/cmd/5g/list.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 // TODO(kaib): make 5g/list.c congruent with 5l/list.c

src/cmd/5g/peep.c

@@ -29,6 +29,8 @@
 // THE SOFTWARE.
 
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 #include "opt.h"
 

src/cmd/5g/reg.c

@@ -29,6 +29,8 @@
 // THE SOFTWARE.
 
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 #include "opt.h"
 

src/cmd/6g/cgen.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 /*

src/cmd/6g/galign.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 int	thechar	= '6';

src/cmd/6g/gg.h

@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#include <u.h>
-#include <libc.h>
-
 #ifndef	EXTERN
 #define	EXTERN	extern
 #endif

src/cmd/6g/ggen.c

@@ -4,6 +4,8 @@
 
 #undef	EXTERN
 #define	EXTERN
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 #include "opt.h"
 

src/cmd/6g/gobj.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 void

src/cmd/6g/gsubr.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 // TODO(rsc): Can make this bigger if we move

src/cmd/6g/list.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 static	int	sconsize;

src/cmd/6g/peep.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 #include "opt.h"
 

src/cmd/6g/reg.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 #include "opt.h"
 

src/cmd/8g/cgen.c

@@ -5,6 +5,8 @@
 // TODO(rsc):
 //	assume CLD?
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 void

src/cmd/8g/cgen64.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 /*

src/cmd/8g/galign.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 int	thechar	= '8';

src/cmd/8g/gg.h

@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#include <u.h>
-#include <libc.h>
-
 #ifndef	EXTERN
 #define	EXTERN	extern
 #endif

src/cmd/8g/ggen.c

@@ -4,6 +4,8 @@
 
 #undef	EXTERN
 #define	EXTERN
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 #include "opt.h"
 

src/cmd/8g/gobj.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 void

src/cmd/8g/gsubr.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 // TODO(rsc): Can make this bigger if we move

src/cmd/8g/list.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 static	int	sconsize;

src/cmd/8g/peep.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 #include "opt.h"
 

src/cmd/8g/reg.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 #include "opt.h"
 

src/cmd/gc/align.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 /*

src/cmd/gc/bits.c

@@ -28,6 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 /*

src/cmd/gc/closure.c

@@ -6,6 +6,8 @@
  * function literals aka closures
  */
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 void

src/cmd/gc/const.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 #define	TUP(x,y)	(((x)<<16)|(y))
 

src/cmd/gc/cplx.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "gg.h"
 
 static	void	subnode(Node *nr, Node *ni, Node *nc);

src/cmd/gc/dcl.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 #include	"y.tab.h"
 

src/cmd/gc/esc.c

@@ -29,6 +29,8 @@
 // unsafe with -m, more detailed analysis output with -mm
 //
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 static void escfunc(Node *func);

src/cmd/gc/export.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 #include	"y.tab.h"
 

src/cmd/gc/gen.c

@@ -7,6 +7,8 @@
  * mainly statements and control flow.
  */
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 static void	cgen_dcl(Node *n);

src/cmd/gc/go.h

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#include	<u.h>
-#include	<libc.h>
 #include	<bio.h>
 
 #undef OAPPEND

src/cmd/gc/go.y

@@ -18,7 +18,9 @@
  */
 
 %{
+#include <u.h>
 #include <stdio.h>	/* if we don't, bison will, and go.h re-#defines getc */
+#include <libc.h>
 #include "go.h"
 
 static void fixlbrace(int);

src/cmd/gc/init.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 /*

src/cmd/gc/lex.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 #include	"y.tab.h"
 #include	<ar.h>

src/cmd/gc/md5.c

@@ -5,6 +5,8 @@
 // 64-bit MD5 (does full MD5 but returns 64 bits only).
 // Translation of ../../pkg/crypto/md5/md5*.go.
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 #include "md5.h"
 

src/cmd/gc/mparith1.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 
 /// uses arithmetic

src/cmd/gc/mparith2.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 
 //

src/cmd/gc/mparith3.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 
 /*

src/cmd/gc/obj.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 /*

src/cmd/gc/pgen.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"gg.h"
 #include	"opt.h"
 

src/cmd/gc/print.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 enum

src/cmd/gc/range.c

@@ -6,6 +6,8 @@
  * range
  */
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 void

src/cmd/gc/reflect.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 /*

src/cmd/gc/select.c

@@ -6,6 +6,8 @@
  * select
  */
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 void

src/cmd/gc/sinit.c

@@ -6,6 +6,8 @@
  * static initialization
  */
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 
 static NodeList *initlist;

src/cmd/gc/subr.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 #include	"md5.h"
 #include	"y.tab.h"

src/cmd/gc/swt.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 
 enum

src/cmd/gc/typecheck.c

@@ -10,6 +10,8 @@
  * rewrites n->op to be more specific in some cases.
  */
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 static void	implicitstar(Node**);

src/cmd/gc/unsafe.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <u.h>
+#include <libc.h>
 #include "go.h"
 
 /*

src/cmd/gc/walk.c

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include	<u.h>
+#include	<libc.h>
 #include	"go.h"
 
 static	Node*	walkprint(Node*, NodeList**, int);