build: avoid redundant bss declarations

Some compilers care, sadly.

R=iant, ken
CC=golang-dev
https://golang.org/cl/4931042

diff --git a/src/Make.inc b/src/Make.inc
index 7e815c0103c7a92681bb98e5ab363e0aedd2b2a7..c770b7632780b3c90e6195216b60ce25bdebdb32 100644 (file)
--- a/src/Make.inc
+++ b/src/Make.inc
@@ -118,7 +118,10 @@ HOST_AR?=ar
 HOST_EXTRA_CFLAGS?=-ggdb -O2
 HOST_EXTRA_LDFLAGS?=
 
-HOST_CFLAGS=-I"$(GOROOT)/include" $(HOST_EXTRA_CFLAGS)
+# The -fno-common here is not necessary, but some compilers
+# on OS X seem to set it by default.  Setting it here keeps the build
+# working in that non-standard context.
+HOST_CFLAGS=-fno-common -I"$(GOROOT)/include" $(HOST_EXTRA_CFLAGS)
 HOST_LDFLAGS=$(HOST_EXTRA_LDFLAGS)
 PWD=$(shell pwd)
 

diff --git a/src/cmd/5c/gc.h b/src/cmd/5c/gc.h
index ff6d51916aa1fd8135cf9d53299eac12845e6db2..5349114f8f6c7a48c05746a51f9940255a7a58dd 100644 (file)
--- a/src/cmd/5c/gc.h
+++ b/src/cmd/5c/gc.h
@@ -181,7 +181,7 @@ EXTERN      int32   maxargsafe;
 EXTERN int     mnstring;
 EXTERN Multab  multab[20];
 EXTERN int     retok;
-EXTERN int     hintabsize;
+extern int     hintabsize;
 EXTERN Node*   nodrat;
 EXTERN Node*   nodret;
 EXTERN Node*   nodsafe;

diff --git a/src/cmd/5g/gg.h b/src/cmd/5g/gg.h
index ce4558e21b2945c5f8959a6a4a6529467c9fa6d4..b4667a3f6ab39ea7cc34e02c451dce095d5f88fd 100644 (file)
--- a/src/cmd/5g/gg.h
+++ b/src/cmd/5g/gg.h
@@ -5,13 +5,13 @@
 #include <u.h>
 #include <libc.h>
 
-#include "../gc/go.h"
-#include "../5l/5.out.h"
-
 #ifndef        EXTERN
-#define EXTERN extern
+#define        EXTERN  extern
 #endif
 
+#include "../gc/go.h"
+#include "../5l/5.out.h"
+
 typedef        struct  Addr    Addr;
 
 struct Addr
@@ -51,22 +51,19 @@ struct      Prog
 #define REGALLOC_F0 (REGALLOC_RMAX+1)
 #define REGALLOC_FMAX (REGALLOC_F0 + FREGEXT)
 
-EXTERN Biobuf* bout;
 EXTERN int32   dynloc;
 EXTERN uchar   reg[REGALLOC_FMAX+1];
 EXTERN int32   pcloc;          // instruction counter
 EXTERN Strlit  emptystring;
 extern char*   anames[];
-EXTERN Hist*   hist;
 EXTERN Prog    zprog;
-EXTERN Node*   curfn;
 EXTERN Node*   newproc;
 EXTERN Node*   deferproc;
 EXTERN Node*   deferreturn;
 EXTERN Node*   panicindex;
 EXTERN Node*   panicslice;
 EXTERN Node*   throwreturn;
-EXTERN long    unmappedzero;
+extern long    unmappedzero;
 EXTERN int     maxstksize;
 
 /*

diff --git a/src/cmd/5l/softfloat.c b/src/cmd/5l/softfloat.c
index 4f799d17ee6f136ebbd40c34fd8e561fd71905ab..40110717802ebf288caf2d59e3d025c20e0582b9 100644 (file)
--- a/src/cmd/5l/softfloat.c
+++ b/src/cmd/5l/softfloat.c
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#define        EXTERN
 #include       "l.h"
 #include       "../ld/lib.h"
 

diff --git a/src/cmd/6g/gg.h b/src/cmd/6g/gg.h
index 2493771a0dfe3ce605faed730b7be73b277fe492..3af8d3707f1efc4ef337beed58c128de4a510872 100644 (file)
--- a/src/cmd/6g/gg.h
+++ b/src/cmd/6g/gg.h
@@ -5,13 +5,13 @@
 #include <u.h>
 #include <libc.h>
 
-#include "../gc/go.h"
-#include "../6l/6.out.h"
-
 #ifndef        EXTERN
-#define EXTERN extern
+#define        EXTERN  extern
 #endif
 
+#include "../gc/go.h"
+#include "../6l/6.out.h"
+
 typedef        struct  Addr    Addr;
 
 struct Addr
@@ -44,22 +44,19 @@ struct      Prog
        void*   reg;            // pointer to containing Reg struct
 };
 
-EXTERN Biobuf* bout;
 EXTERN int32   dynloc;
 EXTERN uchar   reg[D_NONE];
 EXTERN int32   pcloc;          // instruction counter
 EXTERN Strlit  emptystring;
 extern char*   anames[];
-EXTERN Hist*   hist;
 EXTERN Prog    zprog;
-EXTERN Node*   curfn;
 EXTERN Node*   newproc;
 EXTERN Node*   deferproc;
 EXTERN Node*   deferreturn;
 EXTERN Node*   panicindex;
 EXTERN Node*   panicslice;
 EXTERN Node*   throwreturn;
-EXTERN vlong   unmappedzero;
+extern vlong   unmappedzero;
 
 /*
  * gen.c

diff --git a/src/cmd/6g/reg.c b/src/cmd/6g/reg.c
index 4d426304712bba082cb98f714c2b4fdeee8c2481..5d6bfb3ada6034f487b5a6da0241383b166fa27b 100644 (file)
--- a/src/cmd/6g/reg.c
+++ b/src/cmd/6g/reg.c
@@ -29,8 +29,6 @@
 // THE SOFTWARE.
 
 #include "gg.h"
-#undef EXTERN
-#define        EXTERN
 #include "opt.h"
 
 #define        NREGVAR 32      /* 16 general + 16 floating */

diff --git a/src/cmd/8g/gg.h b/src/cmd/8g/gg.h
index 9f7a66a2956aafcad3420134e7fc55e3fa065d87..506345ef46d197b0b4528ae8cd8fdf896dc5583e 100644 (file)
--- a/src/cmd/8g/gg.h
+++ b/src/cmd/8g/gg.h
@@ -5,13 +5,13 @@
 #include <u.h>
 #include <libc.h>
 
-#include "../gc/go.h"
-#include "../8l/8.out.h"
-
 #ifndef        EXTERN
 #define        EXTERN  extern
 #endif
 
+#include "../gc/go.h"
+#include "../8l/8.out.h"
+
 typedef        struct  Addr    Addr;
 
 struct Addr
@@ -54,15 +54,12 @@ enum
        Fpop2 = 1<<2,
 };
 
-EXTERN Biobuf* bout;
 EXTERN int32   dynloc;
 EXTERN uchar   reg[D_NONE];
 EXTERN int32   pcloc;          // instruction counter
 EXTERN Strlit  emptystring;
 extern char*   anames[];
-EXTERN Hist*   hist;
 EXTERN Prog    zprog;
-EXTERN Node*   curfn;
 EXTERN Node*   newproc;
 EXTERN Node*   deferproc;
 EXTERN Node*   deferreturn;

diff --git a/src/cmd/8g/reg.c b/src/cmd/8g/reg.c
index 2b878f62a23ca2a526f63aaac6a1211004bd3214..4fb274fe04400a0601acee802d17c574f2546524 100644 (file)
--- a/src/cmd/8g/reg.c
+++ b/src/cmd/8g/reg.c
@@ -29,8 +29,6 @@
 // THE SOFTWARE.
 
 #include "gg.h"
-#undef EXTERN
-#define        EXTERN
 #include "opt.h"
 
 #define        NREGVAR 8

diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index e876412a0d9c1f8120008555fd8ce78deb0fd10c..fcca2199332e0e3b4a7350dd482471744632a274 100644 (file)
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-#define                EXTERN
 #include       "go.h"
 #include       "y.tab.h"
 #include       <ar.h>