r183827 - in /branches/gccgo: ./ gcc/ChangeLog ...

[ian@gcc.gnu.org]

Author: ian
Date: Thu Feb  2 07:01:37 2012
New Revision: 183827

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=183827
Log:
Merge from trunk revision 183826.

Modified:
    branches/gccgo/libstdc++-v3/ChangeLog
    branches/gccgo/libstdc++-v3/config/abi/pre/gnu.ver
    branches/gccgo/libstdc++-v3/include/std/future
    branches/gccgo/libstdc++-v3/src/c++11/future.cc
    branches/gccgo/libstdc++-v3/testsuite/30_threads/future/members/wait_for.cc
    branches/gccgo/libstdc++-v3/testsuite/30_threads/future/members/wait_until.cc
    branches/gccgo/libstdc++-v3/testsuite/30_threads/packaged_task/members/get_future.cc
    branches/gccgo/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc
    branches/gccgo/libstdc++-v3/testsuite/30_threads/promise/members/set_value3.cc
    branches/gccgo/libstdc++-v3/testsuite/30_threads/promise/members/swap.cc
    branches/gccgo/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_for.cc
    branches/gccgo/libstdc++-v3/testsuite/30_threads/shared_future/members/wait_until.cc

Changes in other areas also in this revision:
Added:
    branches/gccgo/gcc/testsuite/gcc.target/avr/torture/pr51374-1.c
      - copied unchanged from r183826, trunk/gcc/testsuite/gcc.target/avr/torture/pr51374-1.c
    branches/gccgo/gcc/testsuite/gfortran.dg/elemental_function_1.f90
      - copied unchanged from r183826, trunk/gcc/testsuite/gfortran.dg/elemental_function_1.f90
    branches/gccgo/gcc/testsuite/gfortran.dg/function_optimize_10.f90
      - copied unchanged from r183826, trunk/gcc/testsuite/gfortran.dg/function_optimize_10.f90
    branches/gccgo/gcc/testsuite/gfortran.dg/typebound_operator_14.f90
      - copied unchanged from r183826, trunk/gcc/testsuite/gfortran.dg/typebound_operator_14.f90
    branches/gccgo/libgo/go/compress/testdata/Mark.Twain-Tom.Sawyer.txt
      - copied unchanged from r183826, trunk/libgo/go/compress/testdata/Mark.Twain-Tom.Sawyer.txt
    branches/gccgo/libgo/go/exp/ebnflint/ebnflint_test.go
      - copied unchanged from r183826, trunk/libgo/go/exp/ebnflint/ebnflint_test.go
    branches/gccgo/libgo/go/exp/html/
      - copied from r183826, trunk/libgo/go/exp/html/
    branches/gccgo/libgo/go/go/doc/testdata/a.0.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/a.0.golden
    branches/gccgo/libgo/go/go/doc/testdata/a.1.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/a.1.golden
    branches/gccgo/libgo/go/go/doc/testdata/b.0.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/b.0.golden
    branches/gccgo/libgo/go/go/doc/testdata/b.1.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/b.1.golden
    branches/gccgo/libgo/go/go/doc/testdata/c.0.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/c.0.golden
    branches/gccgo/libgo/go/go/doc/testdata/c.1.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/c.1.golden
    branches/gccgo/libgo/go/go/doc/testdata/c.go
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/c.go
    branches/gccgo/libgo/go/go/doc/testdata/d.0.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/d.0.golden
    branches/gccgo/libgo/go/go/doc/testdata/d.1.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/d.1.golden
    branches/gccgo/libgo/go/go/doc/testdata/d1.go
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/d1.go
    branches/gccgo/libgo/go/go/doc/testdata/d2.go
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/d2.go
    branches/gccgo/libgo/go/go/doc/testdata/e.0.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/e.0.golden
    branches/gccgo/libgo/go/go/doc/testdata/e.1.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/e.1.golden
    branches/gccgo/libgo/go/go/doc/testdata/e.go
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/e.go
    branches/gccgo/libgo/go/go/doc/testdata/testing.0.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/testing.0.golden
    branches/gccgo/libgo/go/go/doc/testdata/testing.1.golden
      - copied unchanged from r183826, trunk/libgo/go/go/doc/testdata/testing.1.golden
    branches/gccgo/libgo/go/net/udp_test.go
      - copied unchanged from r183826, trunk/libgo/go/net/udp_test.go
Removed:
    branches/gccgo/libgo/go/compress/flate/util.go
    branches/gccgo/libgo/go/crypto/blowfish/
    branches/gccgo/libgo/go/crypto/cast5/
    branches/gccgo/libgo/go/crypto/md4/
    branches/gccgo/libgo/go/crypto/ocsp/
    branches/gccgo/libgo/go/crypto/openpgp/
    branches/gccgo/libgo/go/crypto/ripemd160/
    branches/gccgo/libgo/go/crypto/twofish/
    branches/gccgo/libgo/go/crypto/xtea/
    branches/gccgo/libgo/go/encoding/git85/
    branches/gccgo/libgo/go/html/const.go
    branches/gccgo/libgo/go/html/doc.go
    branches/gccgo/libgo/go/html/doctype.go
    branches/gccgo/libgo/go/html/foreign.go
    branches/gccgo/libgo/go/html/node.go
    branches/gccgo/libgo/go/html/parse.go
    branches/gccgo/libgo/go/html/parse_test.go
    branches/gccgo/libgo/go/html/render.go
    branches/gccgo/libgo/go/html/render_test.go
    branches/gccgo/libgo/go/html/testdata/
    branches/gccgo/libgo/go/html/token.go
    branches/gccgo/libgo/go/html/token_test.go
    branches/gccgo/libgo/go/net/dict/
    branches/gccgo/libgo/go/patch/
    branches/gccgo/libgo/go/websocket/
Modified:
    branches/gccgo/   (props changed)
    branches/gccgo/gcc/ChangeLog
    branches/gccgo/gcc/DATESTAMP
    branches/gccgo/gcc/ada/gcc-interface/trans.c
    branches/gccgo/gcc/c-typeck.c
    branches/gccgo/gcc/combine.c
    branches/gccgo/gcc/common.opt
    branches/gccgo/gcc/config/avr/avr.c
    branches/gccgo/gcc/config/avr/avr.h
    branches/gccgo/gcc/doc/invoke.texi
    branches/gccgo/gcc/fortran/ChangeLog
    branches/gccgo/gcc/fortran/frontend-passes.c
    branches/gccgo/gcc/fortran/module.c
    branches/gccgo/gcc/fortran/trans-expr.c
    branches/gccgo/gcc/go/ChangeLog
    branches/gccgo/gcc/go/go-lang.c
    branches/gccgo/gcc/go/gofrontend/expressions.cc
    branches/gccgo/gcc/go/gofrontend/parse.cc
    branches/gccgo/gcc/testsuite/ChangeLog
    branches/gccgo/gcc/testsuite/go.test/go-test.exp
    branches/gccgo/libgo/MERGE
    branches/gccgo/libgo/Makefile.am
    branches/gccgo/libgo/Makefile.in
    branches/gccgo/libgo/go/archive/tar/reader.go
    branches/gccgo/libgo/go/archive/tar/reader_test.go
    branches/gccgo/libgo/go/archive/zip/reader.go
    branches/gccgo/libgo/go/archive/zip/reader_test.go
    branches/gccgo/libgo/go/archive/zip/struct.go
    branches/gccgo/libgo/go/archive/zip/writer.go
    branches/gccgo/libgo/go/archive/zip/zip_test.go
    branches/gccgo/libgo/go/bytes/buffer.go
    branches/gccgo/libgo/go/compress/flate/deflate.go
    branches/gccgo/libgo/go/compress/flate/deflate_test.go
    branches/gccgo/libgo/go/compress/flate/huffman_bit_writer.go
    branches/gccgo/libgo/go/compress/flate/huffman_code.go
    branches/gccgo/libgo/go/compress/gzip/gunzip.go
    branches/gccgo/libgo/go/compress/gzip/gunzip_test.go
    branches/gccgo/libgo/go/compress/zlib/reader.go
    branches/gccgo/libgo/go/compress/zlib/reader_test.go
    branches/gccgo/libgo/go/crypto/dsa/dsa.go
    branches/gccgo/libgo/go/crypto/tls/root_stub.go
    branches/gccgo/libgo/go/database/sql/convert.go
    branches/gccgo/libgo/go/database/sql/fakedb_test.go
    branches/gccgo/libgo/go/database/sql/sql.go
    branches/gccgo/libgo/go/database/sql/sql_test.go
    branches/gccgo/libgo/go/encoding/binary/varint.go
    branches/gccgo/libgo/go/encoding/binary/varint_test.go
    branches/gccgo/libgo/go/encoding/gob/debug.go
    branches/gccgo/libgo/go/encoding/gob/decoder.go
    branches/gccgo/libgo/go/encoding/gob/gobencdec_test.go
    branches/gccgo/libgo/go/encoding/xml/marshal.go
    branches/gccgo/libgo/go/encoding/xml/marshal_test.go
    branches/gccgo/libgo/go/encoding/xml/read.go
    branches/gccgo/libgo/go/encoding/xml/read_test.go
    branches/gccgo/libgo/go/encoding/xml/typeinfo.go
    branches/gccgo/libgo/go/encoding/xml/xml.go
    branches/gccgo/libgo/go/encoding/xml/xml_test.go
    branches/gccgo/libgo/go/exp/ebnflint/ebnflint.go
    branches/gccgo/libgo/go/exp/norm/tables.go
    branches/gccgo/libgo/go/exp/norm/triegen.go
    branches/gccgo/libgo/go/go/ast/import.go
    branches/gccgo/libgo/go/go/build/build.go
    branches/gccgo/libgo/go/go/build/build_test.go
    branches/gccgo/libgo/go/go/build/dir.go
    branches/gccgo/libgo/go/go/build/path.go
    branches/gccgo/libgo/go/go/doc/doc.go
    branches/gccgo/libgo/go/go/doc/doc_test.go
    branches/gccgo/libgo/go/go/doc/exports.go
    branches/gccgo/libgo/go/go/doc/filter.go
    branches/gccgo/libgo/go/go/doc/reader.go
    branches/gccgo/libgo/go/go/doc/testdata/b.go
    branches/gccgo/libgo/go/go/parser/interface.go
    branches/gccgo/libgo/go/go/parser/parser.go
    branches/gccgo/libgo/go/go/printer/nodes.go
    branches/gccgo/libgo/go/go/printer/printer.go
    branches/gccgo/libgo/go/go/printer/testdata/declarations.golden
    branches/gccgo/libgo/go/go/printer/testdata/linebreaks.golden
    branches/gccgo/libgo/go/go/printer/testdata/linebreaks.input
    branches/gccgo/libgo/go/go/scanner/scanner.go
    branches/gccgo/libgo/go/go/scanner/scanner_test.go
    branches/gccgo/libgo/go/html/escape.go
    branches/gccgo/libgo/go/io/ioutil/ioutil.go
    branches/gccgo/libgo/go/math/big/arith.go
    branches/gccgo/libgo/go/math/big/arith_decl.go
    branches/gccgo/libgo/go/math/big/arith_test.go
    branches/gccgo/libgo/go/net/cgo_stub.go
    branches/gccgo/libgo/go/net/dial.go
    branches/gccgo/libgo/go/net/dialgoogle_test.go
    branches/gccgo/libgo/go/net/fd.go
    branches/gccgo/libgo/go/net/fd_windows.go
    branches/gccgo/libgo/go/net/http/client.go
    branches/gccgo/libgo/go/net/http/client_test.go
    branches/gccgo/libgo/go/net/http/readrequest_test.go
    branches/gccgo/libgo/go/net/http/request.go
    branches/gccgo/libgo/go/net/http/request_test.go
    branches/gccgo/libgo/go/net/http/transport.go
    branches/gccgo/libgo/go/net/http/transport_test.go
    branches/gccgo/libgo/go/net/ipraw_test.go
    branches/gccgo/libgo/go/net/iprawsock_plan9.go
    branches/gccgo/libgo/go/net/iprawsock_posix.go
    branches/gccgo/libgo/go/net/lookup_plan9.go
    branches/gccgo/libgo/go/net/rpc/client.go
    branches/gccgo/libgo/go/net/rpc/server_test.go
    branches/gccgo/libgo/go/net/sock.go
    branches/gccgo/libgo/go/net/sockopt.go
    branches/gccgo/libgo/go/net/tcpsock_plan9.go
    branches/gccgo/libgo/go/net/tcpsock_posix.go
    branches/gccgo/libgo/go/net/timeout_test.go
    branches/gccgo/libgo/go/net/udpsock_plan9.go
    branches/gccgo/libgo/go/net/udpsock_posix.go
    branches/gccgo/libgo/go/net/unixsock_posix.go
    branches/gccgo/libgo/go/os/exec/exec_test.go
    branches/gccgo/libgo/go/os/file_plan9.go
    branches/gccgo/libgo/go/os/stat_plan9.go
    branches/gccgo/libgo/go/os/user/lookup_stubs.go
    branches/gccgo/libgo/go/path/filepath/path_test.go
    branches/gccgo/libgo/go/regexp/regexp.go
    branches/gccgo/libgo/go/runtime/chan_test.go
    branches/gccgo/libgo/go/runtime/debug.go
    branches/gccgo/libgo/go/runtime/extern.go
    branches/gccgo/libgo/go/syscall/libcall_posix.go
    branches/gccgo/libgo/mksysinfo.sh
    branches/gccgo/libjava/ChangeLog
    branches/gccgo/libjava/interpret.cc
    branches/gccgo/libjava/java/lang/reflect/natMethod.cc
    branches/gccgo/libjava/java/lang/reflect/natVMProxy.cc

Propchange: branches/gccgo/
            ('svn:mergeinfo' modified)