backport: re PR rtl-optimization/13060 ([g77] ICE in fixup_var_refs_1, at function.c:1947 on correct code with "-O2 -fno-force-mem")

Backport from mainline:

2003-12-07  Eric Botcazou  <ebotcazou@libertysurf.fr>

PR optimization/13060
* function.c (fixup_var_refs_1) [SUBREG]: Recognize even if a
replacement already exists.  Fix again the whole insn if that fails.

From-SVN: r74531

backport: re PR rtl-optimization/12965 (SEGV+ICE in cc1plus on alpha-linux with -O2)

Backport from mainline:

2003-12-07  Eric Botcazou  <ebotcazou@libertysurf.fr>

PR optimization/12965
* caller-save.c (save_call_clobbered_regs): Do not save/restore
registers around no-return calls.

From-SVN: r74530

This commit was manufactured by cvs2svn to create branch
'gcc-3_3-branch'.

From-SVN: r74529

gcc_update (files_and_dependencies): Correct typo in the filename gnat_ug_wnt.texi.

2003-12-10  Kelley Cook  <kcook@gcc.gnu.org>

* gcc_update (files_and_dependencies): Correct typo in the filename
gnat_ug_wnt.texi.

From-SVN: r74524

re PR libstdc++/6243 (testsuite fails almost all tests due to no libintl in LD_LIBRARY_PATH during test.)

2003-12-10  Benjamin Kosnik  <bkoz@redhat.com>

PR libstdc++/6243
* testsuite/lib/libstdc++.exp (v3-init): Add
original_ld_library_path, calculate ld_library path, set
LD_LIBRARY_PATH to both. Based on libjava.exp.

From-SVN: r74523

Daily bump.

From-SVN: r74517

re PR testsuite/10819 (testsuite creates CR+LF on compiler version lines in test summary files)

2003-12-10  Robert Schiele  <rschiele@uni-mannheim.de>

        PR other/10819
        * lib/gcc.exp (default_gcc_version): Do not match NL/CR characters
        to fix Bug 10819.
        * lib/g++.exp (g++_version): Likewise.
        * lib/g77.exp (g77_version): Likewise.
        * lib/objc.exp (default_objc_version): Likewise.

From-SVN: r74515

re PR libstdc++/11612 (abi_check not finding correct libgcc_s.so.1)

2003-12-10  Benjamin Kosnik  <bkoz@redhat.com>
            Alexandre Oliva  <aoliva@redhat.com>

PR libstdc++/11612
* testsuite/Makefile.am (GLIBCXX_DIR): New.
(GLIBGCC_DIR): New.
(CXXLINK): Use both with -R so libtool links the correct libs.

Co-Authored-By: Alexandre Oliva <aoliva@redhat.com>
From-SVN: r74510

emit-rtl.c (copy_rtx_if_shared_1): Fix warning.

2003-12-10  Andrew Pinski  <pinskia@physics.uc.edu>

        * emit-rtl.c (copy_rtx_if_shared_1): Fix warning.

From-SVN: r74504

backport: cpptrad.c (_cpp_scan_out_logical_line): Improve test for whether directive begins at the beginning of a line.

Backport from mainline (fixes unreported regression):
* cpptrad.c (_cpp_scan_out_logical_line): Improve test for
  whether directive begins at the beginning of a line.

(testsuite)
Backport from mainline:
* gcc.dg/cpp/trad/xwin1.c: New test case.

From-SVN: r74502

re PR target/13354 (internal compiler error: in sparc_emit_set_const32)

PR target/13354
* config/sparc/sparc.c (sparc_output_mi_thunk): Load DELTA
manually if one can do that with only one instruction.

From-SVN: r74500

backport: uninit-C.c: XFAIL on non 64-bit Solaris versions.

Backport from mainline:

2003-11-05  Eric Botcazou  <ebotcazou@libertysurf.fr>

* gcc.dg/uninit-C.c: XFAIL on non 64-bit Solaris versions.

From-SVN: r74498

[multiple changes]

2003-12-09  Kelley Cook  <kelleycook@wideopenwest.com>

2003-06-04  Kelley Cook  <kelleycook@wideopenwest.com>
PR optimization/4490
* config/i386/i386.md: Don't use XFMode if TARGET_128BIT_LONG_DOUBLE.

From-SVN: r74485

Daily bump.

From-SVN: r74480

re PR libstdc++/12496 (wrong result for __atomic_add(&value, -1) when using -O0 -m64)

2003-12-08  David S. Miller  <davem@redhat.com>

PR libstdc++/12496
* config/cpu/sparc/atomicity.h (__exchange_and_add, __atomic_add):
Extend increment to _Atomic_word before giving to assembler.

From-SVN: r74466

Daily bump.

From-SVN: r74450

re PR target/13150 (WEAK symbols not exported by collect2)

        PR target/13150
        * collect2.c (GCC_OK_SYMBOL): Add support for AIX C_WEAKEXT.
        (GCC_UNDEF_SYMBOL): Same.

Co-Authored-By: Graham Reed <greed@pobox.com>
From-SVN: r74426

re PR middle-end/10060 (ICE (stack overflow) on huge file (300k lines) due to recursive behaviour of copy_rtx_if_shared, in emit_rtl.c)

2003-12-08  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/10060
        * emit-rtl.c (copy_rtx_if_shared): Split out into ...
        (copy_rtx_if_shared_1): here and optimize the last one
        in the sequence into tail-recursion.
        (reset_used_flags): Optimize the last one
        in the sequence into tail-recursion.

From-SVN: r74425

Daily bump.

From-SVN: r74401

rs6000.c (rs6000_elf_section_type_flags): Don't set SECTION_WRITE on TARGET_RELOCATABLE.

* config/rs6000/rs6000.c (rs6000_elf_section_type_flags): Don't
set SECTION_WRITE on TARGET_RELOCATABLE.

From-SVN: r74382

Daily bump.

From-SVN: r74375

re PR c++/13323 (Template code does not compile in presence of typedef)

PR c++/13323
* class.c (same_signature_p): Handle conversion operators
correctly.
(check_for_override): Likewise.

PR c++/13323
* g++.dg/inherit/operator2.C: New test.

From-SVN: r74372

This commit was manufactured by cvs2svn to create branch
'gcc-3_3-branch'.

From-SVN: r74371

Check in the right patch with the right comment.

From-SVN: r74358

re PR driver/13211 (using -###, warns about unused linker file)

2003-12-05  Andrew Pinski <pinskia@physics.uc.edu>

        PR driver/13211
        * gcc.c (execute) Increment execution_count when returning
        early because verbose_only_flag is true.

From-SVN: r74357

Daily bump.

From-SVN: r74353

re PR fortran/12633 (logical expression gives incorrect result with -fugly-logint option)

2003-12-05  Toon Moene  <toon@moene.indiv.nluug.nl>

PR fortran/12633
Revert 2002-05-09  Hassan Aurag  <aurag@cae.com>

* expr.c (ffeexpr_reduced_ugly2log_): Allow logicals-as-integers
under -fugly-logint as arguments of .and., .or., .xor.

From-SVN: r74343

re PR target/13302 (Putting a va_list in a struct causes seg fault)

2003-12-05  Stuart Menefy <stuart.menefy@st.com>
            J"orn Rennecke <joern.rennecke@superh.com>

        PR target/13302
gcc:
        * sh.c (sh_build_builtin_va_list): Use (*lang_hooks.types.make_type).
testsuite:
        * g++.dg/other/struct-va_list.C: New test.

Co-Authored-By: J"orn Rennecke <joern.rennecke@superh.com>
From-SVN: r74336

This commit was manufactured by cvs2svn to create branch
'gcc-3_3-branch'.

From-SVN: r74335

+ PR target/11322 + * config/sh/netbsd-elf.h (NO_PROFILE_COUNTERS): Define.

+       PR target/11322
+       * config/sh/netbsd-elf.h (NO_PROFILE_COUNTERS): Define.
+

From-SVN: r74308

re PR target/12467 (vmsumubm emitted when vmsummbm appropriate)

2003-12-04  Andrew Pinski  <pinskia@physics.uc.edu>

        PR target/12467
        * config/rs6000/altivec.md (altivec_vmsummbm): Fix typo.

From-SVN: r74307

Makefile.in (stmp-fixinc): Don't bail out if SYSTEM_HEADER_DIR does not exist and it's the default...

2003-12-04  H.J. Lu  <hongjiu.lu@intel.com>

* Makefile.in (stmp-fixinc): Don't bail out if SYSTEM_HEADER_DIR
does not exist and it's the default sys-include directory.

From-SVN: r74303

Daily bump.

From-SVN: r74299

re PR libstdc++/13290 ([3.3 only] gcc 3.3.x: simple typo in concept checking for std::generate_n)

2003-12-04  Christopher Saunders  <ctsa@u.washington.edu>

PR libstdc++/13290
* include/bits/stl_algo.h (generate_n): Fix typo.

From-SVN: r74284

hpux.h (TARGET_HAVE_TLS): Define it to false.

* config/ia64/hpux.h (TARGET_HAVE_TLS): Define it to false.
* config/ia64/ia64.h (TARGET_HAVE_TLS): Define it to true if
HAVE_AS_TLS is true.
* config/ia64/ia64.c (TARGET_HAVE_TLS): Do not define it.

From-SVN: r74268

re PR libstdc++/9371 (Bad exception handling in i/ostream::operator>>/<<(streambuf*))

2003-12-03  Benjamin Kosnik  <bkoz@redhat.com>

* include/bits/basic_ios.h (basic_ios::setstate): Revert.
* include/bits/istream.tcc: Only call setstate if __err != goodbit.
* include/bits/ostream.tcc: Same.
* testsuite/27_io/basic_ios/exceptions/char/2.cc: New.

2003-12-03  Benjamin Kosnik  <bkoz@redhat.com>

PR libstdc++/9371
PR libstdc++/9546
PR libstdc++/10093
PR libstdc++/10095
* include/bits/basic_ios.h (basic_ios::setstate): Elide if goodbit.
(basic_ios::_M_setstate): Consolidate common error handling code.
* include/bits/basic_ios.tcc: Tweak.
* include/bits/fstream.tcc: Tweak.
* include/bits/istream.tcc: Use _M_setstate for common exception
handling. Move setstate calls after catch.
(basic_istream::tellg): Check for exceptions thrown by streambuf
virtual functions.
(basic_istream::seekg): Same.
* include/bits/ostream.tcc: Same, but for ostream.
(basic_ostream::flush): Check for exceptions thrown by streambuf
virtual functions.
(basic_istream::tellp): Same.
(basic_istream::seekp): Same.
* include/bits/locale_facets.tcc: Tweak.
* include/bits/streambuf.tcc: Tweak.
(__copy_streambufs): Propagate exceptions.

From-SVN: r74265

[multiple changes]

       2003-11-29  James E Wilson  <wilson@specifixinc.com>
       * gcc.c (init_spec): Pass -lunwind to init_gcc_specs in eh_name
       instead of in shared_name.
       2003-11-20 David Mosberger  <davidm@hpl.hp.com>
       * config/t-libunwind (LIB2ADDEH): Add unwind-c.c.
       (SHLIB_LC): Define.
       * unwind-libunwind.c (_Unwind_GetCFA): Implement.
       (_Unwind_GetBSP) [UNW_TARGET_IA64]: New function.

From-SVN: r74262

Daily bump.

From-SVN: r74256

expr.c (store_constructor): Only set RTX_UNCHANGING_P for read-only field if cleared is 0.

* expr.c (store_constructor): Only set RTX_UNCHANGING_P for
read-only field if cleared is 0.

* gcc.dg/20031202-1.c: New test.

From-SVN: r74250

re PR other/12969 (Including sys/byteorder.h breaks configure checks)

2003-12-03  Kean Johnston  <jkj@sco.com>

PR 12969
* fixinc/inclhack.def (AAB_svr4_replace_byteorder): Revert the
change I made on 2003-08-11 that removes the mach lines.
Restore them to the same list thats in the head, as per
Nathanael Nerode's changes.
* fixinc/fixincl.x: Regenerated
* fixinc/tests/base/ansi/string.h: Fix test case

From-SVN: r74242

re PR target/8407 ([IA-64] ICE in simplify_gen_subreg, at simplify-rtx.c:2711 with very simple code)

PR target/8407
* config/ia64/ia64.c (ia64_function_arg): For single-reg HFA, call
gen_rtx_REG to create new reg with argument mode.

From-SVN: r74241

backport: 20031031-2.c: New test.

Backport from mainline

2003-10-31  Josef Zlomek  <zlomekj@suse.cz>

PR/10239
* gcc.c-torture/compile/20031031-2.c: New test.

2003-10-31  Josef Zlomek  <zlomekj@suse.cz>

PR/11640
* gcc.c-torture/compile/20031031-1.c: New test.

From-SVN: r74219

Reformat my last entry

From-SVN: r74218

backport: cfgrtl.c (delete_insn): Decrease LABEL_NUSES for all REG_LABEL notes.

Merge from mainline:
2003-10-31  Josef Zlomek  <zlomekj@suse.cz>

PR/10239
* cfgrtl.c (delete_insn): Decrease LABEL_NUSES for all REG_LABEL notes.

2003-10-31  Josef Zlomek  <zlomekj@suse.cz>

PR/11640
* cfgrtl.c (try_redirect_by_replacing_jump): Move jump
immediatelly before BARRIER.

From-SVN: r74216

Daily bump.

From-SVN: r74205

backport: config.gcc (sh*-*-linux*): Add t-slibgcc-elf-ver and t-linux.

Backport from mainline

2002-11-19  Kaz Kojima  <kkojima@gcc.gnu.org>

* config.gcc (sh*-*-linux*): Add t-slibgcc-elf-ver and t-linux.
        to tmake_file.
* config/sh/libgcc-glibc.ver: New file.

Backport from mainline

2003-10-08  Kaz Kojima  <kkojima@gcc.gnu.org>

* config/sh/t-linux (SHLIB_LINK): Override to use a linker script
libgcc_s.so.
(SHLIB_INSTALL): Likewise.

From-SVN: r74160

re PR rtl-optimization/11634 ([hppa] ICE in verify_local_live_at_start, at flow.c:555)

PR optimization/11634
* recog.c (split_insn): Factor test of INSN_P and handling of
set_noop_p out of here into the two callers.
(split_all_insns): Add INSN_P test and set_noop_p handling here.
If deleting a no-op set after reload that has a REG_UNUSED note,
mark the basic block as changed and recalculate life information.
(split_all_insns_noflow): Add INSN_P test and set_noop_p handling
here.

* gcc.dg/20031201-2.c: New test case.

From-SVN: r74156

re PR libobjc/11433 (Crash due to dereferencing null pointer when querying protocol)

PR 11433
gcc/testsuite:
* objc.dg/proto-lossage-3.m: New test.
libobjc:
* Protocol.m (descriptionForInstanceMethod): Don't dereference
instance_methods if it's NULL.
(descriptionForClassMethod): Likewise for class_methods.

From-SVN: r74148

This commit was manufactured by cvs2svn to create branch
'gcc-3_3-branch'.

From-SVN: r74147

re PR other/12505 (build failure due to defines of uchar in cpphash.h and sys/types.h)

PR 12505
* configure.in: Check for system-provided 'uchar' type.
* configure, config.in: Regenerate.
* cpphash.h: Only typedef 'uchar' if the system doesn't.

From-SVN: r74146

Daily bump.

From-SVN: r74138

* unroll.c (find_splittable_givs): Add missing extend_value_for_giv.

From-SVN: r74127

backport: re PR rtl-optimization/13041 (linux-2.6/sound/core/oss/rate.c miscompiled)

Backport from mainline:

2003-11-27  Eric Botcazou  <ebotcazou@libertysurf.fr>

PR optimization/13041
* final.c (frame_pointer_needed): Fix comment.
* reload1.c (reload): Decrease alignment of the frame
pointer if it was used for register allocation.

From-SVN: r74096

backport: re PR target/12900 (g++ ICE in rtl_verify_flow_info_1)

Backport from mainline:

2003-11-27  Eric Botcazou  <ebotcazou@libertysurf.fr>

PR target/12900
* reg-stack (move_for_stack_reg): New prototype.  Return
whether a control flow insn was deleted.
(subst_stack_regs_pat): Likewise, using the information provided
by move_for_stack_reg.
(subst_stack_regs): Likewise, using the information provided
by subst_stack_regs_pat.
(convert_regs_1): Record whether a control flow insn was deleted,
using the information provided by subst_stack_regs.  Purge dead
edges only if a control flow insn was deleted.

From-SVN: r74095

This commit was manufactured by cvs2svn to create branch
'gcc-3_3-branch'.

From-SVN: r74094

* doc/c-tree.texi (Function Bodies): Update HANDLER documentation.

From-SVN: r74083

Daily bump.

From-SVN: r74079

Daily bump.

From-SVN: r74042

* config/s390/s390.md ("cmpint_di"): Fix incorrect instruction lengths.

From-SVN: r74041

Daily bump.

From-SVN: r74027

Daily bump.

From-SVN: r74008

Daily bump.

From-SVN: r73971

re PR libstdc++/12297 (istream::sentry::sentry() handles eof() incorrectly.)

2003-11-26  Benjamin Kosnik  <bkoz@redhat.com>

PR libstdc++/12297
* include/bits/istream.tcc
(basic_istream::sentry::sentry): Set failbit and eofbit when eof.

From-SVN: r73969

re PR libstdc++/12594 (DRs 60 [TC] and 63 [TC] not implemented)

2003-11-26  Petur Runolfsson  <peturr02@ru.is>

PR libstdc++/12594
* include/bits/ostream.tcc
(basic_ostream::operator<<(basic_ostream& (*)(basic_ostream&)),
basic_ostream::operator<<(basic_ios& (*)(basic_ios&)),
basic_ostream::operator<<(ios_base& (*)(ios_base&))):
Implement the resolution of DR 60 (TC): These are not formatted
output functions so don't construct sentry objects and don't
catch exceptions.
(basic_ostream::put, basic_ostream::write): Implement the
resolution of DR 63 (TC) by catching exceptions and setting
badbit.
(basic_ostream::flush): Implement the resolution of DR 60 (TC):
This is not an unformatted output function so don't construct
a sentry object.

From-SVN: r73961

Daily bump.

From-SVN: r73935

Daily bump.

From-SVN: r73904

Daily bump.

From-SVN: r73864

* MAINTAINERS: Add myself as a vax port maintainer.

From-SVN: r73857

Daily bump.

From-SVN: r73845

Daily bump.

From-SVN: r73826

Daily bump.

From-SVN: r73781

Daily bump.

From-SVN: r73745

Daily bump.

From-SVN: r73717

backport: cppinit.c (init_standard_includes): Add both "translated" and non-translated header paths.

Backport 2003-03-26  Alan Modra  <amodra@bigpond.net.au>
* cppinit.c (init_standard_includes): Add both "translated" and
non-translated header paths.

From-SVN: r73715

Fix links in online manuals.

* doc/invoke.texi (H8/300 Options): @xref to ld, not ld.info.

From-SVN: r73714

Daily bump.

From-SVN: r73683

invoke.texi (Warning Options): Simplify and clarify the description of -Wnonnull.

* doc/invoke.texi (Warning Options): Simplify and clarify the
description of -Wnonnull.

From-SVN: r73679

Daily bump.

From-SVN: r73656

Daily bump.

From-SVN: r73637

Daily bump.

From-SVN: r73626

backport: [multiple changes]

2003-11-14  Matthias Klose  <doko@debian.org>

Backport from mainline

2003-06-04  Jakub Jelinek  <jakub@redhat.com>

* function.c (trampolines_created): New variable.
(expand_function_end): Set it when doing INITIALIZE_TRAMPOLINE.
* function.h (trampolines_created): Add.
* config/s390/linux.h (ASM_FILE_END): Define.
* config/alpha/linux-elf.h (ASM_FILE_END): Define.
* config/m68k/linux.h (ASM_FILE_END): Define.
* config/rs6000/linux.h (ASM_FILE_END): Define.
* config/rs6000/linux64.h (ASM_FILE_END): Define.
* config/sparc/linux.h (ASM_FILE_END): Define.
* config/sparc/linux64.h (ASM_FILE_END): Define.
* config/i386/i386.c (ix86_asm_file_end): Use SUBTARGET_FILE_END.
* config/i386/linux.h (SUBTARGET_FILE_END): Define.
* config/i386/linux64.h (SUBTARGET_FILE_END): Define.

2003-06-05  Jakub Jelinek  <jakub@redhat.com>

* mklibgcc.in: Propagate .note.GNU-stack section if needed into
the .hidden assembly stubs.

From-SVN: r73579

backport: re PR c++/2094 (unimplemented: use of `ptrmem_cst' in template type unification)

Backport from 3.4-branch

2003-06-25  Giovanni Bajo  <giovannibajo@libero.it>

        PR c++/2094
        * g++.dg/template/ptrmem6.C: New test.

From-SVN: r73575

backport: re PR c++/2094 (unimplemented: use of `ptrmem_cst' in template type unification)

Backport from 3.4-branch.

2003-06-25  Giovanni Bajo  <giovannibajo@libero.it>

        PR c++/2094
        * pt.c (unify): Add support for PTRMEM_CST and
        FIELD_DECL unification.

From-SVN: r73574

Daily bump.

From-SVN: r73565

re PR rtl-optimization/12926 (Wrong value after assignment in initialize list using bit-fields)

PR optimization/12926
* expr.c (expand_assignment) [COMPONENT_REF]: Don't put
the UNCHANGING_RTX_P flag on memory references to read-only
components that are not addressable.

From-SVN: r73544

This commit was manufactured by cvs2svn to create branch
'gcc-3_3-branch'.

From-SVN: r73543

Daily bump.

From-SVN: r73522

re PR rtl-optimization/12953 (tree inline bug and fix)

2003-11-12  Alexey Starovoytov  <alexey.starovoytov@sun.com>

PR optimization/12953
* c-objc-common.c (inline_forbidden_p): Added check for BUILT_IN
before switch by FUNCTION_CODE.

From-SVN: r73505

backport: Makefile.in (CFILES): Add lrealpath.c.

Backport from mainline:
2003-02-20  Daniel Jacobowitz  <drow@mvista.com>

* Makefile.in (CFILES): Add lrealpath.c.
(REQUIRED_OFILES): Add lrealpath.o.
(lrealpath.o): Add rule.
* aclocal.m4 (libiberty_NEED_DECLARATION): Add.
* configure.in: Add realpath and canonicalize_file_name to
checkfuncs and AC_CHECK_FUNCS.  Use libiberty_NEED_DECLARATION
for canonicalize_file_name.
* lrealpath.c: New file.
* make-relative-prefix.c: Update documentation.
(make_relative_prefix): Simplify.  Use lbasename and lrealpath.
* config.in: Regenerated.
* configure: Regenerated.
* functions.texi: Regenerated.

From-SVN: r73499

backport: libiberty.h (lrealpath): Add declaration.

Backport from mainline:
2003-02-20  Daniel Jacobowitz  <drow@mvista.com>
* libiberty.h (lrealpath): Add declaration.

From-SVN: r73498

Daily bump.

From-SVN: r73473

Daily bump.

From-SVN: r73434

re PR target/12865 (`mprotect' call to make trampoline executable may fail)

PR target/12865
* config/sparc/sparc.c (sparc_initialize_trampoline): Call
__enable_execute_stack only after writing onto the stack.
(sparc64_initialize_trampoline): Likewise.

From-SVN: r73404

This commit was manufactured by cvs2svn to create branch
'gcc-3_3-branch'.

From-SVN: r73403

Daily bump.

From-SVN: r73399

Daily bump.

From-SVN: r73379

backport: re PR target/10467 ([arm] [3.3/3.4 regression] ICE in pre_insert_copy_insn,)

Backport from mainline
PR optimization/10467
PR optimization/11741
* gcse.c (pre_insert_copy_insn): Tweak the logic for finding the
appropriate set to match the code in hash_scan_insn.

* gcc.dg/20030926-1.c: New test case.
* gcc.dg/20031108-1.c: New test case.

From-SVN: r73365

This commit was manufactured by cvs2svn to create branch
'gcc-3_3-branch'.

From-SVN: r73364

backport: error7.C: New test.

Backport from 3.4-branch

2003-10-08  Giovanni Bajo  <giovannibajo@libero.it>

* g++.dg/parse/error7.C: New test.

From-SVN: r73357

backport: cp_tree.h: Added TFF_NO_FUNCTION_ARGUMENTS.

Backport from 3.4-branch

2003-10-08  Giovanni Bajo  <giovannibajo@libero.it>

* cp_tree.h: Added TFF_NO_FUNCTION_ARGUMENTS.
* error.c (dump_function_decl): Use it to skip the dump of the
arguments.
(dump_expr): When dumping a declaration found within an
expression, always set TFF_NO_FUNCTION_ARGUMENTS
in the flags.

From-SVN: r73355