r177210 - in /branches/redhat/gcc-4_6-branch: ....

[jakub at gcc dot gnu dot org]

Author: jakub
Date: Tue Aug  2 20:09:03 2011
New Revision: 177210

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=177210
Log:
svn merge -r177193:177194 svn+ssh://gcc.gnu.org/svn/gcc/trunk

Added:
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/gomp/atomic-15.C
      - copied unchanged from r177194, trunk/gcc/testsuite/g++.dg/gomp/atomic-15.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/gomp/private-1.C
      - copied unchanged from r177194, trunk/gcc/testsuite/g++.dg/gomp/private-1.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/gomp/sharing-2.C
      - copied unchanged from r177194, trunk/gcc/testsuite/g++.dg/gomp/sharing-2.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/gomp/atomic-15.c
      - copied unchanged from r177194, trunk/gcc/testsuite/gcc.dg/gomp/atomic-15.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gfortran.dg/gomp/omp_atomic2.f90
      - copied unchanged from r177194, trunk/gcc/testsuite/gfortran.dg/gomp/omp_atomic2.f90
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/atomic-2.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/atomic-2.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/atomic-3.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/atomic-3.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/atomic-4.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/atomic-4.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/atomic-5.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/atomic-5.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/atomic-6.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/atomic-6.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/atomic-7.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/atomic-7.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/atomic-8.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/atomic-8.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/atomic-9.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/atomic-9.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/reduction-4.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/reduction-4.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c++/task-8.C
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c++/task-8.C
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c/atomic-11.c
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c/atomic-11.c
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c/atomic-12.c
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c/atomic-12.c
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c/atomic-13.c
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c/atomic-13.c
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c/atomic-14.c
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c/atomic-14.c
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c/reduction-6.c
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c/reduction-6.c
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.c/task-5.c
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.c/task-5.c
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.fortran/allocatable7.f90
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.fortran/allocatable7.f90
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.fortran/allocatable8.f90
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.fortran/allocatable8.f90
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.fortran/crayptr3.f90
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.fortran/crayptr3.f90
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.fortran/omp_atomic3.f90
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.fortran/omp_atomic3.f90
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.fortran/omp_atomic4.f90
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.fortran/omp_atomic4.f90
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.fortran/pointer1.f90
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.fortran/pointer1.f90
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.fortran/pointer2.f90
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.fortran/pointer2.f90
    branches/redhat/gcc-4_6-branch/libgomp/testsuite/libgomp.fortran/task4.f90
      - copied unchanged from r177194, trunk/libgomp/testsuite/libgomp.fortran/task4.f90
Modified:
    branches/redhat/gcc-4_6-branch/   (props changed)
    branches/redhat/gcc-4_6-branch/gcc/ChangeLog
    branches/redhat/gcc-4_6-branch/gcc/c-family/ChangeLog
    branches/redhat/gcc-4_6-branch/gcc/c-family/c-common.h
    branches/redhat/gcc-4_6-branch/gcc/c-family/c-cppbuiltin.c
    branches/redhat/gcc-4_6-branch/gcc/c-family/c-omp.c
    branches/redhat/gcc-4_6-branch/gcc/c-family/c-pragma.c
    branches/redhat/gcc-4_6-branch/gcc/c-family/c-pragma.h
    branches/redhat/gcc-4_6-branch/gcc/c-parser.c
    branches/redhat/gcc-4_6-branch/gcc/c-typeck.c
    branches/redhat/gcc-4_6-branch/gcc/cp/ChangeLog
    branches/redhat/gcc-4_6-branch/gcc/cp/cp-gimplify.c
    branches/redhat/gcc-4_6-branch/gcc/cp/cp-tree.h
    branches/redhat/gcc-4_6-branch/gcc/cp/parser.c
    branches/redhat/gcc-4_6-branch/gcc/cp/pt.c
    branches/redhat/gcc-4_6-branch/gcc/cp/semantics.c
    branches/redhat/gcc-4_6-branch/gcc/doc/generic.texi
    branches/redhat/gcc-4_6-branch/gcc/fortran/ChangeLog
    branches/redhat/gcc-4_6-branch/gcc/fortran/cpp.c
    branches/redhat/gcc-4_6-branch/gcc/fortran/dump-parse-tree.c
    branches/redhat/gcc-4_6-branch/gcc/fortran/frontend-passes.c
    branches/redhat/gcc-4_6-branch/gcc/fortran/gfortran.h
    branches/redhat/gcc-4_6-branch/gcc/fortran/gfortran.texi
    branches/redhat/gcc-4_6-branch/gcc/fortran/intrinsic.texi
    branches/redhat/gcc-4_6-branch/gcc/fortran/match.h
    branches/redhat/gcc-4_6-branch/gcc/fortran/openmp.c
    branches/redhat/gcc-4_6-branch/gcc/fortran/parse.c
    branches/redhat/gcc-4_6-branch/gcc/fortran/resolve.c
    branches/redhat/gcc-4_6-branch/gcc/fortran/st.c
    branches/redhat/gcc-4_6-branch/gcc/fortran/trans-openmp.c
    branches/redhat/gcc-4_6-branch/gcc/fortran/trans.c
    branches/redhat/gcc-4_6-branch/gcc/gimple.h
    branches/redhat/gcc-4_6-branch/gcc/gimplify.c
    branches/redhat/gcc-4_6-branch/gcc/omp-builtins.def
    branches/redhat/gcc-4_6-branch/gcc/omp-low.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/ChangeLog
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/gomp/atomic-5.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/g++.dg/gomp/clause-3.C
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/gomp/atomic-5.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gcc.dg/gomp/clause-1.c
    branches/redhat/gcc-4_6-branch/gcc/testsuite/gfortran.dg/gomp/crayptr1.f90
    branches/redhat/gcc-4_6-branch/gcc/tree-nested.c
    branches/redhat/gcc-4_6-branch/gcc/tree-pretty-print.c
    branches/redhat/gcc-4_6-branch/gcc/tree.c
    branches/redhat/gcc-4_6-branch/gcc/tree.def
    branches/redhat/gcc-4_6-branch/gcc/tree.h
    branches/redhat/gcc-4_6-branch/libgomp/ChangeLog
    branches/redhat/gcc-4_6-branch/libgomp/config/linux/affinity.c
    branches/redhat/gcc-4_6-branch/libgomp/env.c
    branches/redhat/gcc-4_6-branch/libgomp/fortran.c
    branches/redhat/gcc-4_6-branch/libgomp/libgomp.h
    branches/redhat/gcc-4_6-branch/libgomp/libgomp.map
    branches/redhat/gcc-4_6-branch/libgomp/libgomp.texi
    branches/redhat/gcc-4_6-branch/libgomp/libgomp_g.h
    branches/redhat/gcc-4_6-branch/libgomp/omp.h.in
    branches/redhat/gcc-4_6-branch/libgomp/omp_lib.f90.in
    branches/redhat/gcc-4_6-branch/libgomp/omp_lib.h.in
    branches/redhat/gcc-4_6-branch/libgomp/task.c
    branches/redhat/gcc-4_6-branch/libgomp/team.c

Propchange: branches/redhat/gcc-4_6-branch/
            ('svn:mergeinfo' modified)