8c: fixes for Plan 9 build

8c/gc.h:
. Added <u.h> header.
. Added "lD" pragma for "*Adr" to supplement "D".

8c/swt.c:
. Removed unreferenced "thestring" arguments in Bprint() calls.

cc/acid.c:
cc/com.c:
cc/com64.c:
cc/dcl.c:
cc/scon.c:
. Added <u.h>, required by "cc.h".

cc/bits.c:
. Added <u.h>, required by "cc.h".

cc/cc.h:
. Removed <u.h> and <ctype.h>.
. Added "O" pragma to accept "uint" as well as "int".
. Added new "U" pragma (char *).

cc/cc.y:
. Added <u.h> before <stdio.h> (and "cc.h").

cc/dpchk.c:
cc/mac.c:
. Added <u.h> and <ctype.h>.

cc/funct.c:
. Added <u.h>, required by "cc.h".

cc/godefs.c
. Added <u.h>, required by "cc.h".
. Dropped unused "t" argument in Bprint().

cc/lex.c:
. Added <u.h> and <ctype.h>.
. Removed unnecessary incrementation.
. Changed exit() invocations with exits().

cc/omachcap.c:
. Added <u.h>, required by "cc.h".
. USED(n) for unused argument to machcap().

cc/sub.c:
. Added <u.h> and <ctype.h>.

R=rsc
CC=golang-dev
https://golang.org/cl/4629070

diff --git a/src/cmd/8c/gc.h b/src/cmd/8c/gc.h
index 9fead60e41ea25e9f53c798362133eb4a213529e..32b80e99581722537f510b28589d21dd77b6f865 100644 (file)
--- a/src/cmd/8c/gc.h
+++ b/src/cmd/8c/gc.h
@@ -28,6 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include       <u.h>
 #include       "../cc/cc.h"
 #include       "../8l/8.out.h"
 
@@ -400,6 +401,7 @@ void        shiftit(Type*, Node*, Node*);
 #pragma        varargck        type    "A"     int
 #pragma        varargck        type    "B"     Bits
 #pragma        varargck        type    "D"     Adr*
+#pragma        varargck        type    "lD"    Adr*
 #pragma        varargck        type    "P"     Prog*
 #pragma        varargck        type    "R"     int
 #pragma        varargck        type    "S"     char*

diff --git a/src/cmd/8c/swt.c b/src/cmd/8c/swt.c
index d07a5439c2b32487ab3f75f6423712ea58f4a29b..769ef2c66ef8f94cfb15825ee21ba9db003fcef8 100644 (file)
--- a/src/cmd/8c/swt.c
+++ b/src/cmd/8c/swt.c
@@ -237,10 +237,10 @@ outcode(void)
                Bprint(&b, "\n");
                Bprint(&b, "$$  // exports\n\n");
                Bprint(&b, "$$  // local types\n\n");
-               Bprint(&b, "$$  // dynimport\n", thestring);
+               Bprint(&b, "$$  // dynimport\n");
                for(i=0; i<ndynimp; i++)
                        Bprint(&b, "dynimport %s %s %s\n", dynimp[i].local, dynimp[i].remote, dynimp[i].path);
-               Bprint(&b, "\n$$  // dynexport\n", thestring);
+               Bprint(&b, "\n$$  // dynexport\n");
                for(i=0; i<ndynexp; i++)
                        Bprint(&b, "dynexport %s %s\n", dynexp[i].local, dynexp[i].remote);
                Bprint(&b, "\n$$\n\n");

diff --git a/src/cmd/cc/acid.c b/src/cmd/cc/acid.c
index c6a6722bdc7dcc444f07cc279cc06a48b2b938b2..23147e519f8ec3f10996a1aab2e51395824fa425 100644 (file)
--- a/src/cmd/cc/acid.c
+++ b/src/cmd/cc/acid.c
@@ -28,6 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
 #include "cc.h"
 
 static char *kwd[] =

diff --git a/src/cmd/cc/bits.c b/src/cmd/cc/bits.c
index aef4449e8202734b21aa50fe51260d993d9ab14e..4496d65e77dd8b123a80dac62927e33a1ecf066d 100644 (file)
--- a/src/cmd/cc/bits.c
+++ b/src/cmd/cc/bits.c
@@ -28,6 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include       <u.h>
 #include       "cc.h"
 
 Bits

diff --git a/src/cmd/cc/cc.h b/src/cmd/cc/cc.h
index 8e8f6af4401d2dc42c5eb52bdcd59401bc432b2e..a38e658ce0592ce54df739120a3887763b84884e 100644 (file)
--- a/src/cmd/cc/cc.h
+++ b/src/cmd/cc/cc.h
@@ -28,10 +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 <bio.h>
-#include <ctype.h>
 
 #pragma        lib     "../cc/cc.a$O"
 
@@ -816,7 +814,9 @@ int machcap(Node*);
 #pragma        varargck        type    "L"     int32
 #pragma        varargck        type    "Q"     int32
 #pragma        varargck        type    "O"     int
+#pragma        varargck        type    "O"     uint
 #pragma        varargck        type    "T"     Type*
+#pragma        varargck        type    "U"     char*
 #pragma        varargck        type    "|"     int
 
 enum

diff --git a/src/cmd/cc/cc.y b/src/cmd/cc/cc.y
index 470fdae26f86b383cb0efdab8b0118454ab05d76..515a80372e8e9c0035d35098dcaa4cbaa4220bcd 100644 (file)
--- a/src/cmd/cc/cc.y
+++ b/src/cmd/cc/cc.y
@@ -29,6 +29,7 @@
 // THE SOFTWARE.
 
 %{
+#include <u.h>
 #include <stdio.h>     /* if we don't, bison will, and cc.h re-#defines getc */
 #include "cc.h"
 %}

diff --git a/src/cmd/cc/com.c b/src/cmd/cc/com.c
index 192c28ace6d87cf0a7bd5afc6718ba9e5a80321c..6e470ee64adeee9d03e5d771657a13495e42a3ed 100644 (file)
--- a/src/cmd/cc/com.c
+++ b/src/cmd/cc/com.c
@@ -28,6 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
 #include "cc.h"
 
 int compar(Node*, int);

diff --git a/src/cmd/cc/com64.c b/src/cmd/cc/com64.c
index 8d6e07d1b6ab5ca5074577cd01158f4cd9aadb44..fb7a3f750e77705630c587b1757de01558535ad7 100644 (file)
--- a/src/cmd/cc/com64.c
+++ b/src/cmd/cc/com64.c
@@ -28,6 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
 #include "cc.h"
 
 /*

diff --git a/src/cmd/cc/dcl.c b/src/cmd/cc/dcl.c
index 6f1b8a9a9afa8a3f0041a9035f27ad3b3dd0cc53..d624bf2474daa1a1bb9891a476494a176d583c8e 100644 (file)
--- a/src/cmd/cc/dcl.c
+++ b/src/cmd/cc/dcl.c
@@ -28,6 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
 #include "cc.h"
 
 Node*

diff --git a/src/cmd/cc/dpchk.c b/src/cmd/cc/dpchk.c
index 1b163ee3a4c3d749f02824462737a55aae3f6187..42c245b566ad38ee6eba99d7299be4a023444364 100644 (file)
--- a/src/cmd/cc/dpchk.c
+++ b/src/cmd/cc/dpchk.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       <ctype.h>
 #include       "cc.h"
 #include       "y.tab.h"
 

diff --git a/src/cmd/cc/funct.c b/src/cmd/cc/funct.c
index 21d86258ffd1cc1b85fd51410f31f13fb29c1192..99477b2b2386447b831aa30e6c08ed7d1d3c1472 100644 (file)
--- a/src/cmd/cc/funct.c
+++ b/src/cmd/cc/funct.c
@@ -28,6 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include       <u.h>
 #include       "cc.h"
 
 typedef        struct  Ftab    Ftab;

diff --git a/src/cmd/cc/godefs.c b/src/cmd/cc/godefs.c
index 9503cb2f2577c16cdb77cd47e6e10c8c05afb98e..3ba979c8a3c43cfa7316b4038f6c64faa499ceb1 100644 (file)
--- a/src/cmd/cc/godefs.c
+++ b/src/cmd/cc/godefs.c
@@ -29,6 +29,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
 #include "cc.h"
 
 static int upper;
@@ -238,7 +239,7 @@ printtypename(Type *t)
                        Bprint(&outbuf, "%U", n);
                break;
        case TFUNC:
-               Bprint(&outbuf, "func(", t);
+               Bprint(&outbuf, "func(");
                for(t1 = t->down; t1 != T; t1 = t1->down) {
                        if(t1->etype == TVOID)
                                break;

diff --git a/src/cmd/cc/lex.c b/src/cmd/cc/lex.c
index 71cc89bf0d60ed6b0ace26f5e5d5dc119aaedb7b..15f2d374d1d8e271591e5d2a900a9cdbedce7858 100644 (file)
--- a/src/cmd/cc/lex.c
+++ b/src/cmd/cc/lex.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       <ctype.h>
 #include       "cc.h"
 #include       "y.tab.h"
 
@@ -384,7 +386,7 @@ lookup(void)
                }else
                        *w++ = *r;
        }
-       *w++ = '\0';
+       *w = '\0';
 
        h = 0;
        for(p=symb; *p;) {
@@ -1524,7 +1526,7 @@ alloc(int32 n)
        p = malloc(n);
        if(p == nil) {
                print("alloc out of mem\n");
-               exit(1);
+               exits("alloc: out of mem");
        }
        memset(p, 0, n);
        return p;
@@ -1538,7 +1540,7 @@ allocn(void *p, int32 n, int32 d)
        p = realloc(p, n+d);
        if(p == nil) {
                print("allocn out of mem\n");
-               exit(1);
+               exits("allocn: out of mem");
        }
        if(d > 0)
                memset((char*)p+n, 0, d);

diff --git a/src/cmd/cc/mac.c b/src/cmd/cc/mac.c
index c08cd9c9737b0a3f02832a0aa805cf94cd8612c0..43ae214d7eea72378a7786eadb6a808522f40a30 100644 (file)
--- a/src/cmd/cc/mac.c
+++ b/src/cmd/cc/mac.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       <ctype.h>
 #include       "cc.h"
 
 #include       "macbody"

diff --git a/src/cmd/cc/omachcap.c b/src/cmd/cc/omachcap.c
index ec5aa86e93a00238ce6535de2ecb0ad0cb57774e..f8fc1d88b76d99a2e8df5132a672265442d61b54 100644 (file)
--- a/src/cmd/cc/omachcap.c
+++ b/src/cmd/cc/omachcap.c
@@ -28,11 +28,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include       <u.h>
 #include       "cc.h"
 
 /* default, like old cc */
 int
 machcap(Node *n)
 {
+       USED(n);
        return 0;
 }

diff --git a/src/cmd/cc/scon.c b/src/cmd/cc/scon.c
index 3047ca44f6cd3d10dece626926fe330d4ef2a238..193331f774d476fbb6a25fdd71741a717b6c3f05 100644 (file)
--- a/src/cmd/cc/scon.c
+++ b/src/cmd/cc/scon.c
@@ -28,6 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <u.h>
 #include "cc.h"
 
 static Node*

diff --git a/src/cmd/cc/sub.c b/src/cmd/cc/sub.c
index e0d5df7190516ea11b86dde4c2fc8e91858a5bb1..e5992e213b9975247d4aec24bc99c093ecfbf67b 100644 (file)
--- a/src/cmd/cc/sub.c
+++ b/src/cmd/cc/sub.c
@@ -28,6 +28,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include       <u.h>
 #include       "cc.h"
 
 Node*