r189445 - in /branches/gupc: ./ ChangeLog Makef...

[gfunck at gcc dot gnu dot org]

Author: gfunck
Date: Thu Jul 12 23:13:37 2012
New Revision: 189445

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

Added:
    branches/gupc/libstdc++-v3/testsuite/30_threads/thread/adl.cc
      - copied unchanged from r189366, trunk/libstdc++-v3/testsuite/30_threads/thread/adl.cc
Modified:
    branches/gupc/libstdc++-v3/ChangeLog
    branches/gupc/libstdc++-v3/include/std/condition_variable
    branches/gupc/libstdc++-v3/include/std/thread

Changes in other areas also in this revision:
Added:
    branches/gupc/gcc/po/hr.po
      - copied unchanged from r189366, trunk/gcc/po/hr.po
    branches/gupc/gcc/testsuite/g++.dg/cpp0x/alias-decl-20.C
      - copied unchanged from r189366, trunk/gcc/testsuite/g++.dg/cpp0x/alias-decl-20.C
    branches/gupc/gcc/testsuite/g++.dg/cpp0x/variadic133.C
      - copied unchanged from r189366, trunk/gcc/testsuite/g++.dg/cpp0x/variadic133.C
    branches/gupc/gcc/testsuite/g++.dg/cpp0x/variadic134.C
      - copied unchanged from r189366, trunk/gcc/testsuite/g++.dg/cpp0x/variadic134.C
    branches/gupc/gcc/testsuite/g++.dg/template/typedef39.C
      - copied unchanged from r189366, trunk/gcc/testsuite/g++.dg/template/typedef39.C
    branches/gupc/gcc/testsuite/gcc.dg/pr51879-16.c
      - copied unchanged from r189366, trunk/gcc/testsuite/gcc.dg/pr51879-16.c
    branches/gupc/gcc/testsuite/gcc.dg/pr51879-17.c
      - copied unchanged from r189366, trunk/gcc/testsuite/gcc.dg/pr51879-17.c
    branches/gupc/gcc/testsuite/gcc.dg/pr51879-18.c
      - copied unchanged from r189366, trunk/gcc/testsuite/gcc.dg/pr51879-18.c
    branches/gupc/gcc/testsuite/gcc.dg/pr51879-7.c
      - copied unchanged from r189366, trunk/gcc/testsuite/gcc.dg/pr51879-7.c
    branches/gupc/gcc/testsuite/gcc.dg/pr53881.c
      - copied unchanged from r189366, trunk/gcc/testsuite/gcc.dg/pr53881.c
    branches/gupc/gcc/testsuite/gcc.target/arm/fma-sp.c
      - copied unchanged from r189366, trunk/gcc/testsuite/gcc.target/arm/fma-sp.c
    branches/gupc/gcc/testsuite/gcc.target/arm/fma.c
      - copied unchanged from r189366, trunk/gcc/testsuite/gcc.target/arm/fma.c
    branches/gupc/gcc/testsuite/gcc.target/arm/fma.h
      - copied unchanged from r189366, trunk/gcc/testsuite/gcc.target/arm/fma.h
    branches/gupc/gcc/testsuite/gfortran.dg/inline_sum_4.f90
      - copied unchanged from r189366, trunk/gcc/testsuite/gfortran.dg/inline_sum_4.f90
Modified:
    branches/gupc/   (props changed)
    branches/gupc/ChangeLog
    branches/gupc/Makefile.def
    branches/gupc/Makefile.in
    branches/gupc/configure
    branches/gupc/configure.ac
    branches/gupc/gcc/ChangeLog
    branches/gupc/gcc/ChangeLog.upc
    branches/gupc/gcc/DATESTAMP
    branches/gupc/gcc/Makefile.in
    branches/gupc/gcc/alias.c
    branches/gupc/gcc/alias.h
    branches/gupc/gcc/basic-block.h
    branches/gupc/gcc/bb-reorder.c
    branches/gupc/gcc/c-family/ChangeLog
    branches/gupc/gcc/c-family/c-common.h
    branches/gupc/gcc/cfg.c
    branches/gupc/gcc/cfganal.c
    branches/gupc/gcc/cfgcleanup.c
    branches/gupc/gcc/cfghooks.c
    branches/gupc/gcc/cfgrtl.c
    branches/gupc/gcc/combine.c
    branches/gupc/gcc/config.gcc
    branches/gupc/gcc/config/arm/aout.h
    branches/gupc/gcc/config/arm/arm-arches.def
    branches/gupc/gcc/config/arm/arm-cores.def
    branches/gupc/gcc/config/arm/arm-protos.h
    branches/gupc/gcc/config/arm/arm-tables.opt
    branches/gupc/gcc/config/arm/arm.c
    branches/gupc/gcc/config/arm/arm.h
    branches/gupc/gcc/config/arm/arm.md
    branches/gupc/gcc/config/arm/arm_neon.h
    branches/gupc/gcc/config/arm/iterators.md
    branches/gupc/gcc/config/arm/linux-elf.h
    branches/gupc/gcc/config/arm/neon-gen.ml
    branches/gupc/gcc/config/arm/neon.ml
    branches/gupc/gcc/config/arm/vfp.md
    branches/gupc/gcc/config/i386/i386-protos.h
    branches/gupc/gcc/config/i386/i386.c
    branches/gupc/gcc/config/i386/i386.md
    branches/gupc/gcc/config/i386/mingw32.h
    branches/gupc/gcc/config/mn10300/mn10300.c
    branches/gupc/gcc/config/s390/s390-protos.h
    branches/gupc/gcc/config/s390/s390.c
    branches/gupc/gcc/config/s390/s390.md
    branches/gupc/gcc/config/sh/sh-protos.h
    branches/gupc/gcc/config/sh/sh.c
    branches/gupc/gcc/config/sh/sh.md
    branches/gupc/gcc/configure
    branches/gupc/gcc/configure.ac
    branches/gupc/gcc/cp/ChangeLog
    branches/gupc/gcc/cp/cp-tree.h
    branches/gupc/gcc/cp/decl.c
    branches/gupc/gcc/cp/name-lookup.c
    branches/gupc/gcc/cp/parser.c
    branches/gupc/gcc/cp/pt.c
    branches/gupc/gcc/cp/tree.c
    branches/gupc/gcc/cp/typeck.c
    branches/gupc/gcc/cppbuiltin.h
    branches/gupc/gcc/cselib.c
    branches/gupc/gcc/df-core.c
    branches/gupc/gcc/doc/cfg.texi
    branches/gupc/gcc/double-int.h
    branches/gupc/gcc/dwarf2out.c
    branches/gupc/gcc/expmed.c
    branches/gupc/gcc/expr.c
    branches/gupc/gcc/final.c
    branches/gupc/gcc/flags.h
    branches/gupc/gcc/fortran/ChangeLog
    branches/gupc/gcc/fortran/arith.c
    branches/gupc/gcc/fortran/array.c
    branches/gupc/gcc/fortran/bbt.c
    branches/gupc/gcc/fortran/check.c
    branches/gupc/gcc/fortran/class.c
    branches/gupc/gcc/fortran/constructor.c
    branches/gupc/gcc/fortran/data.c
    branches/gupc/gcc/fortran/decl.c
    branches/gupc/gcc/fortran/dependency.c
    branches/gupc/gcc/fortran/dump-parse-tree.c
    branches/gupc/gcc/fortran/error.c
    branches/gupc/gcc/fortran/expr.c
    branches/gupc/gcc/fortran/frontend-passes.c
    branches/gupc/gcc/fortran/gfortran.h
    branches/gupc/gcc/fortran/interface.c
    branches/gupc/gcc/fortran/intrinsic.c
    branches/gupc/gcc/fortran/io.c
    branches/gupc/gcc/fortran/match.c
    branches/gupc/gcc/fortran/matchexp.c
    branches/gupc/gcc/fortran/misc.c
    branches/gupc/gcc/fortran/module.c
    branches/gupc/gcc/fortran/openmp.c
    branches/gupc/gcc/fortran/parse.c
    branches/gupc/gcc/fortran/primary.c
    branches/gupc/gcc/fortran/resolve.c
    branches/gupc/gcc/fortran/scanner.c
    branches/gupc/gcc/fortran/simplify.c
    branches/gupc/gcc/fortran/st.c
    branches/gupc/gcc/fortran/symbol.c
    branches/gupc/gcc/fortran/target-memory.c
    branches/gupc/gcc/fortran/trans-array.c
    branches/gupc/gcc/function.c
    branches/gupc/gcc/function.h
    branches/gupc/gcc/gencodes.c
    branches/gupc/gcc/gengtype.h
    branches/gupc/gcc/genoutput.c
    branches/gupc/gcc/genpeep.c
    branches/gupc/gcc/gensupport.c
    branches/gupc/gcc/gimple-fold.h
    branches/gupc/gcc/gimple.h
    branches/gupc/gcc/ifcvt.c
    branches/gupc/gcc/ira-conflicts.c
    branches/gupc/gcc/java/ChangeLog
    branches/gupc/gcc/java/jcf-io.c
    branches/gupc/gcc/java/verify-impl.c
    branches/gupc/gcc/java/verify.h
    branches/gupc/gcc/langhooks.h
    branches/gupc/gcc/loop-init.c
    branches/gupc/gcc/mcf.c
    branches/gupc/gcc/optabs.h
    branches/gupc/gcc/po/ChangeLog
    branches/gupc/gcc/predict.c
    branches/gupc/gcc/profile.c
    branches/gupc/gcc/reginfo.c
    branches/gupc/gcc/regs.h
    branches/gupc/gcc/regset.h
    branches/gupc/gcc/regstat.c
    branches/gupc/gcc/rtl.h
    branches/gupc/gcc/sched-deps.c
    branches/gupc/gcc/sched-vis.c
    branches/gupc/gcc/statistics.c
    branches/gupc/gcc/stmt.c
    branches/gupc/gcc/testsuite/ChangeLog
    branches/gupc/gcc/testsuite/g++.dg/template/param1.C
    branches/gupc/gcc/testsuite/gcc.c-torture/compile/20000326-1.c
    branches/gupc/gcc/testsuite/gcc.target/arm/neon/vtrnf32.c
    branches/gupc/gcc/testsuite/gcc.target/arm/neon/vtrns32.c
    branches/gupc/gcc/testsuite/gcc.target/arm/neon/vtrnu32.c
    branches/gupc/gcc/testsuite/gcc.target/arm/neon/vzipf32.c
    branches/gupc/gcc/testsuite/gcc.target/arm/neon/vzips32.c
    branches/gupc/gcc/testsuite/gcc.target/arm/neon/vzipu32.c
    branches/gupc/gcc/tracer.c
    branches/gupc/gcc/tree-inline.c
    branches/gupc/gcc/tree-pretty-print.c
    branches/gupc/gcc/tree-ssa-alias.h
    branches/gupc/gcc/tree-ssa-sccvn.c
    branches/gupc/gcc/tree-ssa-sccvn.h
    branches/gupc/gcc/tree-ssa-tail-merge.c
    branches/gupc/gcc/tree-switch-conversion.c
    branches/gupc/gcc/var-tracking.c
    branches/gupc/libgomp/ChangeLog
    branches/gupc/libgomp/libgomp.texi

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