cmd/5a, cmd/6a, cmd/8a, cmd/9a: check nerrors before exit

Also fix one unaligned stack size for nacl that is caught
by this change.

Fixes #9539.

Change-Id: Ib696a573d3f1f9bac7724f3a719aab65a11e04d3
Reviewed-on: https://go-review.googlesource.com/2600
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/src/cmd/5a/lex.c b/src/cmd/5a/lex.c
index 9c69709479b16873f63cecb92277d58dcf61bd2b..9273d669b489b31444a2b1d4f8268d1cf2bc4b2c 100644 (file)
--- a/src/cmd/5a/lex.c
+++ b/src/cmd/5a/lex.c
@@ -122,6 +122,8 @@ main(int argc, char *argv[])
        if(assemble(argv[0]))
                errorexit();
        Bflush(&bstdout);
+       if(nerrors > 0)
+               errorexit();
        exits(0);
 }
 

diff --git a/src/cmd/6a/lex.c b/src/cmd/6a/lex.c
index 8973d697430310c5875d92437e60292f32297e28..0a47bfad5a0c398ae4f71df785dc8afa307c3b68 100644 (file)
--- a/src/cmd/6a/lex.c
+++ b/src/cmd/6a/lex.c
@@ -132,6 +132,8 @@ main(int argc, char *argv[])
        if(assemble(argv[0]))
                errorexit();
        Bflush(&bstdout);
+       if(nerrors > 0)
+               errorexit();
        exits(0);
 }
 

diff --git a/src/cmd/8a/lex.c b/src/cmd/8a/lex.c
index 7c172e0007a575b76ea3d03da2bbb8815569e1c8..49a58c630d320158089c0596bde2dd813400f081 100644 (file)
--- a/src/cmd/8a/lex.c
+++ b/src/cmd/8a/lex.c
@@ -127,6 +127,8 @@ main(int argc, char *argv[])
        if(assemble(argv[0]))
                errorexit();
        Bflush(&bstdout);
+       if(nerrors > 0)
+               errorexit();
        exits(0);
 }
 

diff --git a/src/cmd/9a/lex.c b/src/cmd/9a/lex.c
index c8073b07d0fdccbac6aa1f78a866c93b8ed56e50..e93365909eedc60b5e813ccfea11ad5be09cfec2 100644 (file)
--- a/src/cmd/9a/lex.c
+++ b/src/cmd/9a/lex.c
@@ -131,6 +131,8 @@ main(int argc, char *argv[])
        if(assemble(argv[0]))
                errorexit();
        Bflush(&bstdout);
+       if(nerrors > 0)
+               errorexit();
        exits(0);
 }
 

diff --git a/src/runtime/asm_amd64p32.s b/src/runtime/asm_amd64p32.s
index 6d50ba9f4b1ba462134b3b41d7c7d7a1a1ab62e0..77355bb99870590caa1b5512e7cd0c7237b42341 100644 (file)
--- a/src/runtime/asm_amd64p32.s
+++ b/src/runtime/asm_amd64p32.s
@@ -645,7 +645,7 @@ TEXT runtime·cputicks(SB),NOSPLIT,$0-0
 // memhash_varlen(p unsafe.Pointer, h seed) uintptr
 // redirects to memhash(p, h, size) using the size
 // stored in the closure.
-TEXT runtime·memhash_varlen(SB),NOSPLIT,$20-12
+TEXT runtime·memhash_varlen(SB),NOSPLIT,$24-12
        GO_ARGS
        NO_LOCAL_POINTERS
        MOVL    p+0(FP), AX