r216616 - in /branches/linaro/gcc-4_9-branch: ....

[yroux@gcc.gnu.org]

Author: yroux
Date: Fri Oct 24 07:50:18 2014
New Revision: 216616

URL: https://gcc.gnu.org/viewcvs?rev=216616&root=gcc&view=rev
Log:
Fix broken merge branches/gcc-4_9-branch rev 216130

Added:
    branches/linaro/gcc-4_9-branch/libgomp/testsuite/libgomp.c++/pr63248.C
      - copied unchanged from r216130, branches/gcc-4_9-branch/libgomp/testsuite/libgomp.c++/pr63248.C
    branches/linaro/gcc-4_9-branch/libgomp/testsuite/libgomp.c/pr61200.c
      - copied unchanged from r216130, branches/gcc-4_9-branch/libgomp/testsuite/libgomp.c/pr61200.c
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/20_util/is_final/
      - copied from r216130, branches/gcc-4_9-branch/libstdc++-v3/testsuite/20_util/is_final/
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/23_containers/priority_queue/requirements/uses_allocator.cc
      - copied unchanged from r216130, branches/gcc-4_9-branch/libstdc++-v3/testsuite/23_containers/priority_queue/requirements/uses_allocator.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/23_containers/queue/requirements/uses_allocator.cc
      - copied unchanged from r216130, branches/gcc-4_9-branch/libstdc++-v3/testsuite/23_containers/queue/requirements/uses_allocator.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/23_containers/stack/requirements/uses_allocator.cc
      - copied unchanged from r216130, branches/gcc-4_9-branch/libstdc++-v3/testsuite/23_containers/stack/requirements/uses_allocator.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/23_containers/unordered_set/63456.cc
      - copied unchanged from r216130, branches/gcc-4_9-branch/libstdc++-v3/testsuite/23_containers/unordered_set/63456.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/25_algorithms/random_shuffle/59603.cc
      - copied unchanged from r216130, branches/gcc-4_9-branch/libstdc++-v3/testsuite/25_algorithms/random_shuffle/59603.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc
      - copied unchanged from r216130, branches/gcc-4_9-branch/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/experimental/feat-cxx14.cc
      - copied unchanged from r216130, branches/gcc-4_9-branch/libstdc++-v3/testsuite/experimental/feat-cxx14.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/experimental/feat-lib-fund.cc
      - copied unchanged from r216130, branches/gcc-4_9-branch/libstdc++-v3/testsuite/experimental/feat-lib-fund.cc
Modified:
    branches/linaro/gcc-4_9-branch/   (props changed)
    branches/linaro/gcc-4_9-branch/contrib/ChangeLog
    branches/linaro/gcc-4_9-branch/contrib/config-list.mk
    branches/linaro/gcc-4_9-branch/libcpp/ChangeLog
    branches/linaro/gcc-4_9-branch/libcpp/directives.c
    branches/linaro/gcc-4_9-branch/libcpp/expr.c
    branches/linaro/gcc-4_9-branch/libcpp/files.c
    branches/linaro/gcc-4_9-branch/libcpp/identifiers.c
    branches/linaro/gcc-4_9-branch/libcpp/internal.h
    branches/linaro/gcc-4_9-branch/libcpp/pch.c
    branches/linaro/gcc-4_9-branch/libcpp/traditional.c
    branches/linaro/gcc-4_9-branch/libffi/ChangeLog
    branches/linaro/gcc-4_9-branch/libffi/src/powerpc/linux64.S
    branches/linaro/gcc-4_9-branch/libffi/src/powerpc/linux64_closure.S
    branches/linaro/gcc-4_9-branch/libgcc/ChangeLog
    branches/linaro/gcc-4_9-branch/libgcc/config/avr/lib1funcs.S
    branches/linaro/gcc-4_9-branch/libgcc/config/avr/t-avr
    branches/linaro/gcc-4_9-branch/libgcc/config/i386/sfp-machine.h
    branches/linaro/gcc-4_9-branch/libgfortran/ChangeLog
    branches/linaro/gcc-4_9-branch/libgfortran/io/unit.c
    branches/linaro/gcc-4_9-branch/libgo/go/debug/elf/elf.go
    branches/linaro/gcc-4_9-branch/libgo/go/debug/elf/file.go
    branches/linaro/gcc-4_9-branch/libgo/go/syscall/exec_linux.go
    branches/linaro/gcc-4_9-branch/libgo/runtime/getncpu-linux.c
    branches/linaro/gcc-4_9-branch/libgomp/ChangeLog
    branches/linaro/gcc-4_9-branch/libjava/classpath/   (props changed)
    branches/linaro/gcc-4_9-branch/libstdc++-v3/ChangeLog
    branches/linaro/gcc-4_9-branch/libstdc++-v3/doc/html/index.html
    branches/linaro/gcc-4_9-branch/libstdc++-v3/doc/html/manual/containers.html
    branches/linaro/gcc-4_9-branch/libstdc++-v3/doc/html/manual/index.html
    branches/linaro/gcc-4_9-branch/libstdc++-v3/doc/html/manual/status.html
    branches/linaro/gcc-4_9-branch/libstdc++-v3/doc/html/manual/std_contents.html
    branches/linaro/gcc-4_9-branch/libstdc++-v3/doc/xml/manual/containers.xml
    branches/linaro/gcc-4_9-branch/libstdc++-v3/doc/xml/manual/status_cxx2011.xml
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/basic_string.h
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/hashtable.h
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/regex.h
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/stl_algo.h
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/stl_algobase.h
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/stl_function.h
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/stl_queue.h
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/stl_stack.h
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/unique_ptr.h
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/bits/vector.tcc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/std/chrono
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/std/complex
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/std/iomanip
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/std/mutex
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/std/shared_mutex
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/std/tuple
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/std/type_traits
    branches/linaro/gcc-4_9-branch/libstdc++-v3/include/std/utility
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/30_threads/try_lock/4.cc
    branches/linaro/gcc-4_9-branch/libstdc++-v3/testsuite/util/testsuite_tr1.h

Propchange: branches/linaro/gcc-4_9-branch/
            ('svn:mergeinfo' modified)

Propchange: branches/linaro/gcc-4_9-branch/libjava/classpath/
            ('svn:mergeinfo' modified)