r204973 - in /branches/gupc: ./ gcc/ChangeLog g...

[gfunck@gcc.gnu.org]

Author: gfunck
Date: Mon Nov 18 16:44:32 2013
New Revision: 204973

URL: http://gcc.gnu.org/viewcvs?rev=204973&root=gcc&view=rev
Log:
	Merge trunk version 204942 into gupc branch.

Added:
    branches/gupc/libstdc++-v3/include/experimental/string_view
      - copied unchanged from r204942, trunk/libstdc++-v3/include/experimental/string_view
    branches/gupc/libstdc++-v3/include/experimental/string_view.tcc
      - copied unchanged from r204942, trunk/libstdc++-v3/include/experimental/string_view.tcc
    branches/gupc/libstdc++-v3/testsuite/experimental/string_view/
      - copied from r204942, trunk/libstdc++-v3/testsuite/experimental/string_view/
Modified:
    branches/gupc/libstdc++-v3/ChangeLog
    branches/gupc/libstdc++-v3/include/Makefile.am
    branches/gupc/libstdc++-v3/include/Makefile.in
    branches/gupc/libstdc++-v3/testsuite/23_containers/unordered_set/55043.cc

Changes in other areas also in this revision:
Added:
    branches/gupc/gcc/cfgexpand.h
      - copied unchanged from r204942, trunk/gcc/cfgexpand.h
    branches/gupc/gcc/testsuite/g++.dg/cpp0x/constexpr-redeclaration1.C
      - copied unchanged from r204942, trunk/gcc/testsuite/g++.dg/cpp0x/constexpr-redeclaration1.C
    branches/gupc/gcc/testsuite/g++.dg/overload/addr2.C
      - copied unchanged from r204942, trunk/gcc/testsuite/g++.dg/overload/addr2.C
    branches/gupc/gcc/testsuite/gcc.target/i386/memcpy-2.c
      - copied unchanged from r204942, trunk/gcc/testsuite/gcc.target/i386/memcpy-2.c
    branches/gupc/gcc/testsuite/gcc.target/i386/pr59153.c
      - copied unchanged from r204942, trunk/gcc/testsuite/gcc.target/i386/pr59153.c
    branches/gupc/gcc/tree-nested.h
      - copied unchanged from r204942, trunk/gcc/tree-nested.h
Modified:
    branches/gupc/   (props changed)
    branches/gupc/gcc/ChangeLog
    branches/gupc/gcc/ChangeLog.upc
    branches/gupc/gcc/DATESTAMP
    branches/gupc/gcc/ada/ChangeLog
    branches/gupc/gcc/ada/gcc-interface/decl.c
    branches/gupc/gcc/builtins.c
    branches/gupc/gcc/builtins.h
    branches/gupc/gcc/cgraphunit.c
    branches/gupc/gcc/config.gcc
    branches/gupc/gcc/config/arc/arc.c
    branches/gupc/gcc/config/arc/constraints.md
    branches/gupc/gcc/config/arm/aarch-cost-tables.h
    branches/gupc/gcc/config/arm/arm-cores.def
    branches/gupc/gcc/config/arm/arm.c
    branches/gupc/gcc/config/i386/bdver3.md
    branches/gupc/gcc/config/i386/driver-i386.c
    branches/gupc/gcc/config/i386/i386-c.c
    branches/gupc/gcc/config/i386/i386-protos.h
    branches/gupc/gcc/config/i386/i386.c
    branches/gupc/gcc/config/i386/i386.h
    branches/gupc/gcc/config/i386/i386.md
    branches/gupc/gcc/config/i386/i386.opt
    branches/gupc/gcc/config/rs6000/rs6000.c
    branches/gupc/gcc/cp/ChangeLog
    branches/gupc/gcc/cp/decl.c
    branches/gupc/gcc/cp/semantics.c
    branches/gupc/gcc/doc/extend.texi
    branches/gupc/gcc/doc/invoke.texi
    branches/gupc/gcc/doc/md.texi
    branches/gupc/gcc/expr.c
    branches/gupc/gcc/expr.h
    branches/gupc/gcc/fortran/ChangeLog
    branches/gupc/gcc/fortran/trans-intrinsic.c
    branches/gupc/gcc/gimple-low.c
    branches/gupc/gcc/gimple.c
    branches/gupc/gcc/gimple.h
    branches/gupc/gcc/ipa-inline-analysis.c
    branches/gupc/gcc/omp-low.c
    branches/gupc/gcc/testsuite/ChangeLog
    branches/gupc/gcc/testsuite/g++.dg/cpp0x/constexpr-decl.C
    branches/gupc/gcc/testsuite/g++.old-deja/g++.other/overload11.C
    branches/gupc/gcc/trans-mem.h
    branches/gupc/gcc/tree-affine.c
    branches/gupc/gcc/tree-inline.h
    branches/gupc/gcc/tree-into-ssa.c
    branches/gupc/gcc/tree-parloops.c
    branches/gupc/gcc/tree-profile.c
    branches/gupc/gcc/tree-ssa-loop-im.c
    branches/gupc/gcc/tree-ssa-tail-merge.c
    branches/gupc/gcc/tree-ssa.c
    branches/gupc/gcc/tree.c
    branches/gupc/gcc/tree.h
    branches/gupc/gcc/value-prof.c
    branches/gupc/libbacktrace/ChangeLog
    branches/gupc/libbacktrace/backtrace.h
    branches/gupc/libbacktrace/btest.c
    branches/gupc/libbacktrace/elf.c
    branches/gupc/libffi/ChangeLog
    branches/gupc/libffi/doc/libffi.texi
    branches/gupc/libffi/src/powerpc/ffi.c
    branches/gupc/libffi/src/powerpc/ffitarget.h
    branches/gupc/libffi/src/powerpc/linux64.S
    branches/gupc/libffi/src/powerpc/linux64_closure.S
    branches/gupc/libffi/src/powerpc/ppc_closure.S
    branches/gupc/libffi/testsuite/libffi.call/cls_double_va.c
    branches/gupc/libffi/testsuite/libffi.call/cls_longdouble_va.c
    branches/gupc/libgfortran/ChangeLog
    branches/gupc/libgfortran/intrinsics/unpack_generic.c
    branches/gupc/libsanitizer/ChangeLog
    branches/gupc/libsanitizer/asan/Makefile.am
    branches/gupc/libsanitizer/asan/Makefile.in
    branches/gupc/libsanitizer/interception/Makefile.am
    branches/gupc/libsanitizer/interception/Makefile.in
    branches/gupc/libsanitizer/lsan/Makefile.am
    branches/gupc/libsanitizer/lsan/Makefile.in
    branches/gupc/libsanitizer/sanitizer_common/Makefile.am
    branches/gupc/libsanitizer/sanitizer_common/Makefile.in
    branches/gupc/libsanitizer/tsan/Makefile.am
    branches/gupc/libsanitizer/tsan/Makefile.in

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