diff options
| author | Russ Cox <rsc@golang.org> | 2009-10-09 11:15:19 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-10-09 11:15:19 -0700 |
| commit | 4a4678571ad09d41f5664d8a2a7d54436e707d27 (patch) | |
| tree | b43d7b1a35204127a1c0c9ba260d27f9665fef67 | |
| parent | 3039eb55a482576c39f2d41a730bfe2658fd461f (diff) | |
| download | golang-4a4678571ad09d41f5664d8a2a7d54436e707d27.tar.gz | |
fix nacl build
R=r
DELTA=23 (5 added, 0 deleted, 18 changed)
OCL=35510
CL=35518
| -rw-r--r-- | src/cmd/8l/asm.c | 2 | ||||
| -rwxr-xr-x | src/make.bash | 35 | ||||
| -rwxr-xr-x | test/run-nacl | 4 |
3 files changed, 23 insertions, 18 deletions
diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c index 3603da2ea..559d816bd 100644 --- 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 ca5304512..04054c401 100755 --- 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 69afbce8f..894ad602a 100755 --- 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 |