Fix broken merge branches/gcc-4_9-branch rev 216130
authoryroux <yroux@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 24 Oct 2014 07:50:18 +0000 (07:50 +0000)
committeryroux <yroux@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 24 Oct 2014 07:50:18 +0000 (07:50 +0000)
commit6fdbdf14a2e8433d1ca09f0354bcd9966660ba37
tree71fbf23e2cf8af42d2b93b4eb0ed1f26f1d2ba3c
parent1fff07aff84c6a4c24207afc948c94a337f613ad
Fix broken merge branches/gcc-4_9-branch rev 216130

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/linaro/gcc-4_9-branch@216616 138bc75d-0d04-0410-961f-82ee72b054a4
68 files changed:
contrib/ChangeLog
contrib/config-list.mk
libcpp/ChangeLog
libcpp/directives.c
libcpp/expr.c
libcpp/files.c
libcpp/identifiers.c
libcpp/internal.h
libcpp/pch.c
libcpp/traditional.c
libffi/ChangeLog
libffi/src/powerpc/linux64.S
libffi/src/powerpc/linux64_closure.S
libgcc/ChangeLog
libgcc/config/avr/lib1funcs.S
libgcc/config/avr/t-avr
libgcc/config/i386/sfp-machine.h
libgfortran/ChangeLog
libgfortran/io/unit.c
libgo/go/debug/elf/elf.go
libgo/go/debug/elf/file.go
libgo/go/syscall/exec_linux.go
libgo/runtime/getncpu-linux.c
libgomp/ChangeLog
libgomp/testsuite/libgomp.c++/pr63248.C [new file with mode: 0644]
libgomp/testsuite/libgomp.c/pr61200.c [new file with mode: 0644]
libstdc++-v3/ChangeLog
libstdc++-v3/doc/html/index.html
libstdc++-v3/doc/html/manual/containers.html
libstdc++-v3/doc/html/manual/index.html
libstdc++-v3/doc/html/manual/status.html
libstdc++-v3/doc/html/manual/std_contents.html
libstdc++-v3/doc/xml/manual/containers.xml
libstdc++-v3/doc/xml/manual/status_cxx2011.xml
libstdc++-v3/include/bits/basic_string.h
libstdc++-v3/include/bits/hashtable.h
libstdc++-v3/include/bits/regex.h
libstdc++-v3/include/bits/stl_algo.h
libstdc++-v3/include/bits/stl_algobase.h
libstdc++-v3/include/bits/stl_function.h
libstdc++-v3/include/bits/stl_queue.h
libstdc++-v3/include/bits/stl_stack.h
libstdc++-v3/include/bits/unique_ptr.h
libstdc++-v3/include/bits/vector.tcc
libstdc++-v3/include/std/chrono
libstdc++-v3/include/std/complex
libstdc++-v3/include/std/iomanip
libstdc++-v3/include/std/mutex
libstdc++-v3/include/std/shared_mutex
libstdc++-v3/include/std/tuple
libstdc++-v3/include/std/type_traits
libstdc++-v3/include/std/utility
libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc
libstdc++-v3/testsuite/20_util/is_final/requirements/explicit_instantiation.cc [new file with mode: 0644]
libstdc++-v3/testsuite/20_util/is_final/requirements/typedefs.cc [new file with mode: 0644]
libstdc++-v3/testsuite/20_util/is_final/value.cc [new file with mode: 0644]
libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc
libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc
libstdc++-v3/testsuite/23_containers/priority_queue/requirements/uses_allocator.cc [new file with mode: 0644]
libstdc++-v3/testsuite/23_containers/queue/requirements/uses_allocator.cc [new file with mode: 0644]
libstdc++-v3/testsuite/23_containers/stack/requirements/uses_allocator.cc [new file with mode: 0644]
libstdc++-v3/testsuite/23_containers/unordered_set/63456.cc [new file with mode: 0644]
libstdc++-v3/testsuite/25_algorithms/random_shuffle/59603.cc [new file with mode: 0644]
libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc [new file with mode: 0644]
libstdc++-v3/testsuite/30_threads/try_lock/4.cc
libstdc++-v3/testsuite/experimental/feat-cxx14.cc [new file with mode: 0644]
libstdc++-v3/testsuite/experimental/feat-lib-fund.cc [new file with mode: 0644]
libstdc++-v3/testsuite/util/testsuite_tr1.h