r156361 - in /branches/ibm/power7-meissner: ./ ...

[meissner at gcc dot gnu dot org]

Author: meissner
Date: Fri Jan 29 18:06:59 2010
New Revision: 156361

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=156361
Log:
Merge up to 156360.

Added:
    branches/ibm/power7-meissner/libstdc++-v3/testsuite/30_threads/condition_variable_any/requirements/
      - copied from r156360, trunk/libstdc++-v3/testsuite/30_threads/condition_variable_any/requirements/
Modified:
    branches/ibm/power7-meissner/libstdc++-v3/ChangeLog
    branches/ibm/power7-meissner/libstdc++-v3/config/abi/pre/gnu.ver
    branches/ibm/power7-meissner/libstdc++-v3/include/bits/stl_algobase.h
    branches/ibm/power7-meissner/libstdc++-v3/include/std/condition_variable
    branches/ibm/power7-meissner/libstdc++-v3/src/condition_variable.cc
    branches/ibm/power7-meissner/libstdc++-v3/testsuite/30_threads/condition_variable/cons/assign_neg.cc
    branches/ibm/power7-meissner/libstdc++-v3/testsuite/30_threads/condition_variable/cons/copy_neg.cc
    branches/ibm/power7-meissner/libstdc++-v3/testsuite/30_threads/condition_variable/members/1.cc
    branches/ibm/power7-meissner/libstdc++-v3/testsuite/30_threads/condition_variable/members/2.cc
    branches/ibm/power7-meissner/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/assign_neg.cc
    branches/ibm/power7-meissner/libstdc++-v3/testsuite/30_threads/condition_variable_any/cons/copy_neg.cc

Changes in other areas also in this revision:
Added:
    branches/ibm/power7-meissner/gcc/testsuite/g++.dg/other/crash-5.C
      - copied unchanged from r156360, trunk/gcc/testsuite/g++.dg/other/crash-5.C
    branches/ibm/power7-meissner/gcc/testsuite/g++.dg/other/crash-6.C
      - copied unchanged from r156360, trunk/gcc/testsuite/g++.dg/other/crash-6.C
    branches/ibm/power7-meissner/gcc/testsuite/g++.dg/other/crash-7.C
      - copied unchanged from r156360, trunk/gcc/testsuite/g++.dg/other/crash-7.C
    branches/ibm/power7-meissner/gcc/testsuite/g++.dg/other/crash-8.C
      - copied unchanged from r156360, trunk/gcc/testsuite/g++.dg/other/crash-8.C
    branches/ibm/power7-meissner/gcc/testsuite/gcc.dg/pr42889.c
      - copied unchanged from r156360, trunk/gcc/testsuite/gcc.dg/pr42889.c
Modified:
    branches/ibm/power7-meissner/   (props changed)
    branches/ibm/power7-meissner/fixincludes/ChangeLog
    branches/ibm/power7-meissner/fixincludes/fixincl.x
    branches/ibm/power7-meissner/fixincludes/inclhack.def
    branches/ibm/power7-meissner/fixincludes/tests/base/sys/int_const.h
    branches/ibm/power7-meissner/fixincludes/tests/base/sys/int_limits.h
    branches/ibm/power7-meissner/gcc/ChangeLog
    branches/ibm/power7-meissner/gcc/ChangeLog.power7
    branches/ibm/power7-meissner/gcc/DATESTAMP
    branches/ibm/power7-meissner/gcc/config/sparc/sparc.c
    branches/ibm/power7-meissner/gcc/cp/ChangeLog
    branches/ibm/power7-meissner/gcc/cp/cp-tree.h
    branches/ibm/power7-meissner/gcc/cp/decl.c
    branches/ibm/power7-meissner/gcc/cp/error.c
    branches/ibm/power7-meissner/gcc/cp/parser.c
    branches/ibm/power7-meissner/gcc/cp/pt.c
    branches/ibm/power7-meissner/gcc/cp/semantics.c
    branches/ibm/power7-meissner/gcc/df-core.c
    branches/ibm/power7-meissner/gcc/df-scan.c
    branches/ibm/power7-meissner/gcc/df.h
    branches/ibm/power7-meissner/gcc/ipa-inline.c
    branches/ibm/power7-meissner/gcc/testsuite/ChangeLog
    branches/ibm/power7-meissner/gcc/testsuite/g++.old-deja/g++.mike/eh16.C
    branches/ibm/power7-meissner/gcc/testsuite/g++.old-deja/g++.mike/eh17.C
    branches/ibm/power7-meissner/gcc/testsuite/g++.old-deja/g++.mike/p5571.C
    branches/ibm/power7-meissner/gcc/testsuite/gcc.target/i386/pr42881.c
    branches/ibm/power7-meissner/gcc/tree-ssa-ccp.c
    branches/ibm/power7-meissner/libgomp/ChangeLog
    branches/ibm/power7-meissner/libgomp/configure.tgt
    branches/ibm/power7-meissner/libgomp/testsuite/libgomp.c++/task-1.C
    branches/ibm/power7-meissner/libgomp/testsuite/libgomp.c++/task-6.C

Propchange: branches/ibm/power7-meissner/
            ('svn:mergeinfo' modified)

Propchange: branches/ibm/power7-meissner/
            ('svnmerge-integrated' modified)