fix nacl build

R=r
DELTA=23  (5 added, 0 deleted, 18 changed)
OCL=35510
CL=35518

diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c
index 3603da2ea9a6e6a5e7cf96bfb779dd547088d88c..559d816bd7017ce3423a017c8421bbbc21d94a9c 100644 (file)
--- a/src/cmd/8l/asm.c
+++ b/src/cmd/8l/asm.c
@@ -970,7 +970,7 @@ asmb(void)
                eh->ident[EI_VERSION] = EV_CURRENT;
                if(HEADTYPE == 8) {
                        eh->ident[EI_OSABI] = ELFOSABI_NACL;
-                       eh->ident[EI_ABIVERSION] = 5;
+                       eh->ident[EI_ABIVERSION] = 6;
                        eh->flags = 0x200000;   // aligned mod 32
                }
 

diff --git a/src/make.bash b/src/make.bash
index ca5304512ffbe6615f6fab2cfba8468c0741d3fa..04054c4016dac93a78e000b912d021dec5f930f1 100755 (executable)
--- a/src/make.bash
+++ b/src/make.bash
@@ -21,21 +21,26 @@ chmod +x $GOBIN/quietgcc
 
 for i in lib9 libbio libmach libregexp cmd pkg libcgo cmd/cgo cmd/ebnflint cmd/godoc cmd/gofmt
 do
-       # The ( ) here are to preserve the current directory
-       # for the next round despite the cd $i below.
-       # set -e does not apply to ( ) so we must explicitly
-       # test the exit status.
-       (
-               echo; echo; echo %%%% making $i %%%%; echo
-               cd $i
-               case $i in
-               cmd)
-                       bash make.bash
-                       ;;
-               *)
-                       make install
-               esac
-       )  || exit 1
+       case "$i-$GOOS" in
+       libcgo-nacl)
+               ;;
+       *)
+               # The ( ) here are to preserve the current directory
+               # for the next round despite the cd $i below.
+               # set -e does not apply to ( ) so we must explicitly
+               # test the exit status.
+               (
+                       echo; echo; echo %%%% making $i %%%%; echo
+                       cd $i
+                       case $i in
+                       cmd)
+                               bash make.bash
+                               ;;
+                       *)
+                               make install
+                       esac
+               )  || exit 1
+       esac
 done
 
 case "`uname`" in

diff --git a/test/run-nacl b/test/run-nacl
index 69afbce8fafc4350b6bebb166e68d08868edcff2..894ad602a684e4ba80c6e10324a2906714223c83 100755 (executable)
--- a/test/run-nacl
+++ b/test/run-nacl
@@ -19,7 +19,7 @@ export GOTRACEBACK=0
 
 failed=0
 
-PATH=/bin:/usr/bin:/usr/local/bin:${GOBIN:-$HOME/bin}:`pwd`
+export PATH=/bin:/usr/bin:/usr/local/bin:${GOBIN:-$HOME/bin}:$HOME/bin:$(pwd)
 
 RUNFILE=/tmp/gorun-$$-$USER
 TMP1FILE=/tmp/gotest1-$$-$USER
@@ -60,7 +60,7 @@ done | # clean up some stack noise
                s/^pc: 0x[0-9a-f]*/pc: xxx/
                /^Trace\/breakpoint trap/d
                /^Trace\/BPT trap/d
-               /RUNFILE/ s/line 1: *[0-9]*/line 1: PID/
+               /RUNFILE/ s/line 1: *[0-9][0-9]* /line 1: PID /
                /^\$RUNFILE: line 1: PID Trace\/breakpoint trap/d
                /^qemu: uncaught target signal 11 (Segmentation fault) - exiting/d' > run.out