r189274 - in /branches/gupc: ./ ChangeLog confi...

[gfunck at gcc dot gnu dot org]

Author: gfunck
Date: Thu Jul  5 00:44:51 2012
New Revision: 189274

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

Added:
    branches/gupc/gcc/c/
      - copied from r189080, trunk/gcc/c/
    branches/gupc/gcc/c-family/cppspec.c
      - copied unchanged from r189080, trunk/gcc/c-family/cppspec.c
    branches/gupc/gcc/c/c-convert.c
      - copied unchanged from r189265, branches/gupc/gcc/c-convert.c
    branches/gupc/gcc/c/c-decl.c
      - copied, changed from r189265, branches/gupc/gcc/c-decl.c
    branches/gupc/gcc/c/c-objc-common.h
      - copied unchanged from r189265, branches/gupc/gcc/c-objc-common.h
    branches/gupc/gcc/c/c-parser.c
      - copied, changed from r189265, branches/gupc/gcc/c-parser.c
    branches/gupc/gcc/c/c-tree.h
      - copied unchanged from r189265, branches/gupc/gcc/c-tree.h
    branches/gupc/gcc/c/c-typeck.c
      - copied unchanged from r189265, branches/gupc/gcc/c-typeck.c
    branches/gupc/gcc/c/config-lang.in
      - copied, changed from r189265, branches/gupc/gcc/c-config-lang.in
Removed:
    branches/gupc/gcc/c-aux-info.c
    branches/gupc/gcc/c-config-lang.in
    branches/gupc/gcc/c-convert.c
    branches/gupc/gcc/c-decl.c
    branches/gupc/gcc/c-errors.c
    branches/gupc/gcc/c-lang.c
    branches/gupc/gcc/c-lang.h
    branches/gupc/gcc/c-objc-common.c
    branches/gupc/gcc/c-objc-common.h
    branches/gupc/gcc/c-parser.c
    branches/gupc/gcc/c-tree.h
    branches/gupc/gcc/c-typeck.c
    branches/gupc/gcc/cppspec.c
    branches/gupc/gcc/gccspec.c
Modified:
    branches/gupc/   (props changed)
    branches/gupc/ChangeLog
    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/c-family/ChangeLog
    branches/gupc/gcc/c/Make-lang.in
    branches/gupc/gcc/config/vms/vms-c.c
    branches/gupc/gcc/configure
    branches/gupc/gcc/configure.ac
    branches/gupc/gcc/cp/ChangeLog
    branches/gupc/gcc/cp/Make-lang.in
    branches/gupc/gcc/doc/gty.texi
    branches/gupc/gcc/doc/sourcebuild.texi
    branches/gupc/gcc/gengtype.c
    branches/gupc/gcc/objc/ChangeLog
    branches/gupc/gcc/objc/Make-lang.in
    branches/gupc/gcc/objc/config-lang.in
    branches/gupc/gcc/objc/objc-act.c
    branches/gupc/gcc/objc/objc-encoding.c
    branches/gupc/gcc/objc/objc-gnu-runtime-abi-01.c
    branches/gupc/gcc/objc/objc-lang.c
    branches/gupc/gcc/objc/objc-next-runtime-abi-01.c
    branches/gupc/gcc/objc/objc-next-runtime-abi-02.c
    branches/gupc/gcc/objc/objc-runtime-shared-support.c
    branches/gupc/gcc/upc/ChangeLog
    branches/gupc/gcc/upc/config-lang.in
    branches/gupc/gcc/upc/upc-act.c
    branches/gupc/gcc/upc/upc-gasp.c
    branches/gupc/gcc/upc/upc-genericize.c
    branches/gupc/gcc/upc/upc-lang.c
    branches/gupc/gcc/upc/upc-pts-struct.c

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