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

[gfunck@gcc.gnu.org]

Author: gfunck
Date: Mon Jan 20 21:00:25 2014
New Revision: 206857

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

Added:
    branches/gupc/libstdc++-v3/testsuite/23_containers/unordered_set/56267-2.cc
      - copied unchanged from r206847, trunk/libstdc++-v3/testsuite/23_containers/unordered_set/56267-2.cc
Modified:
    branches/gupc/libstdc++-v3/ChangeLog
    branches/gupc/libstdc++-v3/include/bits/hashtable_policy.h
    branches/gupc/libstdc++-v3/include/debug/safe_local_iterator.h
    branches/gupc/libstdc++-v3/include/debug/unordered_map
    branches/gupc/libstdc++-v3/include/debug/unordered_set

Changes in other areas also in this revision:
Added:
    branches/gupc/gcc/ada/s-excmac-arm.ads
      - copied unchanged from r206847, trunk/gcc/ada/s-excmac-arm.ads
    branches/gupc/gcc/ada/s-excmac-gcc.ads
      - copied unchanged from r206847, trunk/gcc/ada/s-excmac-gcc.ads
    branches/gupc/gcc/testsuite/gcc.dg/pr59860.c
      - copied unchanged from r206847, trunk/gcc/testsuite/gcc.dg/pr59860.c
Modified:
    branches/gupc/   (props changed)
    branches/gupc/gcc/ChangeLog
    branches/gupc/gcc/ChangeLog.upc
    branches/gupc/gcc/ada/ChangeLog
    branches/gupc/gcc/ada/a-caldel.ads
    branches/gupc/gcc/ada/a-cfdlli.ads
    branches/gupc/gcc/ada/a-cfhama.ads
    branches/gupc/gcc/ada/a-cfhase.ads
    branches/gupc/gcc/ada/a-cforma.ads
    branches/gupc/gcc/ada/a-cforse.ads
    branches/gupc/gcc/ada/a-cofove.ads
    branches/gupc/gcc/ada/a-exexpr-gcc.adb
    branches/gupc/gcc/ada/adabkend.adb
    branches/gupc/gcc/ada/ali-util.adb
    branches/gupc/gcc/ada/aspects.adb
    branches/gupc/gcc/ada/aspects.ads
    branches/gupc/gcc/ada/atree.adb
    branches/gupc/gcc/ada/checks.adb
    branches/gupc/gcc/ada/debug.adb
    branches/gupc/gcc/ada/einfo.adb
    branches/gupc/gcc/ada/einfo.ads
    branches/gupc/gcc/ada/errout.adb
    branches/gupc/gcc/ada/errout.ads
    branches/gupc/gcc/ada/exp_aggr.adb
    branches/gupc/gcc/ada/exp_attr.adb
    branches/gupc/gcc/ada/exp_ch3.adb
    branches/gupc/gcc/ada/exp_ch4.adb
    branches/gupc/gcc/ada/exp_ch5.adb
    branches/gupc/gcc/ada/exp_ch6.adb
    branches/gupc/gcc/ada/exp_ch7.adb
    branches/gupc/gcc/ada/exp_ch9.adb
    branches/gupc/gcc/ada/exp_dbug.adb
    branches/gupc/gcc/ada/exp_disp.adb
    branches/gupc/gcc/ada/exp_dist.adb
    branches/gupc/gcc/ada/exp_intr.adb
    branches/gupc/gcc/ada/exp_prag.adb
    branches/gupc/gcc/ada/exp_spark.adb
    branches/gupc/gcc/ada/exp_spark.ads
    branches/gupc/gcc/ada/exp_util.adb
    branches/gupc/gcc/ada/expander.adb
    branches/gupc/gcc/ada/expander.ads
    branches/gupc/gcc/ada/freeze.adb
    branches/gupc/gcc/ada/frontend.adb
    branches/gupc/gcc/ada/g-arrspl.adb
    branches/gupc/gcc/ada/g-arrspl.ads
    branches/gupc/gcc/ada/gcc-interface/Makefile.in
    branches/gupc/gcc/ada/gcc-interface/decl.c
    branches/gupc/gcc/ada/gcc-interface/trans.c
    branches/gupc/gcc/ada/gcc-interface/utils.c
    branches/gupc/gcc/ada/gnat1drv.adb
    branches/gupc/gcc/ada/gnat_rm.texi
    branches/gupc/gcc/ada/gnat_ugn.texi
    branches/gupc/gcc/ada/lib-writ.adb
    branches/gupc/gcc/ada/lib-xref.adb
    branches/gupc/gcc/ada/opt.adb
    branches/gupc/gcc/ada/opt.ads
    branches/gupc/gcc/ada/par-ch10.adb
    branches/gupc/gcc/ada/par-ch4.adb
    branches/gupc/gcc/ada/par-ch8.adb
    branches/gupc/gcc/ada/par-prag.adb
    branches/gupc/gcc/ada/raise-gcc.c
    branches/gupc/gcc/ada/restrict.adb
    branches/gupc/gcc/ada/s-except.ads
    branches/gupc/gcc/ada/s-osinte-linux.ads
    branches/gupc/gcc/ada/s-taasde.ads
    branches/gupc/gcc/ada/s-tadeca.adb
    branches/gupc/gcc/ada/s-tadeca.ads
    branches/gupc/gcc/ada/s-taprop-posix.adb
    branches/gupc/gcc/ada/s-tataat.adb
    branches/gupc/gcc/ada/s-win32.ads
    branches/gupc/gcc/ada/sem.adb
    branches/gupc/gcc/ada/sem.ads
    branches/gupc/gcc/ada/sem_aggr.adb
    branches/gupc/gcc/ada/sem_attr.adb
    branches/gupc/gcc/ada/sem_aux.adb
    branches/gupc/gcc/ada/sem_aux.ads
    branches/gupc/gcc/ada/sem_cat.adb
    branches/gupc/gcc/ada/sem_ch10.adb
    branches/gupc/gcc/ada/sem_ch11.adb
    branches/gupc/gcc/ada/sem_ch12.adb
    branches/gupc/gcc/ada/sem_ch13.adb
    branches/gupc/gcc/ada/sem_ch3.adb
    branches/gupc/gcc/ada/sem_ch4.adb
    branches/gupc/gcc/ada/sem_ch5.adb
    branches/gupc/gcc/ada/sem_ch6.adb
    branches/gupc/gcc/ada/sem_ch7.adb
    branches/gupc/gcc/ada/sem_ch8.adb
    branches/gupc/gcc/ada/sem_ch9.adb
    branches/gupc/gcc/ada/sem_dim.adb
    branches/gupc/gcc/ada/sem_disp.adb
    branches/gupc/gcc/ada/sem_elab.adb
    branches/gupc/gcc/ada/sem_eval.adb
    branches/gupc/gcc/ada/sem_prag.adb
    branches/gupc/gcc/ada/sem_prag.ads
    branches/gupc/gcc/ada/sem_res.adb
    branches/gupc/gcc/ada/sem_type.adb
    branches/gupc/gcc/ada/sem_util.adb
    branches/gupc/gcc/ada/sem_util.ads
    branches/gupc/gcc/ada/sinfo.ads
    branches/gupc/gcc/ada/sinput.adb
    branches/gupc/gcc/ada/sinput.ads
    branches/gupc/gcc/ada/snames.ads-tmpl
    branches/gupc/gcc/ada/spark_xrefs.ads
    branches/gupc/gcc/ada/sysdep.c
    branches/gupc/gcc/ada/types.ads
    branches/gupc/gcc/builtins.c
    branches/gupc/gcc/c-family/ChangeLog
    branches/gupc/gcc/c-family/c-ada-spec.c
    branches/gupc/gcc/c-family/c-ada-spec.h
    branches/gupc/gcc/common/config/aarch64/aarch64-common.c
    branches/gupc/gcc/config/aarch64/aarch64-linux.h
    branches/gupc/gcc/config/aarch64/aarch64-protos.h
    branches/gupc/gcc/config/aarch64/aarch64.c
    branches/gupc/gcc/config/aarch64/aarch64.h
    branches/gupc/gcc/config/aarch64/aarch64.opt
    branches/gupc/gcc/config/i386/i386.c
    branches/gupc/gcc/config/i386/i386.md
    branches/gupc/gcc/config/rs6000/darwin.h
    branches/gupc/gcc/cp/ChangeLog
    branches/gupc/gcc/cp/decl2.c
    branches/gupc/gcc/doc/invoke.texi
    branches/gupc/gcc/testsuite/ChangeLog
    branches/gupc/libcilkrts/ChangeLog
    branches/gupc/libcilkrts/configure
    branches/gupc/libcilkrts/configure.ac
    branches/gupc/libcilkrts/runtime/os-unix.c

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