[SCM] archer-tromey-python: Fixed merge problems in ChangeLog files

[SCM] archer-tromey-python: Fixed merge problems in ChangeLog files

[tromey]

The branch, archer-tromey-python has been updated
       via  34d075d10a8f9b0dafd23df63c7d1b98bd87533b (commit)
      from  72e85082c5f9f73153ee3295a6dcdb70adbea0b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 34d075d10a8f9b0dafd23df63c7d1b98bd87533b
Author: Tom Tromey <tromey@redhat.com>
Date:   Thu Jul 2 16:35:15 2009 -0600

    Fixed merge problems in ChangeLog files

-----------------------------------------------------------------------

Summary of changes:
 gdb/ChangeLog           | 2195 -----------------------------------------------
 gdb/doc/ChangeLog       |  239 -----
 gdb/testsuite/ChangeLog |   98 ---
 3 files changed, 0 insertions(+), 2532 deletions(-)

First 500 lines of diff:
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 88f4808..f775e17 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:gdb/ChangeLog
 2009-02-08  Jim Blandy  <jimb@red-bean.com>
 
 	* python/python-value.c (convert_value_from_python):
@@ -1304,10 +1303,7 @@
 	* python/python-value.c (valpy_length): Revert return type to
 	Py_ssize_t.
 	
-2008-11-20  Pedro Alves  <pedro@codesourcery.com>
-=======
 2009-07-01  Nick Roberts  <nickrob@snap.net.nz>
->>>>>>> master:gdb/ChangeLog
 
 	* Makefile.in (HFILES_NO_SRCDIR): Remove entries for deleted files.
 
@@ -1319,2199 +1315,11 @@
 
 2009-06-30  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
-<<<<<<< HEAD:gdb/ChangeLog
-	* infrun.c (resume): If following a fork, reread the current
-	thread.  Avoid dereferencing a possibly dangling pointer.
-
-2008-11-19  Doug Evans  <dje@google.com>
-
-	* inferior.h (proceed_to_finish): Delete, unused.
-	(stop_registers): Tweak comment.
-	* infrun.c (stop_registers): Tweak comment.
-
-2008-11-19  Kevin Buettner  <kevinb@redhat.com>
-
-	* frv-tdep.c (frv_skip_main_prologue): New function.
-	(frv_gdbarch_init): Register frv_skip_main_prologue.
-	* solib-frv.c (fetch_loadmap): Return early when no segments are
-	found.
-	(frv_relocate_main_executable): Return early when both interpreter
-	and executable loadmap addresses are zero.
-
-2008-11-19  Bob Wilson  <bob.wilson@acm.org>
-	
-	* xtensa-config.c (rmap): Remove entries for ar32 through ar63.  Add
-	threadptr, scompare1, mmid, epc5, epc6, epc7, eps5, eps6, eps7,
-	excsave5, excsave6, excsave7, cpenable, and vecbase registers.
-	(xtensa_submask0, xtensa_submask1, xtensa_submask2)
-	(xtensa_submask3, xtensa_submask4, xtensa_submask5, xtensa_submask6)
-	(xtensa_submask7, xtensa_submask8, xtensa_submask9, xtensa_submask10)
-	(xtensa_submask11, xtensa_submask12, xtensa_submask13, xtensa_submask14)
-	(xtensa_submask15): Adjust register numbers.
-	* xtensa-xtregs.c (XTENSA_ELF_XTREG_SIZE): Change to 4.
-	(xtensa_regmap_table): Add entry for scompare1.
-	* regformats/reg-xtensa.dat: Remove ar32 through ar63.  Add threadptr
-	and scompare1.
-	
-2008-11-19  Pedro Alves  <pedro@codesourcery.com>
-
-	* remote.c (escape_buffer): New.
-	(putpkt_binary, read_frame, getpkt_or_notif_sane_1): Use it.  Make
-	sure debug output printing a packet buffer goes through a single
-	fprintf_unfiltered call.
-	* utils.c (vfprintf_unfiltered): If outputting timestamps, end
-	output with a newline if it wasn't going to already.
-
-2008-11-18  Paul Pluzhnikov  <ppluzhnikov@google.com>
-
-	* maint.c (maintenance_translate_address): Fix a buglet.
-	
-2008-11-18  Thiago Jung Bauermann  <bauerman@br.ibm.com>
-
-	* features/Makefile (rs6000/powerpc-isa205-32l-expedite,
-	rs6000/powerpc-isa205-altivec32l-expedite,
-	powerpc-isa205-vsx32l-expedite, rs6000/powerpc-isa205-64l-expedite,
-	rs6000/powerpc-isa205-altivec64l-expedite,
-	powerpc-isa205-vsx64l-expedite): New variables.
-	* regformats/rs6000/powerpc-isa205-32l.dat: Generate.
-	* regformats/rs6000/powerpc-isa205-altivec32l.dat: Generate.
-	* regformats/rs6000/powerpc-isa205-vsx32l.dat: Generate.
-	* regformats/rs6000/powerpc-isa205-64l.dat: Generate.
-	* regformats/rs6000/powerpc-isa205-altivec64l.dat: Generate.
-	* regformats/rs6000/powerpc-isa205-vsx64l.dat: Generate.
-
-2008-11-18  Thiago Jung Bauermann  <bauerman@br.ibm.com>
-
-	* ppc-linux-nat.c (ppc_register_u_addr): Add special case to return
-	offset for full 64-bit slot of FPSCR when in 32-bits.
-	(ppc_linux_read_description): Return target description with 64-bit
-	FPSCR when inferior is running on an ISA 2.05 or later processor.
-	* ppc-linux-tdep.c (_initialize_ppc_linux_tdep): Call
-	initialize_tdec_powerpc_isa205_32l,
-	initialize_tdec_powerpc_isa205_altivec32l,
-	initialize_tdec_powerpc_isa205_vsx32l,
-	initialize_tdec_powerpc_isa205_64l,
-	initialize_tdec_powerpc_isa205_altivec64l and
-	initialize_tdec_powerpc_isa205_vsx64l.
-	* ppc-linux-tdep.h: Add external declaration for
-	tdesc_powerpc_isa205_32l, tdesc_powerpc_isa205_altivec32l,
-	tdesc_powerpc_isa205_vsx32l, tdesc_powerpc_isa205_64l,
-	tdesc_powerpc_isa205_altivec64l and tdesc_powerpc_isa205_vsx64l.
-	* features/rs600/powerpc-fpu-isa205.xml: New file.
-	* features/rs600/powerpc-isa205-32l.xml: New file.
-	* features/rs600/powerpc-isa205-64l.xml: New file.
-	* features/rs600/powerpc-isa205-altivec32l.xml: New file.
-	* features/rs600/powerpc-isa205-altivec64l.xml: New file.
-	* features/rs600/powerpc-isa205-vsx32l.xml: New file.
-	* features/rs600/powerpc-isa205-vsx64l.xml: New file.
-	* features/rs600/powerpc-isa205-32l.c: Generate.
-	* features/rs600/powerpc-isa205-64l.c: Generate.
-	* features/rs600/powerpc-isa205-altivec32l.c: Generate.
-	* features/rs600/powerpc-isa205-altivec64l.c: Generate.
-	* features/rs600/powerpc-isa205-vsx32l.c: Generate.
-	* features/rs600/powerpc-isa205-vsx64l.c: Generate.
-
-2008-11-18  Paul Pluzhnikov  <ppluzhnikov@google.com>
-
-	* objfiles.h: New MULTI_OBJFILE_P macro.
-	* printcmd.c (sym_info): Print object name.
-	* maint.c (maintenance_translate_address): Likewise.
-	
-2008-11-18  Joel Brobecker  <brobecker@adacore.com>
-
-	* NEWS: Document the removal of "catch load" and "catch unload".
-
-2008-11-17  Doug Evans  <dje@google.com>
-
-	* infcall.c (call_function_by_hand): Fix punctuation and capitalization
-	on error messages.
-
-2008-11-17  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	PR gdb/2250
-	* infrun.c (clear_proceed_status_thread): New function.
-	(clear_proceed_status_callback): New function.
-	(clear_proceed_status): In all-stop mode, clear per-thread
-	proceed status of *all* threads, not only the current.
-	(handle_inferior_event): In all-stop mode, if we're stepping
-	one thread, but got some inferior event in another thread
-	that does not cause GDB to break to the user interface,
-	ensure the interrupted stepping operation continues in the
-	original thread.
-	(currently_stepping): Move thread-related tests to ...
-	(currently_stepping_thread): ... this new function.
-	(currently_stepping_callback): New function.
-
-2008-11-17  Vladimir Prus  <vladimir@codesourcery.com>
-
-	Implement =thread-selected notification.
-
-        * mi/mi-common.h (struct mi_interp): New, moved from ...
-        * mi/mi-interp.c: ...here.
-        * mi/mi-main.c (mi_execute_command): If the thread changed
-        as result of command, report that.
-
-2008-11-17  Vladimir Prus  <vladimir@codesourcery.com>
-
-	Implement continue/interrupt of thread groups.
-
-        * mi/mi-main.c (proceed_thread_callback): New.
-        (mi_cmd_exec_continue): If --thread-group is specified, resume all
-        threads in that group.
-        (interrupt_thread_callback): New.
-        (mi_cmd_exec_interrupt): If --thread-group is specified, interrupt
-        all threads in that group.
-
-2008-11-17  Vladimir Prus  <vladimir@codesourcery.com>
-
-	Implement '-target-detach pid'.
-
-        * infcmd.c (detach_command): Make nonstatic.
-        * inferior.h (detach_command): Declare.
-        * mi/mi-cmds.c (mi_cmds): Don't route -target-detach via CLI.
-        * mi/mi-cmds.h (mi_cmd_target_detach): Declare.
-        * mi/mi-main.c (find_thread_of_process, mi_cmd_target_detach): New.
-
-2008-11-17  Vladimir Prus  <vladimir@codesourcery.com>
-
-	Include group-id in thread-created notification.
-
-        * mi/mi-interp.c (mi_new_thread, mi_thread_exit): Include
-        group id in the output.
-
-2008-11-17  Vladimir Prus  <vladimir@codesourcery.com>
-
-	Notification for attach/detach.
-
-        * inferior.c: Call the process observers.
-        * mi/mi-interp.c (mi_new_inferior, mi_inferior_exit): New.
-        (mi_interpreter_init): Register the above.
-
-2008-11-17  Vladimir Prus  <vladimir@codesourcery.com>
-
-	Implement -list-thread-groups.
-
-        * thread.c (print_thread_info): New parameter pid, to print
-        threads of specific process.
-        * gdbthread.h (print_thread_info): New parameter pid.
-        * mi/mi-cmds.c (mi_cmds): Register -list-thread-groups.
-        * mi/mi-cmds.h (mi_cmd_list_thread_groups): New.
-        * mi/mi-main.c (mi_cmd_thread_info): Adjust.
-        (print_one_process, mi_cmd_list_thread_groups): New.
-
-2008-11-16  Joel Brobecker  <brobecker@adacore.com>
-
-	Remove some unused macros related to the old load/unload catchpoints.
-
-	* breakpoint.c (SOLIB_LOADED_LIBRARY_PATHNAME)
-	(SOLIB_UNLOADED_LIBRARY_PATHNAME, SOLIB_CREATE_CATCH_LOAD_HOOK)
-	(SOLIB_CREATE_CATCH_UNLOAD_HOOK): Delete. No longer used.
-
-2008-11-16  Joel Brobecker  <brobecker@adacore.com>
-
-	Remove support for catch load and catch unload commands.
-
-	* breakpoint.h (enum bptype): Remove bp_catch_load and bp_catch_unload.
-	(struct breakpoint): Remove fields dll_pathname and
-	triggered_dll_pathname.
-	(bpstat_get_triggered_catchpoints, ep_is_shlib_catchpoint): Delete.
-	* breakpoint.c (ep_is_catchpoint): Remove handling of
-	bp_catch_load and bp_catch_unload.
-	(print_it_typical, bpstat_check_location, bpstat_what)
-	(print_one_breakpoint_location, print_one_breakpoint_location)
-	(user_settable_breakpoint, allocate_bp_location)
-	(set_raw_breakpoint_without_location, mention, delete_breakpoint,
-	(breakpoint_re_set_one, disable_command, enable_command): Likewise.
-	(ep_is_shlib_catchpoint, bpstat_get_triggered_catchpoints)
-	(catch_load_command_1, catch_unload_command_1): Delete.
-	(_initialize_breakpoint): Remove the "catch load" and "catch unload"
-	command creation.
-	* infrun.c (handle_inferior_event): Remove the handling of
-	load/unload catchpoint events.
-
-2008-11-15  Joel Brobecker  <brobecker@adacore.com>
-
-	From  Jerome Guitton  <guitton@adacore.com>
-	* dwarf2read.c (dwarf2_debug_line_missing_end_sequence_complaint):
-	New function.
-	(dwarf_decode_lines): Detect null file numbers. Detect the end of
-	the line program sequence when no end sequence is emitted.
-
-2008-11-15  Joel Brobecker  <brobecker@adacore.com>
-
-	* ada-lang.c (ada_evaluate_subexp): Improve handling of integer
-	type dereferencing.
-
-2008-11-15  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* NEWS: Mention sparc64-linux-gnu gdbserver support.
-
-2008-11-14  Daniel Gutson  <dgutson@codesourcery.com>
-
-	* configure.tgt (sparc64-*-linux*): Added gdbserver support.
-	* regformats/reg-sparc64.dat: New file.
-
-2008-11-14  Tom Tromey  <tromey@redhat.com>
-
-	PR mi/2549:
-	* mi/mi-main.c (get_register): Use get_formatted_print_options.
-
-2008-11-13  Joel Brobecker  <brobecker@adacore.com>
-
-	* printcmd.c: define PRINTF_HAS_LONG_LONG only if not yet defined.
-
-2008-11-13  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* auxv.c (fprint_target_auxv): Handle AT_BASE_PLATFORM and
-	AT_EXECFN.  Re-sort AT_SECURE.
-
-2008-11-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	* monitor.c (monitor_insert_breakpoint): Remove unused variable `bp'.
-
-2008-11-13  Joel Brobecker  <brobecker@adacore.com>
-
-	* ia64-tdep.c: Remove commented out #define.
-
-2008-11-12  Joel Brobecker  <brobecker@adacore.com>
-
-	From Joel Sherrill  <joel.sherrill@oarcorp.com>
-	* remote-sim.c (gdbsim_mourn_inferior): Use "target" parameter
-	instead of the "gdbsim_ops" global.
-
-2008-11-11  Doug Evans  <dje@google.com>
-
-	* infcall.c (call_function_by_hand): Handle inferior exit.
-
-2008-11-11  Thiago Jung Bauermann  <bauerman@br.ibm.com>
-
-	* remote-sim.c (gdbsim_create_inferior, gdbsim_mourn_inferior): Add
-	missing struct target_ops argument.
-
-2008-11-11  Joel Sherrill <joel.sherrilL@oarcorp.com>
-
-	* MAINTAINERS: Add myself for write after approval privileges.
-
-2008-11-10  Tom Tromey  <tromey@redhat.com>
-
-	* gdbtypes.c (copy_type_recursive): Clear new fields.
-
-2008-11-10  Tom Tromey  <tromey@redhat.com>
-
-	* cli/cli-cmds.c (source_script): Clean up full_pathname.  Run
-	cleanups on early return.
-
-2008-11-09  Vladimir Prus  <vladimir@codesourcery.com>
-
-	Kill pthread_ops_hack
-
-	* target.h (struct target_ops): Make to_attach, to_detach,
-	to_create_inferior and to_mourn_inferior accept a pointer
-    	to struct target_ops.
-	(target_attach, target_create_inferior, target_create_inferior):
-	Convert from macros to function.  Find the right target to
-	invoke a method of.
-	(find_default_attach, find_default_create_inferior): New parameter
-	ops.
-	* corefile.c (core_file_command): Pass target to to_detach.
-	* corelow.c (core_detach): Add 'ops' parameter.
-	* fork-child.c (fork_inferior): Return the pid.  Allow
-	init_trace_fun to be NULL.
-	* inf-ptrace (ptrace_ops_hack): Remove.
-	(inf_ptrace_him): Remove, moving all logic into....
-	(inf_ptrace_create_inferior): ... here.  Push the target
-	passed as parameter.
-	(inf_ptrace_mourn_inferior, inf_ptrace_attach, inf_ptrace_detach):
-	Push/pop target passed as parameter, no ptrace_ops_hack.
-	(inf_ptrace_target): Don't remember result.
-	* inferior.h (fork_inferior): Adjust prototype.
-	* linux-nat.c (linux_nat_create_inferior, linux_nat_attach)
-	(linux_nat_detach, linux_nat_mourn_inferior): New parameter ops.
-	Pass it to linux_ops target.
-	* linux-thread-db.c (thread_db_detach, thread_db_mourn_inferior):
-	New parameter ops. Pass it to the target beneath.
-	* remote.c (remote_mourn, extended_remote_mourn, remote_detach)
-	(extended_remote_create_inferior): New parameter ops. Pass it
-	further.
-	* target.c (debug_to_attach, debug_to_detach)
-	(debug_to_mourn_inferior): New parameter ops.
-	(target_create_inferior): New.
-	(update_current_target): Do not inherit to_attach, to_detach,
-	to_create_inferiour, to_mourn_inferior.  Do not default
-	to_detach and to_mourn_inferior.
-	(target_detach): Find the right target to use.
-	(target_mourn_inferior): New.
-	(find_default_attach, find_default_create_inferior): New parameter
-	ops.  Pass the found target when calling its method.
-	(init_dummy_target): Provide fallback definition of to_detach.
-	(target_attach): New.
-	(debug_to_attach, debug_to_detach, debug_to_create_inferior)
-	(debug_to_mourn_inferiour): New parameter ops.
-        * aix-thread.c: Adjust.
-        * bsd-uthread.c: Adjust.
-        * gnu-nat.c: Adjust.
-        * go32-nat.c: Adjust.
-        * hpux-thread.c: Adjust.
-        * inf-ttrace.c: Ajust.
-        * monitor.c: Adjust.
-        * nto-procfs.c: Adjust.
-        * procfs.c: Adjust.
-        * remote-m32r-sdi.c: Adjust.
-        * remote-mips.c: Adjust.
-        * remote-sim.c: Adjust.
-        * rs6000-nat.c: Adjust.
-        * sol-thread.c: Adjust.
-        * win32-nat.c: Adjust.
-	* dec-thread.c: Adjust.
-
-2008-11-09  Vladimir Prus  <vladimir@codesourcery.com>
-
-	* thread.c (print_thread_info): Eliminate now useless checks
-	for exited threads.
-
-2008-11-06  Pedro Alves  <pedro@codesourcery.com>
-
-	* i386-dicos-tdep.c (i386_dicos_init_abi): Set decr_pc_after_break
-	to 0.
-
-2008-11-05  Pedro Alves  <pedro@codesourcery.com>
-
-	* remote.c (notice_new_inferiors): Add a new inferior only when
-	we're going to add a new thread.
-
-2008-11-05  Pedro Alves  <pedro@codesourcery.com>
-
-	* defs.h (add_inferior_continuation)
-	(do_all_inferior_continuations)
-	(discard_all_inferior_continuations): Declare.
-	* utils.c (add_inferior_continuation)
-	(do_all_inferior_continuations)
-	(discard_all_inferior_continuations): New.
-	* inferior.h (struct inferior) <continuations>: New field.
-	* inferior.c (free_inferior): Discard all the inferior
-	continuations.
-	* inf-loop.c (inferior_event_handler): Do all current inferior
-	continuations.
-	* infcmd.c (attach_command): Register an inferior continuation
-	instead of a thread continuation.
-	* infrun.c (handle_inferior_event): If stop_soon is
-	STOP_QUIETLY_NO_SIGSTOP, also expect a TARGET_SIGNAL_0.
-
-2008-11-04  Pedro Alves  <pedro@codesourcery.com>
-
-	* inf-loop.c (inferior_event_handler): On INF_ERROR and
-	INF_REG_EVENT throwing, don't call target_async or pop_target.
-	Call pop_all_targets_above.
-	* remote.c (remote_close): Call remote_terminal_ours.  Don't call
-	signal or target_async.
-
-2008-11-04  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* eval.c (evaluate_subexp_standard): Assert that there is at
-	least one array dimension.
-
-2008-11-03  Vladimir Prus  <vladimir@codesourcery.com>
-
-	Make attach_command exception-safe
-        * infcmd.c (attach_command): Call async_enable_stdin
-        if exception is thrown.
-
-2008-11-03  Pedro Alves  <pedro@codesourcery.com>
-
-	* gdbarch.sh (has_global_solist): Mention global breakpoints.
-	* gdbarch.h: Regenerate.
-
-2008-11-03  Pedro Alves  <pedro@codesourcery.com>
-
-	* remote.c (remote_start_remote): If the solib list is global,
-	fetch libraries and insert breakpoints after connecting.
-	* infcmd.c (post_create_inferior): If the solist is shared between
-	inferiors, no need to refetch it on every new inferior.
-	(detach_command): If the shared library list is shared between
-	inferiors, then don't clear it on every inferior detach.
-	* gdbarch.sh (has_global_solist): New.
-	* i386-dicos-tdep.c (i386_dicos_init_abi): Set
-	gdbarch_has_global_solist.
-	* target.c (target_pre_inferior): If the shared library list is
-	shared between inferiors, then don't clear it here, neither
-	invalidate the memory regions or clear the target description.
-	(target_detach): If the shared library list is shared between
-	inferiors, then don't remove breakpoints from the target here.
-	(target_disconnect): Comment.
-	* solib.c (update_solib_list): Check for null_ptid.
-	* breakpoint.c (insert_breakpoints, update_global_location_list):
-	If the shared library list is shared between inferiors, insert
-	breakpoints even if there's no execution.
-	(breakpoint_init_inferior): If the shared library list is shared
-	between inferiors, don't delete breakpoints or mark them
-	uninserted here.
-
-	* gdbarch.c, gdbarch.h: Regenerate.
-
-2008-10-31  Pedro Alves  <pedro@codesourcery.com>
-
-	* inferior.h (inferior_ignoring_leading_exec_events): Delete
-	declaration.
-
-2008-10-31  Pedro Alves  <pedro@codesourcery.com>
-
-	* inferior.h (write_inferior_status_register): Delete.
-	* infrun.c (write_inferior_status_register): Delete.
-
-2008-10-30  Tom Tromey  <tromey@redhat.com>
-
-	* value.c (coerce_array): Use check_typedef.
-
-2008-10-30  Tom Tromey  <tromey@redhat.com>
-
-	* cli/cli-logging.c (handle_redirections): Make a cleanup.
-	* reggroups.c (maintenance_print_reggroups): Make a cleanup.
-	* regcache.c (regcache_print): Make a cleanup.
-	* maint.c (maintenance_print_architecture): Make a cleanup.
-	* dummy-frame.c (maintenance_print_dummy_frames): Make a cleanup.
-
-2008-10-30  Tom Tromey  <tromey@redhat.com>
-
-	* utils.c (make_cleanup_close): Use make_cleanup_dtor.
-	(do_close_cleanup): Don't free 'fd'.
-
-2008-10-30  Tom Tromey  <tromey@redhat.com>
-
-	* source.c (symtab_to_fullname): Test 'r >= 0'.
-	(psymtab_to_fullname): Likewise.
-	(get_filename_and_charpos): Make a cleanup.
-	(forward_search_command): Likewise.
-	(reverse_search_command): Likewise.
-	* exec.c (exec_file_attach): Close scratch_chan on failure.
-	* nto-procfs.c (procfs_open): Make a cleanup.
-	(procfs_pidlist): Likewise.
-	(do_closedir_cleanup): New function.
-
-2008-10-30  Andreas Schwab  <schwab@suse.de>
-
-	* infcmd.c (construct_inferior_arguments): Handle newlines
-	specially.
-
-2008-10-30  Joel Brobecker  <brobecker@adacore.com>
-
-	* breakpoint.h (enum bptype): Delete bp_catch_exec.


hooks/post-receive
--
Repository for Project Archer.