diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-07 13:31:34 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-07 13:31:34 +0000 |
| commit | 8f78d2ac93161dc7602378401f4d520e96fc5cb2 (patch) | |
| tree | 42212a3e689de70cfdfff26a258c8ac0cad00364 /libgo | |
| parent | 0356b3a3150abd70534261dda1ed91d265d5089c (diff) | |
| download | gcc-8f78d2ac93161dc7602378401f4d520e96fc5cb2.tar.gz | |
2011-07-07 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 175963 using svnmerge.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@175972 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/Makefile.am | 2 | ||||
| -rw-r--r-- | libgo/Makefile.in | 2 | ||||
| -rw-r--r-- | libgo/config/libtool.m4 | 2 | ||||
| -rwxr-xr-x | libgo/configure | 2 | ||||
| -rw-r--r-- | libgo/go/json/scanner_test.go | 3 |
5 files changed, 7 insertions, 4 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 761a11ad265..26a6e78d64f 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1619,7 +1619,7 @@ GOTESTFLAGS = # Check a package. CHECK = \ - GC="$(GOC) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \ + GC="$(GOC) $(GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \ export GC; \ RUNTESTFLAGS="$(RUNTESTFLAGS)"; \ export RUNTESTFLAGS; \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 8637ec41b7d..5b33859becf 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -1937,7 +1937,7 @@ GOTESTFLAGS = # Check a package. CHECK = \ - GC="$(GOC) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \ + GC="$(GOC) $(GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \ export GC; \ RUNTESTFLAGS="$(RUNTESTFLAGS)"; \ export RUNTESTFLAGS; \ diff --git a/libgo/config/libtool.m4 b/libgo/config/libtool.m4 index a546739eb4e..1a667d31a5a 100644 --- a/libgo/config/libtool.m4 +++ b/libgo/config/libtool.m4 @@ -1296,7 +1296,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris* | x86_64-*-solaris2.1[[0-9]]*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) diff --git a/libgo/configure b/libgo/configure index 4bf5a2e6096..607533d0e38 100755 --- a/libgo/configure +++ b/libgo/configure @@ -6422,7 +6422,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris* | x86_64-*-solaris2.1[0-9]*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) diff --git a/libgo/go/json/scanner_test.go b/libgo/go/json/scanner_test.go index 0d4de3246dd..df87c716aff 100644 --- a/libgo/go/json/scanner_test.go +++ b/libgo/go/json/scanner_test.go @@ -252,6 +252,9 @@ func genArray(n int) []interface{} { if f > n { f = n } + if n > 0 && f == 0 { + f = 1 + } x := make([]interface{}, int(f)) for i := range x { x[i] = genValue(((i+1)*n)/f - (i*n)/f) |