aboutsummaryrefslogtreecommitdiff
path: root/gcc
AgeCommit message (Collapse)AuthorFilesLines
2001-07-11alias.c (set_mem_alias_set): New function.Richard Kenner26-130/+193
* alias.c (set_mem_alias_set): New function. * rtl.h (set_mem_alias_set): Declare it. * builtins.c (expand_builtin_return_addr): Call it instead of using MEM_ALIAS_SET accessor. (expand_builtin_setjmp_setup, expand_builtin_longjmp): Likewise. (get_memory_rtx, expand_builtin_va_arg): Likewise. (expand_builtin_va_copy):Likewise. * caller-save.c (setup_save_areas): Likewise. * calls.c (compute_argument_addresses): Likewise. * explow.c (set_mem_attributes): Likewise. * expr.c (emit_single_push_insn, emit_push_insn): Likewise. (expand_assignment, store_constructor_field, store_field): Likewise. (expand_expr_unaligned): Likewise. * function.c (assign_stack_temp_for_type): Likewise. (put_reg_into_stack, gen_mem_addressof): Likewise. * ifcvt.c (noce_try_cmove_arith): Likewise. * reload1.c (reload, alter_reg): Likewise. * config/alpha/alpha.c (get_aligned_mem): Likewise. (alpha_set_memflags_1, alpha_expand_unaligned_load): Likewise. (alpha_expand_unaligned_store): Likewise (alpha_expand_unaligned_load_words): Likewise. (alpha_expand_unaligned_store_words): Likewise. (alpha_expand_block_clear, alpha_expand_prologue): Likewise. (alpha_expand_epilogue): Likewise. * config/arc/arc.c (arc_setup_incoming_varargs): Likewise. * config/clipper/clipper.c (clipper_builtin_saveregs): Likewise. * config/i386/i386.c (legitimize_pic_address): Likewise. * config/i960/i960.c (setup_incoming_varargs): Likewise. * config/ia64/ia64.c (spill_restore_mem): Likewise. * config/m32r/m32r.c (m32r_setup_incoming_varargs): Likewise. * config/m8k/m88k.c (m88k_builtin_saveregs): Likewise. * config/mips/mips.c (mips_va_arg): Likewise. * config/mn10300/mn10300.c (mn10300_builtin_saveregs): Likewise. * config/pa/pa.c (hppa_builtin_saveregs): Likewise. * config/rs6000/rs6000.c (rs6000_emit_move): Likewise. (setup_incoming_varargs, rs6000_va_arg): Likewise. (rs6000_emit_eh_toc_restore, rs6000_emit_prologue): Likewise. (rs6000_emit_epilogue): Likewise. * config/sh/sh.c (sh_builtin_saveregs): Likewise. * config/sparc/sparc.c (sparc_va_arg): Likewise. * config/v850/v850.c (v850_va_arg): Likewise. From-SVN: r43951
2001-07-11flow.c (merge_blocks_move_successor_nojumps): Do not crash when fallthru ↵Jan Hubicka9-42/+614
edge is present. * flow.c (merge_blocks_move_successor_nojumps): Do not crash when fallthru edge is present. (mege_blocks): Handle case where creation of jump insn is required. * basic-block.h (CLEANUP_EXPENSIVE, CLEANUP_CROSSJUMP, CLEANUP_POST_REGSTACK): New constants. * except.c (finish_eh_generation): Update call of cleanup_cfg, * jump.c (rtx_renumbered_equal_p): Handle 't' fields. * output.h (cleanup_cfg): Update prototype. * reg-stack.c (reg_to_stack): Use cleanup_cfg instead of jump_optimize * sibcall.c (optimize_sibling_and_tail_recursive_call): Update cleanup_cfg call; kill missleading comment. * toplev.c (rest_of_compilation): Update all cleanup_cfg calls. * flow.c (merge_blocks, try_optimize_cfg, cleanup_cfg): Accept mode parameter; control optimizations performed using it. (flow_find_cross_jump, outgoing_edges_match, try_crossjump_to_edge, try_crossjump_bb): New functions. From-SVN: r43950
2001-07-11pa.c (pa_output_function_prologue): Delete prototype.John David Anglin4-3/+13
* pa.c (pa_output_function_prologue): Delete prototype. Make function extern. * pa.h (ASM_OUTPUT_MI_THUNK): Rename output_function_prologue to pa_output_function_prologue. * pa-protos.h (pa_output_function_prologue): New prototype. From-SVN: r43947
2001-07-11intrinsic77.f: New test.David Billinghurst2-0/+590
2001-07-11 David Billinghurst <David.Billinghurst@riotinto.com> * g77.f-torture/execute/intrinsic77.f: New test. From-SVN: r43946
2001-07-11stmt.c (emit_case_nodes): Widen high and low instead of new_bound and low to ↵John David Anglin2-17/+19
get correct sign extension... * stmt.c (emit_case_nodes): Widen high and low instead of new_bound and low to get correct sign extension in low+high test. From-SVN: r43945
2001-07-11gcov.c (arcdata): Use gcov_type to fix branch percentage for large hit count.Janis Johnson2-2/+5
* gcov.c (arcdata): Use gcov_type to fix branch percentage for large hit count. From-SVN: r43944
2001-07-11* gcc.misc-tests/gcov-3.c: New test.Janis Johnson2-0/+49
From-SVN: r43943
2001-07-11profile.c (branch_prob): Fix .bbg info for computed gotos and C++ EH code.Janis Johnson2-12/+42
* profile.c (branch_prob): Fix .bbg info for computed gotos and C++ EH code. From-SVN: r43942
2001-07-11stmt.c (parse_output_constraint): New function, split out from ...Mark Mitchell6-136/+257
* stmt.c (parse_output_constraint): New function, split out from ... (expand_asm_operands): ... here. Use parse_output_constraint. * tree.h (parse_output_constraint): Declare it. * semantics.c (finish_asm_stmt): Mark the output operands to an asm addressable, if necessary. From-SVN: r43941
2001-07-11bitmap.c: Comment some functions; fiddle whitespace.Richard Henderson3-18/+21
* bitmap.c: Comment some functions; fiddle whitespace. (bitmap_free): Don't export. (bitmap_element_allocate): Use memset. * bitmap.h (bitmap_free): Don't declare. From-SVN: r43940
2001-07-11gcse.c, [...]: s/free on sbitmap vectors/sbitmap_vector_free on sbitmap ↵Daniel Berlin5-62/+78
vectors/g * gcse.c, lcm.c, sched-deps.c: s/free on sbitmap vectors/sbitmap_vector_free on sbitmap vectors/g * flow.c (flow_loops_find): Free dom if we found no loops, since we aren't going to save it. * lcm.c (pre_edge_rev_lcm): Free st_antin, st_antout when we are done. From-SVN: r43938
2001-07-11* ssa-ccp.c (ssa_fast_dce): Free worklist when completed.Jeffrey A Law2-0/+6
From-SVN: r43937
2001-07-11dwarf2out.c (dwarf2out_init, [...]): Add dummy version #ifndef ↵Richard Kenner2-4/+25
DWARF2_DEBUGGING_INFO. * dwarf2out.c (dwarf2out_init, dwarf2out_finish): Add dummy version #ifndef DWARF2_DEBUGGING_INFO. From-SVN: r43936
2001-07-11* Revert today's change -- there is a subtle bug.Ben Elliston5-28/+17
From-SVN: r43935
2001-07-11* gcc.c-torture/compile/20010711-1.c,Richard Sandiford3-0/+27
* gcc.c-torture/compile/20010711-2.c: New tests. From-SVN: r43934
2001-07-11* simplify-rtx.c (simplify_gen_subreg): Return null for QUEUED rtxes.Richard Sandiford2-0/+7
From-SVN: r43933
2001-07-11* gcc.c-torture/execute/20010711-1.c: New test.Richard Sandiford2-0/+17
From-SVN: r43932
2001-07-11mips.c (gen_int_relational): Tell the caller not to reverse a branch if a NE ↵Richard Sandiford2-0/+7
comparison is implemented with GTU. * config/mips/mips.c (gen_int_relational): Tell the caller not to reverse a branch if a NE comparison is implemented with GTU. From-SVN: r43931
2001-07-11mips.md (call_internal1): Use CONSTANT_ADDRESS_P to check for constant ↵Richard Sandiford2-18/+29
addresses. * mips.md (call_internal1): Use CONSTANT_ADDRESS_P to check for constant addresses. (call_internal2): Likewise. (call_value_internal1): Likewise. (call_value_internal2): Likewise. (call_value_multiple_internal1): Likewise. (call_value_multiple_internal2): Likewise. Co-Authored-By: H.J. Lu <hjl@gnu.org> From-SVN: r43930
2001-07-11re PR c++/80 (g++ enum and attributed __packed__)Ben Elliston5-15/+39
2001-07-11 Ben Elliston <bje@redhat.com> PR c++/80 * decl.c (finish_enum): New "attributes" argument; pass it to cplus_decl_attributes. Use a narrower type if the enum is packed. * cp-tree.h (finish_enum): Adjust prototype. * parse.y (enum_head): New non-terminal. (structsp): Use it. Enums now may be preceded or followed by optional attributes -- pass their chained tree to finish_enum(). * pt.c (tsubst_enum): Pass NULL_TREE for the new argument. From-SVN: r43929
2001-07-11enum5.C: New test.Ben Elliston2-0/+29
2001-07-11 Ben Elliston <bje@redhat.com> * g++.old-deja/g++.other/enum5.C: New test. From-SVN: r43928
2001-07-11[multiple changes]Alexandre Petit-Bianco5-18/+49
2001-07-10 Alexandre Petit-Bianco <apbianco@redhat.com> * lang-specs.h: Forbit the use if `-femit-class-file{s}' without `-fsyntax-only.' Fixes PR java/3248 2001-07-10 Alexandre Petit-Bianco <apbianco@redhat.com> * jcf-io.c (find_class): Clarified error message. Fixes PR java/2603 2001-07-10 Alexandre Petit-Bianco <apbianco@redhat.com> * parse.h (INNER_ENCLOSING_SCOPE_CHECK): No `this' is fine if the current function is static. Fixes PR java/1970 2001-07-09 Alexandre Petit-Bianco <apbianco@redhat.com> * parse.y (patch_method_invocation): Add enclosing context to ctor calls if necessary. Fixes PR java/2953 2001-07-09 Alexandre Petit-Bianco <apbianco@redhat.com> * parse.y (resolve_package): Abort if qualified expression member isn't right. (qualify_ambiguous_name): Don't qualify as type if `this' in use. Fixes PR java/1391 (http://gcc.gnu.org/ml/gcc-patches/2001-07/msg00701.html ) From-SVN: r43927
2001-07-11Daily bump.GCC Administrator2-2/+2
From-SVN: r43925
2001-07-11pt.c (tsubst_decl): Set DECL_CONTEXT for namespace-scope variables.Mark Mitchell3-2/+32
* pt.c (tsubst_decl): Set DECL_CONTEXT for namespace-scope variables. From-SVN: r43924
2001-07-11Fix a typo in ChangeLog.Kazu Hirata1-1/+1
From-SVN: r43921
2001-07-10Fix typo in last changeRichard Kenner1-1/+1
From-SVN: r43919
2001-07-11calls.c (emit_library_call_value_1): Fix a comment typo.Kazu Hirata4-3/+9
2001-07-10 Kazu Hirata <kazu@hxi.com> * calls.c (emit_library_call_value_1): Fix a comment typo. * dwarf2out.c (mem_loc_descriptor): Likewise. * config/i386/i386.c (ix86_expand_aligntest): Likewise. From-SVN: r43917
2001-07-11simplify-rtx.c: (simplify_subreg) Fix typo in commentDavid Billinghurst2-1/+5
2001-07-11 David Billinghurst <David.Billinghurst@riotinto.com> * simplify-rtx.c: (simplify_subreg) Fix typo in comment From-SVN: r43916
2001-07-10recog.c (offsettable_address_p): Handle LO_SUM case.Richard Kenner3-11/+17
* recog.c (offsettable_address_p): Handle LO_SUM case. * config/mips/mips.c (double_memory_operand): Use adjust_address_nv instead of plus_constant. From-SVN: r43912
2001-07-10reload1.c (merge_assigned_reloads): After a RELOAD_OTHER merge...Stephane Carrez2-3/+8
* reload1.c (merge_assigned_reloads): After a RELOAD_OTHER merge, fix setting of the reloads of that reload to RELOAD_FOR_OTHER_ADDRESS. From-SVN: r43911
2001-07-10rs6000.c (print_operand, [...]): Use adjust_address_nv instead of plus_constant.Richard Kenner2-3/+10
* config/rs6000/rs6000.c (print_operand, case 'L', 'Y', 'Z'): Use adjust_address_nv instead of plus_constant. From-SVN: r43909
2001-07-10Makefile.in (toplev.o, [...]): Depend on debug.h, wrap long lines.Neil Booth13-65/+209
* Makefile.in (toplev.o, sdbout.o, dbxout.o, dwarfout.o, dwarf2out.o): Depend on debug.h, wrap long lines. * dbxout.c: Include debug.h. (dbx_debug_hooks): New. (dbxout_init): Make static, take just 2 args. (dbxout_finish): Make static. * dbxout.h (dbxout_init, dbxout_finish): Delete. * debug.c: New file. * debug.h: New file. * dwarf2out.c: Include debug.h. (dwarf2_debug_hooks): New. (dwarf2out_init): Make static. (dwarf2out_finish): Make static, take 2 args. * dwarf2out.h (dwarf2out_init, dwarf2out_finish): Delete. * dwarfout.c: Include debug.h. (dwarf_debug_hooks): New. (dwarfout_init): Make static. (dwarfout_finish): Make static, take 2 args. * dwarfout.h (dwarfout_init, dwarfout_finish): Delete. * sdbout.c: Include debug.h. (sdb_debug_hooks): New. (sdbout_init): Make static, take 2 args. * sdbout.h (sdbout_init): Delete. * toplev.c: Include debug.h. (debug_hooks): New. (compile_file): Set deubg_hooks based on command line options. Use the hooks unconditionally rather than conditional compilation. From-SVN: r43908
2001-07-10* tm.texi: Fix markup.Neil Booth1-2/+1
From-SVN: r43907
2001-07-10ssa-ccp.c (first_phi_node): Remove.Jeffrey A Law4-33/+25
* ssa-ccp.c (first_phi_node): Remove. Replace uses with calls to first_insn_after_basic_block_note instead. * df.c (df_bb_refs_unlink): #if 0 out for now. * ssa.h: Add prototype for ssa_const_prop * ssa-ccp.c: Add prototype for ssa_fast_dce and mark_references (ssa_ccp_substitute_constants): Fix signed vs unsigned comparison (ssa_fast_dce): Remove unused variable From-SVN: r43906
2001-07-10diagnostic.c (finish_diagnostic): Rename to diagnostic_finish.Gabriel Dos Reis2-11/+18
* diagnostic.c (finish_diagnostic): Rename to diagnostic_finish. Make it take an 'output_buffer *'. Adjust calls thourghout. From-SVN: r43905
2001-07-10dwarf2out.c (dwarf2out_line): Emit -dA comment even when we have .loc support.Jason Merrill2-6/+8
* dwarf2out.c (dwarf2out_line): Emit -dA comment even when we have .loc support. From-SVN: r43904
2001-07-10collect2.c (main): Set COLLECT_NO_DEMANGLE for subprocesses.Jason Merrill2-2/+16
* collect2.c (main): Set COLLECT_NO_DEMANGLE for subprocesses. (dump_file): Only pad the demangled name with spaces if the mangled name was padded with spaces. From-SVN: r43903
2001-07-10Correct branch/fallthru edge detectionBernd Schmidt2-1/+6
From-SVN: r43902
2001-07-10g++-dg.exp: Load file-format and target-supports like gcc.Jason Merrill5-38/+52
* lib/g++-dg.exp: Load file-format and target-supports like gcc. (g++-dg-prune): Call prune_gcc_output. * prune.exp: New file for prune_gcc_output. * lib/g++.exp, lib/gcc.exp: Load it. From-SVN: r43901
2001-07-10semantics.c (cp_expand_stmt): Fix for null current_function_return_value.Jason Merrill2-2/+11
* semantics.c (cp_expand_stmt): Fix for null current_function_return_value. From-SVN: r43900
2001-07-10expr.c (expand_expr, [...]): Don't force using bitfield extraction if no ↵Richard Kenner2-1/+7
direct load if... * expr.c (expand_expr, case COMPONENT_REF): Don't force using bitfield extraction if no direct load if either EXPAND_CONST_ADDRESS or EXPAND_INITIALIZER. From-SVN: r43897
2001-07-10emit-rtl.c (adjust_address, [...]): Change criteria for whether can put ↵Richard Kenner2-3/+10
offset inside LO_SUM to check mode alignment... * emit-rtl.c (adjust_address, adjust_address_nv): Change criteria for whether can put offset inside LO_SUM to check mode alignment, not size. From-SVN: r43896
2001-07-10* doc/tm.texi (Misc): Fix thinko.Gabriel Dos Reis2-0/+6
From-SVN: r43895
2001-07-10regmove.c (replace_in_call_usage): Fix warnings.Jan van Male3-45/+95
2001-07-10 Jan van Male <jan.vanmale@fenk.wau.nl> * regmove.c (replace_in_call_usage): Fix warnings. * sched-deps.c (add_dependence): Fix warnings. * simplify-rtx.c (simplify_subreg): Likewise. Return NULL_RTX instead of NULL. * reg-stack.c (emit_swap_insn): Eliminate warnings. (subst_asm_stack_regs): Likewise. * combine.c (num_sign_bit_copies): Cast bitwidth to int to avoid warnings. * dwarf2out.c (output_call_frame_info): Declare i as int. (build_abbrev_table): Declare n_alloc as int. (dwarf2out_finish): Initialize die. * except.c: Declare sjlj_funcdef_number as unsigned. (connect_post_landing_pads): Declare j as unsigned. (convert_to_eh_region_ranges): Initialize call_site. (output_function_exception_table): Initialize tt_format_size. * expr.c (move_by_pieces_1): Initialize to1. (store_constructor): Initialize minelt and maxelt. * flow.c (mark_regs_live_at_end): Declare i as unsigned. * function.c (instantiate_decls): Avoid signed/unsigned warning. * c-decl.c (combine_parm_decls): Unused, remove. * c-tree.h: Remove prototype for combine_parm_decls. * reload.c (push_reload): Fix warning. (regno_clobbered_p): Likewise. * reload1.c (replace_pseudos_in_call_usage): Likewise. (reload_combine): Likewise. * bitmap.c: Rename bitmap_zero to bitmap_zero_bits to fix warnings. * bitmap.h: Rename bitmap_zero to bitmap_zero_bits to fix warnings. * bitmap.c (bitmap_operation): Change user. * bitmap.h (EXECUTE_IF_AND_COMPL_IN_BITMAP): Likewise. For cp/: 2001-07-10 Jan van Male <jan.vanmale@fenk.wau.nl> * call.c (build_op_delete_call): Initialize fn. (convert_like_real): Delete conditional. (joust): Initialize *w and *l. * class.c: Add prototype for binfo_ctor_vtable. (get_primary_binfo): Initialize result. * init.c (build_java_class_ref): Initialize name. * typeck.c (unary_complex_lvalue): Do not duplicate the argument to modify, pre-, or post-increment when used as an lvalue and when the argument has side-effects. For ch/: 2001-07-10 Jan van Male <jan.vanmale@fenk.wau.nl> * ch-tree.h: Remove prototype for combine_parm_decls, unused function. From-SVN: r43894
2001-07-10regmove.c (replace_in_call_usage): Fix warnings.Jan van Male20-198/+62
2001-07-10 Jan van Male <jan.vanmale@fenk.wau.nl> * regmove.c (replace_in_call_usage): Fix warnings. * sched-deps.c (add_dependence): Fix warnings. * simplify-rtx.c (simplify_subreg): Likewise. Return NULL_RTX instead of NULL. * reg-stack.c (emit_swap_insn): Eliminate warnings. (subst_asm_stack_regs): Likewise. * combine.c (num_sign_bit_copies): Cast bitwidth to int to avoid warnings. * dwarf2out.c (output_call_frame_info): Declare i as int. (build_abbrev_table): Declare n_alloc as int. (dwarf2out_finish): Initialize die. * except.c: Declare sjlj_funcdef_number as unsigned. (connect_post_landing_pads): Declare j as unsigned. (convert_to_eh_region_ranges): Initialize call_site. (output_function_exception_table): Initialize tt_format_size. * expr.c (move_by_pieces_1): Initialize to1. (store_constructor): Initialize minelt and maxelt. * flow.c (mark_regs_live_at_end): Declare i as unsigned. * function.c (instantiate_decls): Avoid signed/unsigned warning. * c-decl.c (combine_parm_decls): Unused, remove. * c-tree.h: Remove prototype for combine_parm_decls. * reload.c (push_reload): Fix warning. (regno_clobbered_p): Likewise. * reload1.c (replace_pseudos_in_call_usage): Likewise. (reload_combine): Likewise. * bitmap.c: Rename bitmap_zero to bitmap_zero_bits to fix warnings. * bitmap.h: Rename bitmap_zero to bitmap_zero_bits to fix warnings. * bitmap.c (bitmap_operation): Change user. * bitmap.h (EXECUTE_IF_AND_COMPL_IN_BITMAP): Likewise. For cp/: 2001-07-10 Jan van Male <jan.vanmale@fenk.wau.nl> * call.c (build_op_delete_call): Initialize fn. (convert_like_real): Delete conditional. (joust): Initialize *w and *l. * class.c: Add prototype for binfo_ctor_vtable. (get_primary_binfo): Initialize result. * init.c (build_java_class_ref): Initialize name. * typeck.c (unary_complex_lvalue): Do not duplicate the argument to modify, pre-, or post-increment when used as an lvalue and when the argument has side-effects. For ch/: 2001-07-10 Jan van Male <jan.vanmale@fenk.wau.nl> * ch-tree.h: Remove prototype for combine_parm_decls, unused function. From-SVN: r43893
2001-07-10intdoc.in: Fix the definition of COMPLEX ABS.James Smaby3-4/+10
2001-07-10 James Smaby <jsmaby@virgo.umeche.maine.edu> * intdoc.in: Fix the definition of COMPLEX ABS. Remove `the' where inappropriate. * intdoc.texi: Rebuilt. From-SVN: r43892
2001-07-10mips.c (override_options): Fix typo.Eric Christopher2-2/+6
2001-07-10 Eric Christopher <echristo@redhat.com> * config/mips/mips.c (override_options): Fix typo. From-SVN: r43891
2001-07-10Daily bump.GCC Administrator2-2/+2
From-SVN: r43890
2001-07-10target.h (struct gcc_target): New fields init_builtins and expand_builtin.Stan Shebs19-75/+148
* target.h (struct gcc_target): New fields init_builtins and expand_builtin. * target-def.h (TARGET_INIT_BUILTINS): New macro. (TARGET_EXPAND_BUILTIN): New macro. (TARGET_INITIALIZER): Add them. * builtins.c: Include target.h. (expand_builtin): Use targetm.expand_builtin. (default_init_builtins): New function. (default_expand_builtin): New function. * expr.h (default_init_builtins): Declare. (default_expand_builtin): Declare. * c-common.c (c_common_nodes_and_builtins): Use targetm.init_builtins. * defaults.h (MD_INIT_BUILTINS): Remove. * Makefile.in (builtins.o): Depend on target.h. * config/arm/arm.c (TARGET_INIT_BUILTINS): Define. (TARGET_EXPAND_BUILTIN): Define. * config/arm/arm.h (MD_INIT_BUILTINS): Remove. (MD_EXPAND_BUILTIN): Remove. * config/c4x/c4x.c (TARGET_INIT_BUILTINS): Define. (TARGET_EXPAND_BUILTIN): Define. (c4x_init_builtins): Make endlink arg a local. (c4x_print_operand): Fix typos in adjust_address usages. * config/c4x/c4x-protos.h (c4x_init_builtins): Update decl. * config/c4x/c4x.h (MD_INIT_BUILTINS): Remove. (MD_EXPAND_BUILTIN): Remove. * config/i386/i386.c (TARGET_INIT_BUILTINS): Define. (TARGET_EXPAND_BUILTIN): Define. (ix86_init_mmx_sse_builtins): New function, was ix86_init_builtins. (ix86_init_builtins): Call new function only if TARGET_MMX. * config/i386/i386-protos.h (ix86_init_mmx_sse_builtins): Declare. * config/i386/i386.h (MD_INIT_BUILTINS): Remove. (MD_EXPAND_BUILTIN): Remove. * config/ia64/ia64.c (TARGET_INIT_BUILTINS): Define. (TARGET_EXPAND_BUILTIN): Define. * config/ia64/ia64.h (MD_INIT_BUILTINS): Remove. (MD_EXPAND_BUILTIN): Remove. * doc/tm.texi: Document these changes. From-SVN: r43888
2001-07-10* ChangeLog: Resolve conflict.Neil Booth1-5/+0
From-SVN: r43887
generated by cgit v1.1 at 2025-04-15 19:31:12 +0000