r145698 - in /branches/multi-target-4_4-branch:...

[amylaar at gcc dot gnu dot org]

Author: amylaar
Date: Tue Apr  7 18:32:19 2009
New Revision: 145698

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=145698
Log:
Merge gcc-in-cxx branch into multi-target-4_4-branch.

svn merge svn+ssh://amylaar@gcc.gnu.org/svn/gcc/trunk@144602 svn+ssh://amylaar@gcc.gnu.org/svn/gcc/branches/gcc-in-cxx@145084 .
and resolved conflicts:
C    gcc/ChangeLog (entry moved to gcc/ChangeLog.cxx)
C    gcc/cp/cp-tree.h
C    gcc/df.h

Modified:
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_1.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char/1.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/wchar_t/1.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/headers/forward_list/synopsis.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/typedefs.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/typedefs.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/unordered_multiset/requirements/typedefs.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/typedefs.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/30_threads/condition_variable/members/   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/30_threads/this_thread/   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/30_threads/thread/members/   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/30_threads/thread/swap/   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/typedefs.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/typedefs.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/typedefs.cc   (props changed)
    branches/multi-target-4_4-branch/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/typedefs.cc   (props changed)

Changes in other areas also in this revision:
Added:
    branches/multi-target-4_4-branch/ChangeLog.cxx
      - copied unchanged from r145084, branches/gcc-in-cxx/ChangeLog.cxx
    branches/multi-target-4_4-branch/gcc/ChangeLog.cxx
      - copied, changed from r145084, branches/gcc-in-cxx/gcc/ChangeLog.cxx
    branches/multi-target-4_4-branch/gcc/java/ChangeLog.cxx
      - copied unchanged from r145084, branches/gcc-in-cxx/gcc/java/ChangeLog.cxx
    branches/multi-target-4_4-branch/include/ChangeLog.cxx
      - copied unchanged from r145084, branches/gcc-in-cxx/include/ChangeLog.cxx
    branches/multi-target-4_4-branch/libcpp/ChangeLog.cxx
      - copied unchanged from r145084, branches/gcc-in-cxx/libcpp/ChangeLog.cxx
    branches/multi-target-4_4-branch/libdecnumber/ChangeLog.cxx
      - copied unchanged from r145084, branches/gcc-in-cxx/libdecnumber/ChangeLog.cxx
Modified:
    branches/multi-target-4_4-branch/   (props changed)
    branches/multi-target-4_4-branch/Makefile.def
    branches/multi-target-4_4-branch/Makefile.in
    branches/multi-target-4_4-branch/Makefile.tpl
    branches/multi-target-4_4-branch/configure
    branches/multi-target-4_4-branch/configure.ac
    branches/multi-target-4_4-branch/gcc/ChangeLog-2008   (props changed)
    branches/multi-target-4_4-branch/gcc/Makefile.in
    branches/multi-target-4_4-branch/gcc/alias.c
    branches/multi-target-4_4-branch/gcc/attribs.c
    branches/multi-target-4_4-branch/gcc/basic-block.h
    branches/multi-target-4_4-branch/gcc/bitmap.c
    branches/multi-target-4_4-branch/gcc/bt-load.c
    branches/multi-target-4_4-branch/gcc/builtins.c
    branches/multi-target-4_4-branch/gcc/c-pch.c
    branches/multi-target-4_4-branch/gcc/calls.c
    branches/multi-target-4_4-branch/gcc/cfglayout.c
    branches/multi-target-4_4-branch/gcc/cfgrtl.c
    branches/multi-target-4_4-branch/gcc/cgraph.h
    branches/multi-target-4_4-branch/gcc/cgraphbuild.c
    branches/multi-target-4_4-branch/gcc/cgraphunit.c
    branches/multi-target-4_4-branch/gcc/collect2.c
    branches/multi-target-4_4-branch/gcc/combine-stack-adj.c
    branches/multi-target-4_4-branch/gcc/combine.c
    branches/multi-target-4_4-branch/gcc/config/i386/i386-c.c
    branches/multi-target-4_4-branch/gcc/config/i386/i386.c
    branches/multi-target-4_4-branch/gcc/config/i386/i386.md
    branches/multi-target-4_4-branch/gcc/config/i386/t-i386
    branches/multi-target-4_4-branch/gcc/config/i386/x-darwin
    branches/multi-target-4_4-branch/gcc/config/i386/x-i386
    branches/multi-target-4_4-branch/gcc/config/linux.opt
    branches/multi-target-4_4-branch/gcc/config/t-darwin
    branches/multi-target-4_4-branch/gcc/config/x-darwin
    branches/multi-target-4_4-branch/gcc/config/x-linux
    branches/multi-target-4_4-branch/gcc/configure
    branches/multi-target-4_4-branch/gcc/configure.ac
    branches/multi-target-4_4-branch/gcc/cp/Make-lang.in
    branches/multi-target-4_4-branch/gcc/cp/call.c
    branches/multi-target-4_4-branch/gcc/cp/class.c
    branches/multi-target-4_4-branch/gcc/cp/cp-gimplify.c
    branches/multi-target-4_4-branch/gcc/cp/cp-lang.c
    branches/multi-target-4_4-branch/gcc/cp/cp-objcp-common.h
    branches/multi-target-4_4-branch/gcc/cp/cp-tree.h
    branches/multi-target-4_4-branch/gcc/cp/cvt.c
    branches/multi-target-4_4-branch/gcc/cp/decl.c
    branches/multi-target-4_4-branch/gcc/cp/decl2.c
    branches/multi-target-4_4-branch/gcc/cp/error.c
    branches/multi-target-4_4-branch/gcc/cp/init.c
    branches/multi-target-4_4-branch/gcc/cp/parser.c
    branches/multi-target-4_4-branch/gcc/cp/pt.c
    branches/multi-target-4_4-branch/gcc/cp/rtti.c
    branches/multi-target-4_4-branch/gcc/cp/search.c
    branches/multi-target-4_4-branch/gcc/cp/semantics.c
    branches/multi-target-4_4-branch/gcc/cp/tree.c
    branches/multi-target-4_4-branch/gcc/cp/typeck.c
    branches/multi-target-4_4-branch/gcc/cp/typeck2.c
    branches/multi-target-4_4-branch/gcc/cse.c
    branches/multi-target-4_4-branch/gcc/dbgcnt.c
    branches/multi-target-4_4-branch/gcc/dbxout.c
    branches/multi-target-4_4-branch/gcc/dce.c
    branches/multi-target-4_4-branch/gcc/df-core.c
    branches/multi-target-4_4-branch/gcc/df-problems.c
    branches/multi-target-4_4-branch/gcc/df-scan.c
    branches/multi-target-4_4-branch/gcc/df.h
    branches/multi-target-4_4-branch/gcc/dominance.c
    branches/multi-target-4_4-branch/gcc/double-int.c
    branches/multi-target-4_4-branch/gcc/dse.c
    branches/multi-target-4_4-branch/gcc/dummy-checksum.c
    branches/multi-target-4_4-branch/gcc/dwarf2.h
    branches/multi-target-4_4-branch/gcc/dwarf2out.c
    branches/multi-target-4_4-branch/gcc/emit-rtl.c
    branches/multi-target-4_4-branch/gcc/errors.h
    branches/multi-target-4_4-branch/gcc/except.c
    branches/multi-target-4_4-branch/gcc/except.h
    branches/multi-target-4_4-branch/gcc/expmed.c
    branches/multi-target-4_4-branch/gcc/expr.c
    branches/multi-target-4_4-branch/gcc/final.c
    branches/multi-target-4_4-branch/gcc/fixed-value.c
    branches/multi-target-4_4-branch/gcc/fixed-value.h
    branches/multi-target-4_4-branch/gcc/fold-const.c
    branches/multi-target-4_4-branch/gcc/fortran/Make-lang.in
    branches/multi-target-4_4-branch/gcc/fortran/cpp.c
    branches/multi-target-4_4-branch/gcc/fortran/decl.c
    branches/multi-target-4_4-branch/gcc/fortran/dump-parse-tree.c
    branches/multi-target-4_4-branch/gcc/fortran/gfortran.h
    branches/multi-target-4_4-branch/gcc/fortran/interface.c
    branches/multi-target-4_4-branch/gcc/fortran/module.c
    branches/multi-target-4_4-branch/gcc/fortran/parse.c
    branches/multi-target-4_4-branch/gcc/fortran/resolve.c
    branches/multi-target-4_4-branch/gcc/fortran/symbol.c
    branches/multi-target-4_4-branch/gcc/fortran/trans-intrinsic.c
    branches/multi-target-4_4-branch/gcc/fortran/trans-io.c
    branches/multi-target-4_4-branch/gcc/fortran/trans-types.c
    branches/multi-target-4_4-branch/gcc/function.c
    branches/multi-target-4_4-branch/gcc/function.h
    branches/multi-target-4_4-branch/gcc/fwprop.c
    branches/multi-target-4_4-branch/gcc/gcc.c
    branches/multi-target-4_4-branch/gcc/gcov.c
    branches/multi-target-4_4-branch/gcc/genattrtab.c
    branches/multi-target-4_4-branch/gcc/genautomata.c
    branches/multi-target-4_4-branch/gcc/genchecksum.c
    branches/multi-target-4_4-branch/gcc/gengtype.c
    branches/multi-target-4_4-branch/gcc/genrecog.c
    branches/multi-target-4_4-branch/gcc/gensupport.c
    branches/multi-target-4_4-branch/gcc/ggc-page.c
    branches/multi-target-4_4-branch/gcc/gimple-low.c
    branches/multi-target-4_4-branch/gcc/gimple.c
    branches/multi-target-4_4-branch/gcc/gimple.h
    branches/multi-target-4_4-branch/gcc/gimplify.c
    branches/multi-target-4_4-branch/gcc/haifa-sched.c
    branches/multi-target-4_4-branch/gcc/hooks.c
    branches/multi-target-4_4-branch/gcc/hooks.h
    branches/multi-target-4_4-branch/gcc/init-regs.c
    branches/multi-target-4_4-branch/gcc/integrate.c
    branches/multi-target-4_4-branch/gcc/ipa-cp.c
    branches/multi-target-4_4-branch/gcc/ipa-inline.c
    branches/multi-target-4_4-branch/gcc/ipa-prop.c
    branches/multi-target-4_4-branch/gcc/ipa-pure-const.c
    branches/multi-target-4_4-branch/gcc/ipa-reference.c
    branches/multi-target-4_4-branch/gcc/ipa-struct-reorg.c
    branches/multi-target-4_4-branch/gcc/ira-build.c
    branches/multi-target-4_4-branch/gcc/ira-costs.c
    branches/multi-target-4_4-branch/gcc/ira.c
    branches/multi-target-4_4-branch/gcc/java/Make-lang.in
    branches/multi-target-4_4-branch/gcc/java/builtins.c
    branches/multi-target-4_4-branch/gcc/java/jcf-io.c
    branches/multi-target-4_4-branch/gcc/java/jcf-parse.c
    branches/multi-target-4_4-branch/gcc/java/mangle.c
    branches/multi-target-4_4-branch/gcc/java/verify-impl.c
    branches/multi-target-4_4-branch/gcc/java/verify.h
    branches/multi-target-4_4-branch/gcc/jump.c
    branches/multi-target-4_4-branch/gcc/langhooks.c
    branches/multi-target-4_4-branch/gcc/lists.c
    branches/multi-target-4_4-branch/gcc/machmode.h
    branches/multi-target-4_4-branch/gcc/main.c
    branches/multi-target-4_4-branch/gcc/matrix-reorg.c
    branches/multi-target-4_4-branch/gcc/mcf.c
    branches/multi-target-4_4-branch/gcc/objc/Make-lang.in
    branches/multi-target-4_4-branch/gcc/objc/objc-act.c
    branches/multi-target-4_4-branch/gcc/objc/objc-act.h
    branches/multi-target-4_4-branch/gcc/objcp/objcp-lang.c
    branches/multi-target-4_4-branch/gcc/omega.c
    branches/multi-target-4_4-branch/gcc/omega.h
    branches/multi-target-4_4-branch/gcc/omp-low.c
    branches/multi-target-4_4-branch/gcc/optabs.c
    branches/multi-target-4_4-branch/gcc/optabs.h
    branches/multi-target-4_4-branch/gcc/opts.c
    branches/multi-target-4_4-branch/gcc/passes.c
    branches/multi-target-4_4-branch/gcc/postreload-gcse.c
    branches/multi-target-4_4-branch/gcc/postreload.c
    branches/multi-target-4_4-branch/gcc/predict.c
    branches/multi-target-4_4-branch/gcc/profile.c
    branches/multi-target-4_4-branch/gcc/real.c
    branches/multi-target-4_4-branch/gcc/recog.c
    branches/multi-target-4_4-branch/gcc/reginfo.c
    branches/multi-target-4_4-branch/gcc/regmove.c
    branches/multi-target-4_4-branch/gcc/regstat.c
    branches/multi-target-4_4-branch/gcc/reload.c
    branches/multi-target-4_4-branch/gcc/reload1.c
    branches/multi-target-4_4-branch/gcc/rtl.h
    branches/multi-target-4_4-branch/gcc/rtlanal.c
    branches/multi-target-4_4-branch/gcc/sched-int.h
    branches/multi-target-4_4-branch/gcc/sched-rgn.c
    branches/multi-target-4_4-branch/gcc/sdbout.c
    branches/multi-target-4_4-branch/gcc/sel-sched-ir.c
    branches/multi-target-4_4-branch/gcc/sel-sched.c
    branches/multi-target-4_4-branch/gcc/stack-ptr-mod.c
    branches/multi-target-4_4-branch/gcc/stringpool.c
    branches/multi-target-4_4-branch/gcc/system.h
    branches/multi-target-4_4-branch/gcc/target-def.h
    branches/multi-target-4_4-branch/gcc/target.h
    branches/multi-target-4_4-branch/gcc/targhooks.c
    branches/multi-target-4_4-branch/gcc/targhooks.h
    branches/multi-target-4_4-branch/gcc/testsuite/ChangeLog-2008   (props changed)
    branches/multi-target-4_4-branch/gcc/testsuite/g++.dg/cpp0x/decltype-38655.C   (props changed)
    branches/multi-target-4_4-branch/gcc/testsuite/gcc.dg/torture/pr36227.c   (props changed)
    branches/multi-target-4_4-branch/gcc/testsuite/gcc.target/x86_64/abi/callabi/   (props changed)
    branches/multi-target-4_4-branch/gcc/timevar.c
    branches/multi-target-4_4-branch/gcc/timevar.def
    branches/multi-target-4_4-branch/gcc/toplev.h
    branches/multi-target-4_4-branch/gcc/tree-cfg.c
    branches/multi-target-4_4-branch/gcc/tree-complex.c
    branches/multi-target-4_4-branch/gcc/tree-data-ref.c
    branches/multi-target-4_4-branch/gcc/tree-dump.c
    branches/multi-target-4_4-branch/gcc/tree-dump.h
    branches/multi-target-4_4-branch/gcc/tree-eh.c
    branches/multi-target-4_4-branch/gcc/tree-flow.h
    branches/multi-target-4_4-branch/gcc/tree-if-conv.c
    branches/multi-target-4_4-branch/gcc/tree-inline.h
    branches/multi-target-4_4-branch/gcc/tree-into-ssa.c
    branches/multi-target-4_4-branch/gcc/tree-loop-distribution.c
    branches/multi-target-4_4-branch/gcc/tree-mudflap.c
    branches/multi-target-4_4-branch/gcc/tree-nomudflap.c
    branches/multi-target-4_4-branch/gcc/tree-nrv.c
    branches/multi-target-4_4-branch/gcc/tree-object-size.c
    branches/multi-target-4_4-branch/gcc/tree-optimize.c
    branches/multi-target-4_4-branch/gcc/tree-pass.h
    branches/multi-target-4_4-branch/gcc/tree-predcom.c
    branches/multi-target-4_4-branch/gcc/tree-ssa-alias.c
    branches/multi-target-4_4-branch/gcc/tree-ssa-ccp.c
    branches/multi-target-4_4-branch/gcc/tree-ssa-dse.c
    branches/multi-target-4_4-branch/gcc/tree-ssa-math-opts.c
    branches/multi-target-4_4-branch/gcc/tree-ssa-sccvn.c
    branches/multi-target-4_4-branch/gcc/tree-ssa.c
    branches/multi-target-4_4-branch/gcc/tree-ssanames.c
    branches/multi-target-4_4-branch/gcc/tree-stdarg.c
    branches/multi-target-4_4-branch/gcc/tree-tailcall.c
    branches/multi-target-4_4-branch/gcc/tree-vect-analyze.c
    branches/multi-target-4_4-branch/gcc/tree-vect-generic.c
    branches/multi-target-4_4-branch/gcc/tree-vect-patterns.c
    branches/multi-target-4_4-branch/gcc/tree-vect-transform.c
    branches/multi-target-4_4-branch/gcc/tree-vectorizer.c
    branches/multi-target-4_4-branch/gcc/tree.c
    branches/multi-target-4_4-branch/gcc/tree.h
    branches/multi-target-4_4-branch/gcc/var-tracking.c
    branches/multi-target-4_4-branch/gcc/varasm.c
    branches/multi-target-4_4-branch/gcc/vec.c
    branches/multi-target-4_4-branch/gcc/vec.h
    branches/multi-target-4_4-branch/include/ansidecl.h
    branches/multi-target-4_4-branch/include/dyn-string.h
    branches/multi-target-4_4-branch/include/fibheap.h
    branches/multi-target-4_4-branch/libcpp/identifiers.c
    branches/multi-target-4_4-branch/libcpp/include/cpplib.h
    branches/multi-target-4_4-branch/libcpp/include/line-map.h
    branches/multi-target-4_4-branch/libcpp/include/mkdeps.h
    branches/multi-target-4_4-branch/libcpp/include/symtab.h
    branches/multi-target-4_4-branch/libcpp/init.c
    branches/multi-target-4_4-branch/libcpp/internal.h
    branches/multi-target-4_4-branch/libcpp/symtab.c
    branches/multi-target-4_4-branch/libdecnumber/decContext.h
    branches/multi-target-4_4-branch/libdecnumber/decDouble.h
    branches/multi-target-4_4-branch/libdecnumber/decExcept.h
    branches/multi-target-4_4-branch/libdecnumber/decNumber.h
    branches/multi-target-4_4-branch/libdecnumber/decPacked.h
    branches/multi-target-4_4-branch/libdecnumber/decQuad.h
    branches/multi-target-4_4-branch/libdecnumber/decRound.h
    branches/multi-target-4_4-branch/libdecnumber/decSingle.h
    branches/multi-target-4_4-branch/libdecnumber/dpd/decimal128.h
    branches/multi-target-4_4-branch/libdecnumber/dpd/decimal32.h
    branches/multi-target-4_4-branch/libdecnumber/dpd/decimal64.h
    branches/multi-target-4_4-branch/libjava/classpath/   (props changed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref_1.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/char/1.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/21_strings/char_traits/requirements/explicit_instantiation/wchar_t/1.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/headers/forward_list/synopsis.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/unordered_multiset/requirements/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/30_threads/condition_variable/members/
            ('svn:mergeinfo' modified)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/30_threads/this_thread/
            ('svn:mergeinfo' modified)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/30_threads/thread/members/
            ('svn:mergeinfo' modified)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/30_threads/thread/swap/
            ('svn:mergeinfo' modified)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/requirements/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/requirements/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/requirements/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/requirements/typedefs.cc
            ('svn:mergeinfo' removed)

Propchange: branches/multi-target-4_4-branch/
            ('svn:mergeinfo' added)

Propchange: branches/multi-target-4_4-branch/
            ('svnmerge-integrated' added)

Propchange: branches/multi-target-4_4-branch/gcc/ChangeLog-2008
            ('svn:mergeinfo' modified)

Propchange: branches/multi-target-4_4-branch/gcc/testsuite/ChangeLog-2008
            ('svn:mergeinfo' modified)

Propchange: branches/multi-target-4_4-branch/gcc/testsuite/g++.dg/cpp0x/decltype-38655.C
            ('svn:mergeinfo' modified)

Propchange: branches/multi-target-4_4-branch/gcc/testsuite/gcc.dg/torture/pr36227.c
            ('svn:mergeinfo' modified)

Propchange: branches/multi-target-4_4-branch/gcc/testsuite/gcc.target/x86_64/abi/callabi/
            ('svn:mergeinfo' modified)

Propchange: branches/multi-target-4_4-branch/libjava/classpath/
            ('svn:mergeinfo' modified)