r157496 - in /branches/ibm/gcc-4_4-branch: ./ g...

[meissner at gcc dot gnu dot org]

Author: meissner
Date: Tue Mar 16 20:33:14 2010
New Revision: 157496

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

Modified:
    branches/ibm/gcc-4_4-branch/libstdc++-v3/ChangeLog
    branches/ibm/gcc-4_4-branch/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc
    branches/ibm/gcc-4_4-branch/libstdc++-v3/testsuite/lib/dg-options.exp

Changes in other areas also in this revision:
Added:
    branches/ibm/gcc-4_4-branch/gcc/testsuite/c-c++-common/dwarf2/
      - copied from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/c-c++-common/dwarf2/
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/eh/pr42859.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/eh/pr42859.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/eh/unwind2.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/eh/unwind2.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/ext/attrib36.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/ext/attrib36.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/ext/attrib37.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/ext/attrib37.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/ext/dllexport3.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/ext/dllexport3.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/parse/namespace11.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/parse/namespace11.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/parse/namespace12.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/parse/namespace12.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/template/memclass4.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/template/memclass4.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/template/ptrmem20.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/template/ptrmem20.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/torture/pr43068.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/torture/pr43068.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/torture/pr43257.C
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/g++.dg/torture/pr43257.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr42749.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr42749.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr42998.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr42998.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43066.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43066.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43164.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43164.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43188.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43188.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43191.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43191.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43255.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43255.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43288.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/pr43288.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/execute/20100209-1.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/execute/20100209-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/execute/pr43008.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/execute/pr43008.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/execute/pr43220.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/execute/pr43220.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/execute/pr43269.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/execute/pr43269.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/compound-literal-1.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/compound-literal-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/debug/dwarf2/pr43237.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/debug/dwarf2/pr43237.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/fold-div-3.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/fold-div-3.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr36728-1.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr36728-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr36728-2.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr36728-2.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr43051-1.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr43051-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr43077-1.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr43077-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr43177.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr43177.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr43329-1.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/pr43329-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/vla-1.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/guality/vla-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr42917.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr42917.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr43139.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr43139.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr43280.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr43280.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr43299.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr43299.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr43317.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/pr43317.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/torture/pr43000.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/torture/pr43000.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/torture/pr43002.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/torture/pr43002.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/torture/pr43165.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/torture/pr43165.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/tree-ssa/ivopts-4.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.dg/tree-ssa/ivopts-4.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.target/arm/thumb2-cbnz.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.target/arm/thumb2-cbnz.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-1.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-2.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-2.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-3.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-3.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-4.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-4.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-check.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr39315-check.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr43107.c
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/pr43107.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/array_constructor_35.f90
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/array_constructor_35.f90
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/c_assoc_3.f90
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/c_assoc_3.f90
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/debug/pr43166.f
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/debug/pr43166.f
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/fmt_cache_2.f
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/fmt_cache_2.f
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/internal_pack_10.f90
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/internal_pack_10.f90
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/internal_pack_8.f90
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/internal_pack_8.f90
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/namelist_61.f90
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/namelist_61.f90
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/pr43229.f90
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/pr43229.f90
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/read_eof_6.f
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/read_eof_6.f
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/read_x_eof.f90
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gfortran.dg/read_x_eof.f90
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer1.adb
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer1.adb
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer1.ads
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer1.ads
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer2.adb
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer2.adb
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer2_pkg.adb
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer2_pkg.adb
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer2_pkg.ads
      - copied unchanged from r157493, branches/redhat/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer2_pkg.ads
Removed:
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer.adb
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gnat.dg/thin_pointer.ads
Modified:
    branches/ibm/gcc-4_4-branch/   (props changed)
    branches/ibm/gcc-4_4-branch/gcc/ChangeLog
    branches/ibm/gcc-4_4-branch/gcc/ChangeLog.ibm
    branches/ibm/gcc-4_4-branch/gcc/DATESTAMP
    branches/ibm/gcc-4_4-branch/gcc/Makefile.in
    branches/ibm/gcc-4_4-branch/gcc/REVISION
    branches/ibm/gcc-4_4-branch/gcc/ada/ChangeLog
    branches/ibm/gcc-4_4-branch/gcc/ada/gcc-interface/utils2.c
    branches/ibm/gcc-4_4-branch/gcc/c-decl.c
    branches/ibm/gcc-4_4-branch/gcc/cfgcleanup.c
    branches/ibm/gcc-4_4-branch/gcc/cfgexpand.c
    branches/ibm/gcc-4_4-branch/gcc/cfgrtl.c
    branches/ibm/gcc-4_4-branch/gcc/combine.c
    branches/ibm/gcc-4_4-branch/gcc/config/alpha/alpha.c
    branches/ibm/gcc-4_4-branch/gcc/config/arm/thumb2.md
    branches/ibm/gcc-4_4-branch/gcc/config/i386/i386.c
    branches/ibm/gcc-4_4-branch/gcc/config/i386/t-i386
    branches/ibm/gcc-4_4-branch/gcc/config/rs6000/rs6000.c
    branches/ibm/gcc-4_4-branch/gcc/config/s390/s390.md
    branches/ibm/gcc-4_4-branch/gcc/cselib.c
    branches/ibm/gcc-4_4-branch/gcc/cselib.h
    branches/ibm/gcc-4_4-branch/gcc/doc/invoke.texi
    branches/ibm/gcc-4_4-branch/gcc/dojump.c
    branches/ibm/gcc-4_4-branch/gcc/dse.c
    branches/ibm/gcc-4_4-branch/gcc/dwarf2out.c
    branches/ibm/gcc-4_4-branch/gcc/except.c
    branches/ibm/gcc-4_4-branch/gcc/expmed.c
    branches/ibm/gcc-4_4-branch/gcc/expr.c
    branches/ibm/gcc-4_4-branch/gcc/expr.h
    branches/ibm/gcc-4_4-branch/gcc/fortran/ChangeLog
    branches/ibm/gcc-4_4-branch/gcc/fortran/symbol.c
    branches/ibm/gcc-4_4-branch/gcc/fortran/trans-common.c
    branches/ibm/gcc-4_4-branch/gcc/function.c
    branches/ibm/gcc-4_4-branch/gcc/gcse.c
    branches/ibm/gcc-4_4-branch/gcc/gimple-iterator.c
    branches/ibm/gcc-4_4-branch/gcc/gimplify.c
    branches/ibm/gcc-4_4-branch/gcc/ipa-struct-reorg.c
    branches/ibm/gcc-4_4-branch/gcc/lambda-code.c
    branches/ibm/gcc-4_4-branch/gcc/loop-doloop.c
    branches/ibm/gcc-4_4-branch/gcc/loop-unswitch.c
    branches/ibm/gcc-4_4-branch/gcc/optabs.c
    branches/ibm/gcc-4_4-branch/gcc/postreload.c
    branches/ibm/gcc-4_4-branch/gcc/reg-notes.def
    branches/ibm/gcc-4_4-branch/gcc/regrename.c
    branches/ibm/gcc-4_4-branch/gcc/rtl.h
    branches/ibm/gcc-4_4-branch/gcc/sched-deps.c
    branches/ibm/gcc-4_4-branch/gcc/simplify-rtx.c
    branches/ibm/gcc-4_4-branch/gcc/stmt.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/ChangeLog
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/ipa/iinline-1.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/other/first-global.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/parse/attr-externally-visible-1.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.dg/tree-ssa/nothrow-1.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.old-deja/g++.pt/asm1.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/g++.old-deja/g++.pt/asm2.C
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.c-torture/compile/20000804-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/debug/dwarf2/dwarf2.exp
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/inline-33.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/ipa/ipa-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/ipa/ipa-2.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/ipa/ipa-3.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/ipa/ipa-4.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/ipa/ipa-5.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/ipa/ipa-7.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/ipa/ipacost-2.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.dg/tree-ssa/inline-4.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.target/arm/sibcall-1.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gcc.target/i386/clobbers.c
    branches/ibm/gcc-4_4-branch/gcc/testsuite/gfortran.dg/read_x_past.f
    branches/ibm/gcc-4_4-branch/gcc/testsuite/lib/target-supports-dg.exp
    branches/ibm/gcc-4_4-branch/gcc/testsuite/lib/target-supports.exp
    branches/ibm/gcc-4_4-branch/gcc/tree-cfgcleanup.c
    branches/ibm/gcc-4_4-branch/gcc/tree-inline.c
    branches/ibm/gcc-4_4-branch/gcc/tree-phinodes.c
    branches/ibm/gcc-4_4-branch/gcc/tree-ssa-ccp.c
    branches/ibm/gcc-4_4-branch/gcc/tree-vect-transform.c
    branches/ibm/gcc-4_4-branch/gcc/var-tracking.c
    branches/ibm/gcc-4_4-branch/libgfortran/ChangeLog
    branches/ibm/gcc-4_4-branch/libgfortran/io/io.h
    branches/ibm/gcc-4_4-branch/libgfortran/io/list_read.c
    branches/ibm/gcc-4_4-branch/libgfortran/io/read.c
    branches/ibm/gcc-4_4-branch/libgfortran/io/transfer.c
    branches/ibm/gcc-4_4-branch/libmudflap/ChangeLog
    branches/ibm/gcc-4_4-branch/libmudflap/testsuite/libmudflap.c/pass54-frag.c

Propchange: branches/ibm/gcc-4_4-branch/
            ('svn:mergeinfo' modified)

Propchange: branches/ibm/gcc-4_4-branch/
            ('svnmerge-integrated' modified)