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

[gfunck@gcc.gnu.org]

Author: gfunck
Date: Thu Oct 20 21:03:41 2011
New Revision: 180274

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

Added:
    branches/gupc/gcc/testsuite/gnat.dg/source_ref1.adb
      - copied unchanged from r180246, trunk/gcc/testsuite/gnat.dg/source_ref1.adb
    branches/gupc/gcc/testsuite/gnat.dg/source_ref2.adb
      - copied unchanged from r180246, trunk/gcc/testsuite/gnat.dg/source_ref2.adb
Modified:
    branches/gupc/   (props changed)
    branches/gupc/gcc/ChangeLog
    branches/gupc/gcc/ChangeLog.upc
    branches/gupc/gcc/ada/ChangeLog
    branches/gupc/gcc/ada/back_end.adb
    branches/gupc/gcc/ada/gcc-interface/Make-lang.in
    branches/gupc/gcc/ada/gcc-interface/trans.c
    branches/gupc/gcc/config/arm/arm.c
    branches/gupc/gcc/config/m68k/t-linux
    branches/gupc/gcc/config/sparc/sparc.c
    branches/gupc/gcc/testsuite/ChangeLog
    branches/gupc/gcc/testsuite/g++.dg/torture/pr34850.C
    branches/gupc/gcc/testsuite/gcc.c-torture/compile/sync-1.c
    branches/gupc/gcc/testsuite/gcc.c-torture/compile/sync-2.c
    branches/gupc/gcc/testsuite/gcc.c-torture/compile/sync-3.c
    branches/gupc/gcc/testsuite/gcc.c-torture/execute/builtins/strstr-asm.c
    branches/gupc/gcc/testsuite/gcc.dg/noncompile/920507-1.c
    branches/gupc/gcc/testsuite/gcc.dg/noncompile/invalid_asm.c
    branches/gupc/gcc/testsuite/gcc.dg/torture/pr36400.c
    branches/gupc/gcc/testsuite/lib/c-torture.exp
    branches/gupc/gcc/testsuite/lib/gcc-dg.exp
    branches/gupc/gcc/testsuite/lib/lto.exp
    branches/gupc/gcc/tree-ssa-loop-im.c
    branches/gupc/libcpp/ChangeLog
    branches/gupc/libcpp/lex.c

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