platform/upstream/gcc.git
22 years agoEnable libgcj for xscale-elf
Anthony Green [Thu, 21 Mar 2002 20:59:20 +0000 (20:59 +0000)]
Enable libgcj for xscale-elf

From-SVN: r51141

22 years agoparse.y (build_access_to_thisn): Stop when FROM is not an inner class.
Tom Tromey [Thu, 21 Mar 2002 19:00:24 +0000 (19:00 +0000)]
parse.y (build_access_to_thisn): Stop when FROM is not an inner class.

* parse.y (build_access_to_thisn): Stop when FROM is not an inner
class.

From-SVN: r51138

22 years agoMakefile.in (fold-const.o, [...]): Update.
Neil Booth [Thu, 21 Mar 2002 18:39:29 +0000 (18:39 +0000)]
Makefile.in (fold-const.o, [...]): Update.

* Makefile.in (fold-const.o, stor-layout.o, stmt.o,
sdbout.o, profile.o): Update.
* c-common.c (c_common_nodes_and_builtins): Use pushdecl
langhook.
* c-common.h (gettags): Move here from tree.h.
* c-tree.h (pushdecl, pushlevel, poplevel, set_block,
insert_block, getdecls, kept_level_p, global_bindings_p): New.
* dbxout.c (dbxout_init): Use getdecls langhook.
* expr.c (expand_expr): Use insert_block langhook.
* fold-const.c: Include langhooks.h.
(fold_range_test, fold_binary_op_with_conditional_arg,
fold): Use global_bindings_p langhook.
* integrate.c (expand_inline_function): Use insert_block langhook.
* langhooks-def.h (LANG_HOOKS_DECLS, LANG_HOOKS_PUSHLEVEL,
LANG_HOOKS_POPLEVEL, LANG_HOOKS_GLOBAL_BINDINGS_P,
LANG_HOOKS_INSERT_BLOCK, LANG_HOOKS_SET_BLOCK, LANG_HOOKS_PUSHDECL,
LANG_HOOKS_GETDECLS): New.
(LANG_HOOKS_INITIALIZER): Update.
* langhooks.c (lhd_clear_binding_stack): Use global_bindings_p
langhook.
* langhooks.h (struct lang_hooks_for_decls): New.
(struct lang_hooks): Update.
* profile.c: Include langhooks.h.
(output_func_start_profiler): Use new langhooks.
* sdbout.c: Include langhooks.h.
(sdbout_init, sdbout_finish): Use getdecls langhook.
* stmt.c: Include langhooks.h.
(expand_fixup, fixup_gotos): Use new langhooks.
* stor-layout.c: Include langhooks.h.
(variable_size): Use global_bindings_p langhook.
* toplev.c (compile_file): Use getdecls langhook.
* tree-inline.c (remap_block): Use insert_block langhook.
* tree.h (pushdecl, pushlevel, poplevel, set_block, gettags,
insert_block, getdecls, kept_level_p, global_bindings_p): Remove.
cp:
* cp-tree.h (pushdecl, pushlevel, poplevel, set_block,
insert_block, getdecls, global_bindings_p): New.
java:
* cp-tree.h (pushdecl, pushlevel, poplevel, set_block,
insert_block, getdecls, kept_level_p, global_bindings_p): New.
f:
* cp-tree.h (pushdecl, pushlevel, poplevel, set_block,
insert_block, getdecls, global_bindings_p): New.

From-SVN: r51136

22 years agors6000.c (rs6000_select_rtx_section): Put symbolic constants in .data when -fpic.
Richard Henderson [Thu, 21 Mar 2002 18:30:09 +0000 (10:30 -0800)]
rs6000.c (rs6000_select_rtx_section): Put symbolic constants in .data when -fpic.

        * config/rs6000/rs6000.c (rs6000_select_rtx_section): Put symbolic
        constants in .data when -fpic.

From-SVN: r51134

22 years agocontrib.texi (Contributors): Use GNU/Linux instead of Linux where appropriate.
Gerald Pfeifer [Thu, 21 Mar 2002 17:24:28 +0000 (18:24 +0100)]
contrib.texi (Contributors): Use GNU/Linux instead of Linux where appropriate.

* doc/contrib.texi (Contributors): Use GNU/Linux instead of Linux
where appropriate.

From-SVN: r51132

22 years ago* config/i386/sol2.h (ASM_QUAD): Undef. Fixes PR bootstrap/5948.
Tom Tromey [Thu, 21 Mar 2002 17:06:50 +0000 (17:06 +0000)]
* config/i386/sol2.h (ASM_QUAD): Undef.  Fixes PR bootstrap/5948.

From-SVN: r51130

22 years ago* gcc.dg/20020312-2.c: Add rs6000 target.
David Edelsohn [Thu, 21 Mar 2002 16:18:37 +0000 (16:18 +0000)]
* gcc.dg/20020312-2.c: Add rs6000 target.

From-SVN: r51129

22 years agoFix typo
Richard Kenner [Thu, 21 Mar 2002 15:07:10 +0000 (10:07 -0500)]
Fix typo

From-SVN: r51127

22 years ago* config/ia64/ia64.c (hfa_element_call, case ARRAY_TYPE): Recurse.
Richard Kenner [Thu, 21 Mar 2002 15:05:26 +0000 (15:05 +0000)]
* config/ia64/ia64.c (hfa_element_call, case ARRAY_TYPE): Recurse.

From-SVN: r51125

22 years ago* expr.c (emit_group_store): Don't copy const0_rtx to a CONCAT.
Richard Kenner [Thu, 21 Mar 2002 14:58:21 +0000 (14:58 +0000)]
* expr.c (emit_group_store): Don't copy const0_rtx to a CONCAT.

From-SVN: r51123

22 years agore PR c/5354 (function call with two statement expressions yields incorrect result)
Eric Botcazou [Thu, 21 Mar 2002 09:39:18 +0000 (09:39 +0000)]
re PR c/5354 (function call with two statement expressions yields incorrect result)

        PR c/5354
        * c-common.c (c_expand_expr): Preserve result of a statement
        expression if needed.

Co-Authored-By: Richard Henderson <rth@redhat.com>
From-SVN: r51121

22 years agoDaily bump.
GCC Administrator [Thu, 21 Mar 2002 08:17:23 +0000 (08:17 +0000)]
Daily bump.

From-SVN: r51119

22 years agore PR bootstrap/4195 (mn10200-elf fails building libgcc __ffssi2)
Jakub Jelinek [Thu, 21 Mar 2002 07:14:18 +0000 (08:14 +0100)]
re PR bootstrap/4195 (mn10200-elf fails building libgcc __ffssi2)

PR bootstrap/4195
* genrecog.c (maybe_both_true_mode): Remove.
(maybe_both_true_2, write_switch): Revert 2001-07-17 changes.
* machmode.def (Pmode): Likewise.

From-SVN: r51115

22 years agoalias.c: (nonlocal_mentioned_p): Use for_each_rtx.
John Wehle [Thu, 21 Mar 2002 06:59:43 +0000 (06:59 +0000)]
alias.c: (nonlocal_mentioned_p): Use for_each_rtx.

* alias.c: (nonlocal_mentioned_p): Use for_each_rtx.
(nonlocal_mentioned_p_1): New function.
(nonlocal_referenced_p, nonlocal_referenced_p_1): Likewise.
(nonlocal_set_p, nonlocal_set_p_1): Likewise.
(mark_constant_function): Recognize pure functions.
* rtl.h (global_reg_mentioned_p): New prototype.
* rtlanal.c (global_reg_mentioned_p,
global_reg_mentioned_p_1): New function.

From-SVN: r51113

22 years agoacinclude.m4 (GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3): New.
Rainer Orth [Thu, 21 Mar 2002 01:29:51 +0000 (01:29 +0000)]
acinclude.m4 (GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3): New.

* acinclude.m4 (GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3): New.
(GLIBCPP_CONFIGURE_TESTSUITE): Use it to check for setenv.
* aclocal.m4: Regenerate.
* configure: Likewise.

From-SVN: r51110

22 years agoia64-1.C: Use [ijkl]_[0-9] as variable names.
Rainer Orth [Thu, 21 Mar 2002 01:15:55 +0000 (01:15 +0000)]
ia64-1.C: Use [ijkl]_[0-9] as variable names.

* g++.old-deja/g++.eh/ia64-1.C: Use [ijkl]_[0-9] as variable names.
(A, E): Handle this.

From-SVN: r51108

22 years agoinclhack.def (alpha_assert): Fix assert macro in Tru64 UNIX assert.h.
Rainer Orth [Thu, 21 Mar 2002 01:11:48 +0000 (01:11 +0000)]
inclhack.def (alpha_assert): Fix assert macro in Tru64 UNIX assert.h.

* fixinc/inclhack.def (alpha_assert): Fix assert macro in Tru64
UNIX assert.h.
* fixinc/fixincl.x: Regenerate.

From-SVN: r51106

22 years agoprune.exp (prune_gcc_output): Ignore Cygwin warning about ignoring -fpic.
Jason Merrill [Thu, 21 Mar 2002 00:29:09 +0000 (19:29 -0500)]
prune.exp (prune_gcc_output): Ignore Cygwin warning about ignoring -fpic.

        * lib/prune.exp (prune_gcc_output): Ignore Cygwin warning about
        ignoring -fpic.
        * lib/old-dejagnu.exp (old-dejagnu): Also pass compiler output
        through prune_gcc_output.

From-SVN: r51102

22 years agoposix-threads.cc (_Jv_ThreadSelf_out_of_line): Use write_barrier, not release_set.
Bryce McKinlay [Thu, 21 Mar 2002 00:26:46 +0000 (00:26 +0000)]
posix-threads.cc (_Jv_ThreadSelf_out_of_line): Use write_barrier, not release_set.

* posix-threads.cc (_Jv_ThreadSelf_out_of_line): Use write_barrier,
not release_set.
* sysdep/powerpc/locks.h (write_barrier): New function.
* sysdep/i386/locks.h (write_barrier): New function.

From-SVN: r51101

22 years ago* config/i386/cygwin.h (DWARF2_UNWIND_INFO): Define to 0.
Jason Merrill [Thu, 21 Mar 2002 00:23:36 +0000 (19:23 -0500)]
* config/i386/cygwin.h (DWARF2_UNWIND_INFO): Define to 0.

From-SVN: r51099

22 years agore PR c++/4361 (bogus ambiguity taking the address of a member template)
Nathan Sidwell [Wed, 20 Mar 2002 23:09:00 +0000 (23:09 +0000)]
re PR c++/4361 (bogus ambiguity taking the address of a member template)

cp:
PR c++/4361
* mangle.c (struct globals) Add internal_mangling_p member.
(write_template_param): Do internal mangling, if needed.
(mangle_conv_op_name_for_type): Request internal mangling.

From-SVN: r51098

22 years agoClarify that -O2 sets -fstrict-aliasing
Michael Meissner [Wed, 20 Mar 2002 22:56:33 +0000 (22:56 +0000)]
Clarify that -O2 sets -fstrict-aliasing

From-SVN: r51097

22 years agoxtensa.h (ASM_OUTPUT_POOL_PROLOGUE): Emit a ".literal_position" directive before...
Bob Wilson [Wed, 20 Mar 2002 22:43:11 +0000 (22:43 +0000)]
xtensa.h (ASM_OUTPUT_POOL_PROLOGUE): Emit a ".literal_position" directive before the constant pool.

        * config/xtensa/xtensa.h (ASM_OUTPUT_POOL_PROLOGUE): Emit a
        ".literal_position" directive before the constant pool.

From-SVN: r51096

22 years agocontrib.texi (Contributors): Update Geoffrey Keating.
Gerald Pfeifer [Wed, 20 Mar 2002 22:40:01 +0000 (23:40 +0100)]
contrib.texi (Contributors): Update Geoffrey Keating.

* doc/contrib.texi (Contributors): Update Geoffrey Keating.
Add Craig Rodrigues.
Add Brad Lucier to testers.

From-SVN: r51095

22 years agogcj.texi: @code{gcj} becomes @command{gcj}.
Nic Ferrier [Wed, 20 Mar 2002 22:07:58 +0000 (22:07 +0000)]
gcj.texi: @code{gcj} becomes @command{gcj}.

        * gcj.texi: @code{gcj} becomes @command{gcj}.
        @code{gcc} becomes @command{gcc}.
        GcjRaw changed to gnu.gcc.RawData.

From-SVN: r51092

22 years agore PR target/4792 (Internal compiler error building libgcc2 for arc-elf target)
Jakub Jelinek [Wed, 20 Mar 2002 22:02:06 +0000 (23:02 +0100)]
re PR target/4792 (Internal compiler error building libgcc2 for arc-elf target)

PR target/4792
* config/arc/arc.md (movsicc, movdicc, movsfcc, movdfcc): Add mode
to if_then_else.
(movsicc_insn, movdicc_insn, movsfcc_insn, movdfcc_insn): Likewise.
* config/arc/arc.c (arc_final_prescan_insn): Use extract_insn_cached
instead of insn_extract.

From-SVN: r51090

22 years agore PR bootstrap/4192 (fr30-elf does not build - memory exhausted building crtbegin.o)
Jakub Jelinek [Wed, 20 Mar 2002 21:58:57 +0000 (22:58 +0100)]
re PR bootstrap/4192 (fr30-elf does not build - memory exhausted building crtbegin.o)

PR bootstrap/4192
* config/fr30/fr30.md (jump): Comment out clobber of fixed register.

* genemit.c (output_added_clobbers_hard_reg_p): Only output return
stmt if some case has been output.

* gcc.c-torture/compile/20020320-1.c: New test.

From-SVN: r51088

22 years agore PR c/5972 (produces wrong assembly code when -march=pentiumpro and optimization...
Jakub Jelinek [Wed, 20 Mar 2002 21:47:07 +0000 (22:47 +0100)]
re PR c/5972 (produces wrong assembly code when -march=pentiumpro and optimization (e.g. -O2)is on)

PR c/5972
* config/i386/i386.md (movdicc_c_rex64, movsicc_noc, movhicc_noc,
movsfcc_1, movdfcc_1): Add %O2.
* config/i386/i386.c (print_operand): Handle %ON.
Print . before float condition codes in Sun as cmov syntax.
* config/i386/sol2.h (CMOV_SUN_AS_SYNTAX): Define for Sun as.
* config.gcc (i[34567]86-*-solaris2*): Remove comment which is
no longer true.

From-SVN: r51086

22 years agoarm.c (arm_output_epilogue): Don't generate separate return instruction if PC was...
Philip Blundell [Wed, 20 Mar 2002 20:09:36 +0000 (20:09 +0000)]
arm.c (arm_output_epilogue): Don't generate separate return instruction if PC was popped.

2002-03-20  Philip Blundell  <pb@nexus.co.uk>

* config/arm/arm.c (arm_output_epilogue): Don't generate separate
return instruction if PC was popped.

From-SVN: r51083

22 years agore PR c++/2136 (g++ seems to disregard '::' in '::delete')
Jason Merrill [Wed, 20 Mar 2002 19:50:24 +0000 (14:50 -0500)]
re PR c++/2136 (g++ seems to disregard '::' in '::delete')

        PR c++/2136
        * init.c (build_delete): Check access for a member op delete here.
        * decl2.c (delete_sanity): Not here.

From-SVN: r51079

22 years agoxtensa.md: Remove unused type attributes.
Bob Wilson [Wed, 20 Mar 2002 18:37:43 +0000 (18:37 +0000)]
xtensa.md: Remove unused type attributes.

        * config/xtensa/xtensa.md: Remove unused type attributes.
        (adddi_carry, subddi_carry): Change type attribute to "multi".

From-SVN: r51078

22 years agomangle11.C was duplicate of mangle3.C
Jakub Jelinek [Wed, 20 Mar 2002 18:03:21 +0000 (19:03 +0100)]
mangle11.C was duplicate of mangle3.C

From-SVN: r51077

22 years agore PR c++/5118 (c4x-g++ Fails on Templates)
Jason Merrill [Wed, 20 Mar 2002 16:58:24 +0000 (11:58 -0500)]
re PR c++/5118 (c4x-g++ Fails on Templates)

        PR c++/5118
        * class.c (get_vfield_name): Use the constructor_name.

From-SVN: r51075

22 years agoPR optimization/5999, middle-end/5731
Dale Johannesen [Wed, 20 Mar 2002 09:41:46 +0000 (10:41 +0100)]
PR optimization/5999, middle-end/5731

PR optimization/5999, middle-end/5731
* expr.c (expand_expr) [RDIV_EXPR]: Only convert real divisions into
multiplications by reciprocals.

* gcc.c-torture/compile/20020319-1.c: New test.

From-SVN: r51071

22 years agoDaily bump.
GCC Administrator [Wed, 20 Mar 2002 08:18:21 +0000 (08:18 +0000)]
Daily bump.

From-SVN: r51070

22 years agoMakefile.in: Update.
Neil Booth [Wed, 20 Mar 2002 07:58:41 +0000 (07:58 +0000)]
Makefile.in: Update.

* Makefile.in: Update.
* c-common.c: Include langhooks.h.
(inline_forbidden_p): Use new hook.
* diagnostic.c: Include langhooks.h.
(format_with_decl, announce_function,
default_print_error_function): Use new hook.
* dwarf2out.c (dwarf2_name): Use new hook.
* function.c: Include langhooks.h.
(init_function_start): Use new hook.
* langhooks-def.h (lhd_decl_printable_name): New.
(LANGHOOKS_DECL_PRINTABLE_NAME): New.
(LANGHOOKS_INITIALIZER): Update.
* langhooks.c (lhd_decl_printable_name): New.
* langhooks.h (struct lang_hooks): New hook.
* toplev.c (decl_name, decl_printable_name): Remove.
(open_dump_file): Use new hook.
(process_options): Remove old hook.
* tree.h (decl_printable_name): Remove.
ada:
* misc.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine.
(gnat_init): Remove old hook.
cp:
* cp-lang.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine.
* cp-tree.h (lang_printable_name): Rename.
* error.c (lang_decl_name): Use new hook.
* lex.c (cxx_init): Remove old hook.
* pt.c (tsubst_expr): Use new hook.
* tree.c (lang_printable_name): Rename.
f:
* com.c (lang_printable_name): Rename.
(LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine.
(ffe_init): Don't use old hook.
java:
* decl.c (start_java_method): Use new hook.
* lang.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine.
(java_init): Remove old hook.
objc:
* objc-act.c (objc_init): Remove old hook.
(objc_printable_name): Export.
* objc-act.h (objc_printable_name): New.
* objc-lang.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine.

From-SVN: r51066

22 years agoc-lex.c (cb_file_change): Pass the #inclusion's line number to the start_source_file...
Jim Blandy [Wed, 20 Mar 2002 05:06:51 +0000 (05:06 +0000)]
c-lex.c (cb_file_change): Pass the #inclusion's line number to the start_source_file debug hook...

* c-lex.c (cb_file_change): Pass the #inclusion's line number to
the start_source_file debug hook, not the current line number.

From-SVN: r51064

22 years ago* fold-const.c (fold): Delete #if 0 ARRAY_REF case.
David Edelsohn [Wed, 20 Mar 2002 02:37:21 +0000 (02:37 +0000)]
* fold-const.c (fold): Delete #if 0 ARRAY_REF case.

From-SVN: r51061

22 years agoflow.c (EH_USES): Provide default.
Richard Henderson [Wed, 20 Mar 2002 02:13:39 +0000 (18:13 -0800)]
flow.c (EH_USES): Provide default.

        * flow.c (EH_USES): Provide default.
        (calculate_global_regs_live): Use it for EH edges and noreturn calls.
        * doc/tm.texi (EH_USES): New.

        * config/ia64/ia64.c (ia64_eh_uses): New.
        * config/ia64/ia64-protos.h: Update.
        * config/ia64/ia64.h (EH_USES): New.

From-SVN: r51060

22 years ago* varasm.c (output_constant_def): Fix stupid typo.
Richard Henderson [Wed, 20 Mar 2002 02:12:18 +0000 (18:12 -0800)]
* varasm.c (output_constant_def): Fix stupid typo.

From-SVN: r51059

22 years agoMark PR last change.
Richard Henderson [Wed, 20 Mar 2002 01:06:18 +0000 (17:06 -0800)]
Mark PR last change.

From-SVN: r51056

22 years agoexcept.c (current_function_has_exception_handlers): New.
Richard Henderson [Wed, 20 Mar 2002 00:49:13 +0000 (16:49 -0800)]
except.c (current_function_has_exception_handlers): New.

        * except.c (current_function_has_exception_handlers): New.
        * except.h: Declare it.
        * sibcall.c (optimize_sibling_and_tail_recursive_call): Use it.
        Combine tests that disable all sibcalls for the function.

From-SVN: r51054

22 years agovarasm.c (output_constant_def): Don't call ENCODE_SECTION_INFO for INTEGER_CST.
Olivier Hainque [Tue, 19 Mar 2002 22:51:04 +0000 (23:51 +0100)]
varasm.c (output_constant_def): Don't call ENCODE_SECTION_INFO for INTEGER_CST.

* varasm.c (output_constant_def): Don't call ENCODE_SECTION_INFO
for INTEGER_CST.

From-SVN: r51052

22 years agolocale-inst.cc (__convert_from_v): Add an additional __size parameter in the declarat...
Paolo Carlini [Tue, 19 Mar 2002 22:33:06 +0000 (23:33 +0100)]
locale-inst.cc (__convert_from_v): Add an additional __size parameter in the declarations.

2002-03-19  Paolo Carlini  <pcarlini@unitus.it>
    Ulrich Drepper  <drepper@redhat.com>

* src/locale-inst.cc (__convert_from_v): Add an additional
__size parameter in the declarations.
* include/bits/locale_facets.tcc
(__convert_from_v): When available (that is,
_GLIBCPP_USE_C99 defined) use snprintf instead of sprintf.
(num_put::_M_convert_float): Depending on _GLIBCPP_USE_C99
being defined or not, call and use __convert_from_v in the
appropriate way.
(num_put::_M_convert_int): Same here.
(money_put::do_put(long double)): Same here.

Co-Authored-By: Ulrich Drepper <drepper@redhat.com>
From-SVN: r51050

22 years agoRecord pr number for last change.
Richard Henderson [Tue, 19 Mar 2002 22:28:51 +0000 (14:28 -0800)]
Record pr number for last change.

From-SVN: r51049

22 years agoia64.c: Revert 2002-03-01 patch.
Richard Henderson [Tue, 19 Mar 2002 22:16:10 +0000 (14:16 -0800)]
ia64.c: Revert 2002-03-01 patch.

        * config/ia64/ia64.c: Revert 2002-03-01 patch.
        * config/ia64/ia64.h (INIT_EXPANDERS): New.

From-SVN: r51048

22 years ago2002-03-19 Martin Kahlert <martin.kahlert@infineon.com>
Martin Kahlert [Tue, 19 Mar 2002 21:45:42 +0000 (21:45 +0000)]
2002-03-19  Martin Kahlert  <martin.kahlert@infineon.com>

* include/jni.h Use correct C comments

From-SVN: r51046

22 years agocppmacro.c (cpp_macro_definition): Emit a space after the macro name...
Jim Blandy [Tue, 19 Mar 2002 21:43:39 +0000 (21:43 +0000)]
cppmacro.c (cpp_macro_definition): Emit a space after the macro name...

* cppmacro.c (cpp_macro_definition): Emit a space after the macro
name, even if the replacement list contains no tokens, as required
by Dwarf.

From-SVN: r51045

22 years agovarasm.c (globalize_decl): Get the name from the RTL, not DECL_ASSEMBLER_NAME.
Jason Merrill [Tue, 19 Mar 2002 21:38:43 +0000 (16:38 -0500)]
varasm.c (globalize_decl): Get the name from the RTL, not DECL_ASSEMBLER_NAME.

        * varasm.c (globalize_decl): Get the name from the RTL, not
        DECL_ASSEMBLER_NAME.

From-SVN: r51043

22 years ago* Makefile.in (LIBGCC2_DEBUG_CFLAGS): Set to -g.
Jason Merrill [Tue, 19 Mar 2002 21:24:41 +0000 (16:24 -0500)]
* Makefile.in (LIBGCC2_DEBUG_CFLAGS): Set to -g.

From-SVN: r51041

22 years agoxtensa.md (adddi3, [...]): Define.
Bob Wilson [Tue, 19 Mar 2002 20:16:35 +0000 (20:16 +0000)]
xtensa.md (adddi3, [...]): Define.

        * config/xtensa/xtensa.md (adddi3, adddi_carry, subdi3,
        subdi_carry): Define.

From-SVN: r51039

22 years agoindex.html (#3.6): Rewrap and close <a href> tags.
Phil Edwards [Tue, 19 Mar 2002 20:16:12 +0000 (20:16 +0000)]
index.html (#3.6): Rewrap and close <a href> tags.

2002-03-19  Phil Edwards  <pme@gcc.gnu.org>

* docs/html/faq/index.html (#3.6):  Rewrap and close <a href> tags.
* docs/html/faq/index.txt:  Regenerate.

From-SVN: r51038

22 years agoRemove conflict marker.
Andreas Jaeger [Tue, 19 Mar 2002 20:02:52 +0000 (21:02 +0100)]
Remove conflict marker.

From-SVN: r51036

22 years agoacinclude.m4 (GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS): Define GLIBCPP_ENABLE_LIBUNWIND_E...
Steve Ellcey [Tue, 19 Mar 2002 19:50:30 +0000 (19:50 +0000)]
acinclude.m4 (GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS): Define GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS to set LIBUNWIND_FLAG if...

2002-03-19  Steve Ellcey  <sje@cup.hp.com>

        * acinclude.m4 (GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS): Define
        GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS to set LIBUNWIND_FLAG if
        --enable-libunwind-exceptions is set.
        * configure.in (GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS): Call new
        macro to check for libunwind.
        * configure: Regenerate.
        * src/Makefile.am (libstdc___la_LDFLAGS): Add
        LIBUNWIND_FLAG to libstdc link line.
        * src/Makefile.in: Regenerate.

From-SVN: r51035

22 years agors6000.c (rs6000_override_options): Only warn about -fpic/-fPIC if extra_warnings...
David Edelsohn [Tue, 19 Mar 2002 19:46:49 +0000 (19:46 +0000)]
rs6000.c (rs6000_override_options): Only warn about -fpic/-fPIC if extra_warnings set.

        * config/rs6000/rs6000.c (rs6000_override_options): Only warn
        about -fpic/-fPIC if extra_warnings set.

From-SVN: r51034

22 years agoexpr.c (expand_expr): Sign-extend CONST_INT generated from TREE_STRING_POINTER.
David Edelsohn [Tue, 19 Mar 2002 19:39:03 +0000 (19:39 +0000)]
expr.c (expand_expr): Sign-extend CONST_INT generated from TREE_STRING_POINTER.

        * expr.c (expand_expr): Sign-extend CONST_INT generated from
        TREE_STRING_POINTER.

From-SVN: r51033

22 years agosparc.h (CAN_ELMINIATE): Can only eliminate FP in favor of SP if FRAME_POINTER_REQUIR...
Richard Kenner [Tue, 19 Mar 2002 19:33:42 +0000 (19:33 +0000)]
sparc.h (CAN_ELMINIATE): Can only eliminate FP in favor of SP if FRAME_POINTER_REQUIRED is false.

* config/sparc/sparc.h (CAN_ELMINIATE): Can only eliminate FP
in favor of SP if FRAME_POINTER_REQUIRED is false.

From-SVN: r51032

22 years agoemit-rtl.c (gen_int_mode): New function.
Lars Brinkhoff [Tue, 19 Mar 2002 18:00:43 +0000 (10:00 -0800)]
emit-rtl.c (gen_int_mode): New function.

        * emit-rtl.c (gen_int_mode): New function.
        * rtl.h: Prototype for it.
        * combine.c (make_extraction, simplify_comparison), expmed.c
        (store_bit_field, expand_mult_highpart, expand_divmod), expr.c
        (convert_modes, store_field), optabs.c (expand_fix),
        simplify-rtx.c (neg_const_int, simplify_unary_real),

        * config/rs6000/rs6000.c, config/rs6000/rs6000.md:
        Use it instead of GEN_INT (trunc_int_for_mode (...)).

From-SVN: r51030

22 years agoindex.html: Add OS X workaround.
Benjamin Kosnik [Tue, 19 Mar 2002 17:20:22 +0000 (17:20 +0000)]
index.html: Add OS X workaround.

2002-03-19  Benjamin Kosnik  <bkoz@redhat.com>

* docs/html/faq/index.html: Add OS X workaround.
* docs/html/17_intro/TODO: Update.

From-SVN: r51029

22 years agoindex.html: Add OS X workaround.
Benjamin Kosnik [Tue, 19 Mar 2002 17:17:46 +0000 (17:17 +0000)]
index.html: Add OS X workaround.

2002-03-19  Benjamin Kosnik  <bkoz@redhat.com>

* docs/html/faq/index.html: Add OS X workaround.
* docs/html/17_intro/TODO: Update.

From-SVN: r51028

22 years ago* MAINTAINERS: Update my email address.
J"orn Rennecke [Tue, 19 Mar 2002 09:06:46 +0000 (09:06 +0000)]
* MAINTAINERS:  Update my email address.

From-SVN: r51027

22 years ago* gcc.dg/struct-by-value-1.c: New test.
Jakub Jelinek [Tue, 19 Mar 2002 08:49:43 +0000 (09:49 +0100)]
* gcc.dg/struct-by-value-1.c: New test.

From-SVN: r51026

22 years agore PR c/5656 (ICE in emit_move_insn, at expr.c:2748, regression from gcc 3.0)
Jakub Jelinek [Tue, 19 Mar 2002 08:47:14 +0000 (09:47 +0100)]
re PR c/5656 (ICE in emit_move_insn, at expr.c:2748, regression from gcc 3.0)

PR c/5656
* langhooks.h (struct lang_hooks_for_tree_inlining): Add
convert_parm_for_inlining.
* c-lang.c (LANG_HOOKS_TREE_INLINING_CONVERT_PARM_FOR_INLINING):
Define.
* langhooks-def.h: Likewise.
* objc/objc-lang.c: Likewise.
* langhooks.c (lhd_tree_inlining_convert_parm_for_inlining): New
function.
* tree-inline.c (initialize_inlined_parameters):
Call convert_parm_for_inlining lang hook if needed.
* c-typeck.c (c_convert_parm_for_inlining): New function.
* c-tree.h (c_convert_parm_for_inlining): Add prototype.

* gcc.c-torture/compile/20020318-1.c: New test.

From-SVN: r51025

22 years agoDaily bump.
GCC Administrator [Tue, 19 Mar 2002 08:18:08 +0000 (08:18 +0000)]
Daily bump.

From-SVN: r51024

22 years agoadd mangling note
Jason Merrill [Tue, 19 Mar 2002 00:21:38 +0000 (19:21 -0500)]
add mangling note

From-SVN: r51015

22 years agolocale_facets.tcc (money_put::do_put(long double)): Fix dimensioning of temporary...
Paolo Carlini [Mon, 18 Mar 2002 23:11:57 +0000 (00:11 +0100)]
locale_facets.tcc (money_put::do_put(long double)): Fix dimensioning of temporary buffers to avoid risk of overruns.

2002-03-18  Paolo Carlini  <pcarlini@unitus.it>

* include/bits/locale_facets.tcc
(money_put::do_put(long double)): Fix dimensioning of
temporary buffers to avoid risk of overruns.
(money_put::do_put(string)): Same for the buffer used to
add the grouping chars.
* testsuite/22_locale/money_put_members_char.cc: Add test06.
* testsuite/22_locale/money_put_members_wchar_t.cc: Ditto.

* include/bits/locale_facets.tcc
(collate::do_transform): Simplify.

From-SVN: r51012

22 years agocalls.c (precompute_arguments): Do not assume that temporaries can be destroyed after...
Mark Mitchell [Mon, 18 Mar 2002 22:25:50 +0000 (22:25 +0000)]
calls.c (precompute_arguments): Do not assume that temporaries can be destroyed after expanding the argument.

* calls.c (precompute_arguments): Do not assume that temporaries
can be destroyed after expanding the argument.
(expand_call): Likewise.

From-SVN: r51011

22 years agojni.h (JNIIMPORT): New macro.
Tom Tromey [Mon, 18 Mar 2002 21:55:42 +0000 (21:55 +0000)]
jni.h (JNIIMPORT): New macro.

* include/jni.h (JNIIMPORT): New macro.
(JNIEXPORT): Likewise.
(JNICALL): Likewise.

From-SVN: r51009

22 years agoacinclude.m4 (GLIBCPP_CONFIGURE): Make indentation/spacing uniform.
Phil Edwards [Mon, 18 Mar 2002 21:41:02 +0000 (21:41 +0000)]
acinclude.m4 (GLIBCPP_CONFIGURE): Make indentation/spacing uniform.

2002-03-18  Phil Edwards  <pme@gcc.gnu.org>

* acinclude.m4 (GLIBCPP_CONFIGURE):  Make indentation/spacing uniform.
* configure.in:  Add comments pointing the way for autoconf 2.5x.
* aclocal.m4, config.h.in, configure:  Regenerate.

From-SVN: r51007

22 years agojni.exp (gcj_jni_test_one): Find libstdc++ in build tree.
Tom Tromey [Mon, 18 Mar 2002 21:39:09 +0000 (21:39 +0000)]
jni.exp (gcj_jni_test_one): Find libstdc++ in build tree.

* libjava.jni/jni.exp (gcj_jni_test_one): Find libstdc++ in build
tree.
(gcj_invoke): Added ld_library_additions argument.

From-SVN: r51006

22 years agoMissed ChangeLog entry in checkin.
Eric Christopher [Mon, 18 Mar 2002 20:48:14 +0000 (20:48 +0000)]
Missed ChangeLog entry in checkin.

From-SVN: r51002

22 years agore PR c++/3882 (gcc 3.0 error referencing a variable in its initializer expression...
Eric Botcazou [Mon, 18 Mar 2002 20:19:39 +0000 (20:19 +0000)]
re PR c++/3882 (gcc 3.0 error referencing a variable in its initializer expression in template code)

        PR c++/3882
        * pt.c (tsubst_decl): Move __PRETTY_FUNCTION__ handling...
        (tsubst_expr) [DECL_STMT]: ...here. And substitute the initializer
        only after recording the declaration.

From-SVN: r50999

22 years agostrtod.c (strtod): Increment 8 chars, not 7, when `infinity' seen.
Stuart Griffith [Mon, 18 Mar 2002 19:52:14 +0000 (19:52 +0000)]
strtod.c (strtod): Increment 8 chars, not 7, when `infinity' seen.

2002-03-18  Stuart Griffith  <Stuart_Griffith@credence.com>

* strtod.c (strtod): Increment 8 chars, not 7, when `infinity'
seen.

From-SVN: r50994

22 years agore PR c++/2039 (bad code generated for access to unnamed union in base class)
Jason Merrill [Mon, 18 Mar 2002 19:44:29 +0000 (14:44 -0500)]
re PR c++/2039 (bad code generated for access to unnamed union in base class)

        PR c++/2039
        * init.c (resolve_offset_ref): Hand off to build_component_ref.

From-SVN: r50991

22 years agore PR java/5876 (jc1 crashes when targeting mingw32)
Alexandre Petit-Bianco [Mon, 18 Mar 2002 19:38:35 +0000 (11:38 -0800)]
re PR java/5876 (jc1 crashes when targeting mingw32)

2002-03-18  Alexandre Petit-Bianco  <apbianco@redhat.com>

* builtins.c (define_builtin): Do nothing if `type' is null.
Fixes PR java/5876.

From-SVN: r50990

22 years agomips.md (andsi3): Force operand 1 to a register too.
Alexandre Oliva [Mon, 18 Mar 2002 19:17:27 +0000 (19:17 +0000)]
mips.md (andsi3): Force operand 1 to a register too.

* config/mips/mips.md (andsi3) [TARGET_MIPS16]: Force operand 1 to
a register too.
(anddi3, iorsi3): Likewise.

From-SVN: r50988

22 years agomips.h (ENCODE_SECTION_INFO): Don't use %gprel for symbols that are going to be place...
Alexandre Oliva [Mon, 18 Mar 2002 19:15:24 +0000 (19:15 +0000)]
mips.h (ENCODE_SECTION_INFO): Don't use %gprel for symbols that are going to be placed in linkonce sections.

* config/mips/mips.h (ENCODE_SECTION_INFO) [TARGET_MIPS16]: Don't
use %gprel for symbols that are going to be placed in linkonce
sections.

From-SVN: r50986

22 years agomips.h (ELIMINABLE_REGS): Can't eliminate RETURN_ADDRESS_POINTER_REGNUM to $ra.
Alexandre Oliva [Mon, 18 Mar 2002 19:12:50 +0000 (19:12 +0000)]
mips.h (ELIMINABLE_REGS): Can't eliminate RETURN_ADDRESS_POINTER_REGNUM to $ra.

* config/mips/mips.h (ELIMINABLE_REGS): Can't eliminate
RETURN_ADDRESS_POINTER_REGNUM to $ra.
(CAN_ELIMINATE): Only eliminate it to $sp if a frame pointer is
not needed.  Disregard leaf_function_p().
(INITIAL_ELIMINATION_OFFSET): Adjust for elimination of rap to
mips16 frame pointer.
* config/mips/mips.md (store ra): Only to small SP offsets.
2001-08-22  Graham Stott  <grahams@redhat.com>
* config/mips/mips.h (RETURN_ADDR_RTX): For a leaf function
return a REG rtx for the return address register.

From-SVN: r50985

22 years agoxtensa.h (GO_IF_MODE_DEPENDENT_ADDRESS): Treat constant-pool addresses as "mode-depen...
Bob Wilson [Mon, 18 Mar 2002 18:20:19 +0000 (18:20 +0000)]
xtensa.h (GO_IF_MODE_DEPENDENT_ADDRESS): Treat constant-pool addresses as "mode-dependent".

        * config/xtensa/xtensa.h (GO_IF_MODE_DEPENDENT_ADDRESS): Treat
        constant-pool addresses as "mode-dependent".
        (GO_IF_LEGITIMATE_ADDRESS): Rename macro arguments.

From-SVN: r50984

22 years agoi386-signal.h (old_i386_kernel_sigaction): New.
Andrew Haley [Mon, 18 Mar 2002 17:11:43 +0000 (17:11 +0000)]
i386-signal.h (old_i386_kernel_sigaction): New.

2002-03-18  Andrew Haley  <aph@cambridge.redhat.com>

        * include/i386-signal.h (old_i386_kernel_sigaction): New.
        INIT_SEGV: Use old_i386_kernel_sigaction.
        INIT_FP: Likewise.

From-SVN: r50980

22 years agoPR c++/4222, c++/5995
Jason Merrill [Mon, 18 Mar 2002 16:55:11 +0000 (11:55 -0500)]
PR c++/4222, c++/5995

        PR c++/4222, c++/5995
        * call.c (build_over_call): Fix empty class logic.

From-SVN: r50978

22 years agore PR target/5740 (sparcv9 ICE on complex_value.cc in libstdc++ test suite)
Jakub Jelinek [Mon, 18 Mar 2002 15:08:31 +0000 (16:08 +0100)]
re PR target/5740 (sparcv9 ICE on complex_value.cc in libstdc++ test suite)

PR target/5740
* expr.c (emit_group_load): Use extract_bit_field if
needed for CONCAT arguments.

* g++.dg/opt/conj1.C: New test.

From-SVN: r50975

22 years agore PR c++/3870 (gcc 3.0 bogus error specializing a template function)
Jason Merrill [Mon, 18 Mar 2002 14:36:19 +0000 (09:36 -0500)]
re PR c++/3870 (gcc 3.0 bogus error specializing a template function)

        PR c++/3870
        * cp-tree.h (struct saved_scope): Add last_parms field.
        * decl.c (maybe_push_to_top_level): Save last_function_parms.
        (pop_from_top_level): Restore it.

From-SVN: r50970

22 years agore PR c++/4377 (more errors with multiple non-type template parameters)
Jason Merrill [Mon, 18 Mar 2002 13:38:00 +0000 (08:38 -0500)]
re PR c++/4377 (more errors with multiple non-type template parameters)

        PR c++/4377
        * mangle.c (write_expression): Strip NOP_EXPRs sooner.  Also strip
        NON_LVALUE_EXPRs.

From-SVN: r50967

22 years agore PR c++/4003 (ICE on template instantiation including friendship declaration.)
Jason Merrill [Mon, 18 Mar 2002 13:27:03 +0000 (08:27 -0500)]
re PR c++/4003 (ICE on template instantiation including friendship declaration.)

        PR c++/4003
        * pt.c (tsubst_friend_function): Use decl_namespace_context.

From-SVN: r50966

22 years agoPR c++/3948 -- C++ ABI change, followup to 2001-12-18 patch.
Jason Merrill [Mon, 18 Mar 2002 11:34:31 +0000 (06:34 -0500)]
PR c++/3948 -- C++ ABI change, followup to 2001-12-18 patch.

        * class.c (finish_struct_bits): Also set TREE_ADDRESSABLE for a
        type with a nontrivial destructor.

From-SVN: r50964

22 years agore PR target/4863 (arm/thumb: code for switch statements: branch out of range)
Richard Earnshaw [Mon, 18 Mar 2002 11:27:39 +0000 (11:27 +0000)]
re PR target/4863 (arm/thumb: code for switch statements: branch out of range)

PR target/4863
* arm.md (tablejump): Make this a define_expand.  For PIC add the
offset to the base of the table.
(thumb_tablejump): Matcher for Thumb tablejump insn.
* config/arm/aout.h (ASM_OUTPUT_ADDR_DIFF_ELT): Output thumb entries
as the difference of two labels.
* config/arm/aof.h (ASM_OUTPUT_ADDR_DIFF_ELT): Likewise.
* config/arm/elf.h (JUMP_TABLES_IN_TEXT_SECTION): Only put ARM jump
tables in the code.
* config/arm/coff.h (JUMP_TABLES_IN_TEXT_SECTION): Likewise.
* arm.c (get_jump_table_size): If the table is not in the text
section, return zero.

From-SVN: r50962

22 years agoarm.md (tablejump): Make this a define_expand.
Richard Earnshaw [Mon, 18 Mar 2002 11:26:24 +0000 (11:26 +0000)]
arm.md (tablejump): Make this a define_expand.

* arm.md (tablejump): Make this a define_expand.  For PIC add the
offset to the base of the table.
(thumb_tablejump): Matcher for Thumb tablejump insn.
* config/arm/aout.h (ASM_OUTPUT_ADDR_DIFF_ELT): Output thumb entries
as the difference of two labels.
* config/arm/aof.h (ASM_OUTPUT_ADDR_DIFF_ELT): Likewise.
* config/arm/elf.h (JUMP_TABLES_IN_TEXT_SECTION): Only put ARM jump
tables in the code.
* config/arm/coff.h (JUMP_TABLES_IN_TEXT_SECTION): Likewise.
* arm.c (get_jump_table_size): If the table is not in the text
section, return zero.

From-SVN: r50960

22 years agoPR c++/3948 -- C++ ABI change, followup to 2001-12-18 patch.
Jason Merrill [Mon, 18 Mar 2002 11:24:24 +0000 (06:24 -0500)]
PR c++/3948 -- C++ ABI change, followup to 2001-12-18 patch.

        * class.c (finish_struct_bits): Also set TREE_ADDRESSABLE for a
        type with a nontrivial destructor.

From-SVN: r50959

22 years agojartool.c (expand_options): Handle tar-style argument list with a leading "-".
Bryce McKinlay [Mon, 18 Mar 2002 11:08:21 +0000 (11:08 +0000)]
jartool.c (expand_options): Handle tar-style argument list with a leading "-".

* jartool.c (expand_options): Handle tar-style argument list with a
leading "-".

From-SVN: r50957

22 years agohash_map.h: hash, hashtable, hash_map and hash_multimap are in namespace __gnu_cxx.
Philipp Thomas [Mon, 18 Mar 2002 10:47:15 +0000 (10:47 +0000)]
hash_map.h: hash, hashtable, hash_map and hash_multimap are in namespace __gnu_cxx.

2002-03-15  Philipp Thomas  <pthomas@suse.de>

* include/backward/hash_map.h: hash, hashtable, hash_map and
hash_multimap are in namespace __gnu_cxx.
include/backward/hash_set.h: hash, hashtable, hash_set and
hash_multiset are in namespace __gnu_cxx.
include/backward/hashtable.h: hash and hashtable are in
namespace __gnu_cxx.
include/backward/rope.h: char_producer, sequence_buffer,
rope, crope and wrope are in namespace __gnu_cxx.
include/backward/slist.h: slist is in namespace __gnu_cxx.
* testsuite/backward/header_hash_map_h.cc
testsuite/backward/header_hash_set_h.cc
testsuite/backward/header_hashtable_h.cc
testsuite/backward/header_rope_h.cc
testsuite/backward/header_slist_h.cc
testsuite/backward/header_tempbuf_h.cc: New tests for
checking that we're using the correct namespace.

From-SVN: r50956

22 years agoparse.y (parser_check_super_interface): Fix error message grammar/order.
Bryce McKinlay [Mon, 18 Mar 2002 10:41:01 +0000 (10:41 +0000)]
parse.y (parser_check_super_interface): Fix error message grammar/order.

* parse.y (parser_check_super_interface): Fix error message
grammar/order.

From-SVN: r50955

22 years agofix spelling typo in previous ChnageLog entry.
Nick Clifton [Mon, 18 Mar 2002 10:21:43 +0000 (10:21 +0000)]
fix spelling typo in previous ChnageLog entry.

From-SVN: r50953

22 years agoFix big-endian code generation
Bernd Schmidt [Mon, 18 Mar 2002 10:20:29 +0000 (10:20 +0000)]
Fix big-endian code generation

From-SVN: r50952

22 years agoDaily bump.
GCC Administrator [Mon, 18 Mar 2002 08:18:41 +0000 (08:18 +0000)]
Daily bump.

From-SVN: r50951

22 years agoqualttp20.C: Revert previous change.
Mark Mitchell [Mon, 18 Mar 2002 07:39:24 +0000 (07:39 +0000)]
qualttp20.C: Revert previous change.

* g++.dg/template/qualttp20.C: Revert previous change.
* g++.dg/template/qualttp3.C: Likewise.
* g++.dg/template/qualttp4.C: Likewise
* g++.dg/template/qualttp5.C: Likewise
* g++.dg/template/qualttp6.C: Likewise
* g++.dg/template/qualttp7.C: Likewise
* g++.dg/template/qualttp8.C: Likewise
* g++.dg/template/recurse.C: Likewise.

From-SVN: r50946

22 years agonatSystem.cc (init_properties): Update VM version properties.
Bryce McKinlay [Mon, 18 Mar 2002 06:19:03 +0000 (06:19 +0000)]
natSystem.cc (init_properties): Update VM version properties.

* java/lang/natSystem.cc (init_properties): Update VM version
properties.
* configure.in: Set GCJVERSION.
* acconfig.h: Add GCJVERSION.
* configure: Rebuilt.
* include/config.h.in: Rebuilt.

From-SVN: r50944

22 years agors6000.h (PREDICATE_CODES): Add PARALLEL to any_operand.
Aldy Hernandez [Mon, 18 Mar 2002 04:20:17 +0000 (04:20 +0000)]
rs6000.h (PREDICATE_CODES): Add PARALLEL to any_operand.

2002-03-18  Aldy Hernandez  <aldyh@redhat.com>

        * config/rs6000/rs6000.h (PREDICATE_CODES): Add PARALLEL to
        any_operand.

From-SVN: r50943

22 years agoalpha.c (alpha_emit_set_const_1): Build add insns explicitly.
Richard Henderson [Mon, 18 Mar 2002 03:06:05 +0000 (19:06 -0800)]
alpha.c (alpha_emit_set_const_1): Build add insns explicitly.

        * config/alpha/alpha.c (alpha_emit_set_const_1): Build add insns
        explicitly.

From-SVN: r50942

22 years agommix.md ("fixuns_truncdfdi2"): Use (unsigned_fix:DI (unsigned_fix:DF op1)), not ...
Hans-Peter Nilsson [Mon, 18 Mar 2002 01:20:14 +0000 (01:20 +0000)]
mmix.md ("fixuns_truncdfdi2"): Use (unsigned_fix:DI (unsigned_fix:DF op1)), not (unsigned_fix:DI (fix:DF op1)).

* config/mmix/mmix.md ("fixuns_truncdfdi2"): Use (unsigned_fix:DI
(unsigned_fix:DF op1)), not (unsigned_fix:DI (fix:DF op1)).

From-SVN: r50940