openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package gdb (Revision 094d4965c2a98fa6cb50792737059008)

Currently displaying revision 094d4965c2a98fa6cb50792737059008 , Show latest

--- cell-combined.diff.orig
+++ cell-combined.diff
@@ -1,390 +1,6 @@
-ChangeLog:
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* spu-tdep.c: Include "infcall.h".
-	(spu_auto_flush_cache_p): New static variable.
-	(spu_objfile_from_context): New function.
-	(flush_ea_cache, spu_attach_normal_stop): Likewise.
-	(show_spu_auto_flush_cache): Likewise.
-	(_initialize_spu_tdep): Attach to normal_stop observer.
-	Install "set spu auto-flush-cache" / "show spu auto-flush-cache"
-	commands.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* spu-tdep.c (spu_address_class_type_flags): New function.
-	(spu_address_class_type_flags_to_name): Likewise.
-	(spu_address_class_name_to_type_flags): Likewise.
-	(spu_pointer_to_address): Handle __ea pointers.
-	(spu_integer_to_address): Likewise.
-	(spu_gdbarch_init): Install address class handlers.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* spu-tdep.c: Include "block.h".
-	(setspucmdlist, showspucmdlist): New static variables.
-	(spu_stop_on_load_p): Likewise.
-	(spu_catch_start): New function.
-	(show_spu_command, set_spu_command): New functions.
-	(show_spu_stop_on_load): Likewise.
-	(_initialize_spu_tdep): Attach spu_catch_start to new_objfile observer.
-	Install "set spu" / "show spu" prefix command handler.
-	Install "set spu stop-on-load" / "show spu stop-on-load" command.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* ppc-linux-tdep.c: Include "exceptions.h", "arch-utils.h",
-	and "spu-tdep.h".
-	(spe_context_lm_addr, spe_context_offset): New static variables.
-	(spe_context_cache_ptid, spe_context_cache_address): Likewise.
-	(ppc_linux_new_objfile): New function.
-	(ppc_linux_spe_context): Likewise.
-	(struct ppu2spu_cache, struct ppu2spu_data): New data types.
-	(ppu2spu_prev_arch, ppu2spu_this_id, ppu2spu_prev_register,
-	ppu2spu_unwind_register, ppu2spu_sniffer,
-	ppu2spu_dealloc_cache): New functions.
-	(ppu2spu_unwind): New static variable.
-	(ppc_linux_init_abi): Install cross-architecture unwinder.
-	(_initialize_ppc_linux_tdep): Attach to new_objfile observer.
-
-	* spu-tdep.c (struct spu2ppu_cache): New data type.
-	(spu2ppu_prev_arch, spu2ppu_this_id, spu2ppu_prev_register,
-	spu2ppu_sniffer, spu2ppu_dealloc_cache): New functions.
-	(spu2ppu_unwind): New static variable.
-	(spu_gdbarch_init): Install cross-architecture unwinder.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* target.h (enum strata): New value arch_stratum.
-	* target.c (target_require_runnable): Skip arch_stratum targets.
-
-	* configure.tgt (powerpc-*-linux* | powerpc64-*-linux*): Add
-	solib-spu.o and spu-multiarch.o to gdb_target_obs.
-	* Makefile.in (ALL_TARGET_OBS): Add solib-spu.o and spu-multiarch.o.
-	(ALLDEPFILES): Add solib-spu.c and spu-multiarch.c.
-
-	* solib-spu.c: New file.
-	* spu-multiarch.c: New file.
-
-	* spu-tdep.h (SPUADDR, SPUADDR_SPU, SPUADDR_ADDR): New macros.
-	(set_spu_solib_ops): Add prototype.
-	(spu_multiarch_enable, spu_multiarch_disable): Likewise.
-
-	* spu-tdep.c (struct gdbarch_tdep): New members id and lslr.
-	(spu_lslr): New function.
-
-	(spu_address_to_pointer): New function.
-	(spu_pointer_to_address): Support SPU ID address encoding.  Use
-	lslr from tdep structure.
-	(spu_integer_to_address): Likewise.
-	(spu_frame_unwind_cache): Update for encoded addresses.
-	(spu_unwind_pc, spu_unwind_sp): Likewise.
-	(spu_read_pc, spu_write_pc): Likewise.
-	(spu_push_dummy_call): Likewise.
-	(spu_software_single_step): Likewise.
-	(spu_overlay_update_osect): Likewise.
-
-	(spu_dis_asm_print_address): New function.
-	(gdb_print_insn_spu): Likewise.
-
-	(spu_gdbarch_init): Store requested SPU ID in tdep structure.
-	Query for LSLR and store it into tdep as well.
-	Install spu_address_to_pointer and gdb_print_insn_spu.
-
-	* ppc-linux-tdep.c: Include "observer.h", "auxv.h" and "elf/common.h".
-	(ppc_linux_entry_point_addr): New static variable.
-	(ppc_linux_inferior_created): New function.
-	(ppc_linux_displaced_step_location): Likewise.
-	(ppc_linux_init_abi): Enable Cell/B.E. support if supported
-	by the target.
-	(_initialize_ppc_linux_tdep): Attach to inferior_created observer.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* features/Makefile (WHICH): Add rs6000/powerpc-cell32l and
-	rs6000/powerpc-cell64l.
-	(rs6000/powerpc-cell32l-expedite): Define.
-	(rs6000/powerpc-cell64l-expedite): Likewise.
-	* features/rs6000/powerpc-cell32l.xml: New file.
-	* features/rs6000/powerpc-cell64l.xml: New file.
-	* features/rs6000/powerpc-cell32l.c: New generated file.
-	* features/rs6000/powerpc-cell64l.c: New generated file.
-
-	* regformats/rs6000/powerpc-cell32l.dat: New generated file.
-	* regformats/rs6000/powerpc-cell64l.dat: New generated file.
-
-	* ppc-linux-tdep.h (tdesc_powerpc_cell32l): Add prototype.
-	(tdesc_powerpc_cell64l): Likewise.
-	* ppc-linux-tdep.c: Include "features/rs6000/powerpc-cell32l.c"
-	and "features/rs6000/powerpc-cell64l.c".
-	(_initialize_ppc_linux_tdep): Initialize target descriptions.
-	(ppc_linux_spu_section): New function.
-	(ppc_linux_core_read_description): Detect Cell/B.E. core files.
-	* ppc-linux-nat.c (PPC_FEATURE_CELL): Define.
-	(ppc_linux_read_description): Detect Cell/B.E. architecture.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* target-descriptions.h (tdesc_compatible_p): New.
-	(tdesc_add_compatible): New.
-	* target-descriptions.c (arch_p): New VEC_P type.
-	(struct target_desc): New member compatible.
-	(free_target_description): Handle it.
-	(maint_print_c_tdesc_cmd): Likewise.
-	(tdesc_compatible_p): New function.
-	(tdesc_add_compatible): New function.
-
-	* xml-tdesc.c (tdesc_end_compatible): New function.
-	(target_children): Handle <compatible> element.
-
-	* arch-utils.c (choose_architecture_for_target): Accept target
-	description instead of BFD architecture as input.  Query target
-	description for compatible architectures.
-	(gdbarch_info_fill): Update call.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* gdbarch.sh (gcore_bfd_target): New gdbarch callback.
-	* gdbarch.h, gdbarch.c: Regenerate.
-
-	* gcore.c (default_gcore_target): Make return value const.
-	Call gdbarch_gcore_bfd_target if present.
-	(default_gcore_arch, default_gcore_mach): Use target_gdbarch.
-
-	* corelow.c (core_read_description): Call gdbarch_core_read_description
-	on core_gdbarch instead of current_gdbarch.
-
-	* ppc-linux-tdep.c (ppc_linux_init_abi): Install gcore_bfd_target.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* gdbarch.sh (pointer_to_address): Change to type 'm'.
-	(address_to_pointer): Likewise.
-	* gdbarch.c, gdbarch.h: Regenerate.
-
-	* inferior.h (unsigned_pointer_to_address): Add GDBARCH argument.
-	(signed_pointer_to_address): Likewise.
-	(unsigned_address_to_pointer, address_to_signed_pointer): Likewise.
-	* findvar.c (unsigned_pointer_to_address): Likewise.
-	(signed_pointer_to_address): Likewise.
-	(unsigned_address_to_pointer, address_to_signed_pointer): Likewise.
-
-	* avr-tdep.c (avr_address_to_pointer): Likewise.
-	(avr_pointer_to_address): Likewise.
-	* iq2000-tdep.c (iq2000_pointer_to_address): Likewise.
-	(iq2000_address_to_pointer): Likewise.
-	* m32c-tdep.c (m32c_m16c_address_to_pointer): Likewise.
-	(m32c_m16c_pointer_to_address): Likewise.
-	* spu-tdep.c (spu_pointer_to_address): Likewise.
-	* xstormy16-tdep.c (xstormy16_pointer_to_address): Likewise.
-	(xstormy16_address_to_pointer): Likewise.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* printcmd.c (print_scalar_formatted): Always truncate
-	unsigned data types.
-
-	* cli-dump.c (struct callback_data): Change type of load_offset
-	to CORE_ADDR.
-	(restore_binary_file): Update type casts.
-	(restore_command): Parse load_offset as address, not long.
-
-	* utils.c (string_to_core_addr): Do not sign-extend value.
-	* varobj.c (find_frame_addr_in_frame_chain): Truncate frame_base
-	before comparing against requested frame address.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* breakpoint.h (breakpoint_relocate): New.
-	* breakpoint.c (breakpoint_relocate): New function.
-	* objfiles.c (objfile_relocate): Call breakpoint_relocate
-	instead of breakpoint_re_set.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* breakpoint.c (insert_breakpoint): Treat negative return values
-	from target_insert_breakpoint or target_insert_hw_breakpoint as
-	temporary issues; do not throw an error.
-	(remove_breakpoint): Likewise for target_remove_breakpoint and
-	target_remove_hw_breakpoint.
-
-	* i386-nat.c (i386_remove_hw_breakpoint): Return positive value
-	on failure.
-	* remote.c (remote_insert_breakpoint): Likewise.
-	(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* solib.h (struct target_so_ops): New member open_bfd.
-	* solib.c (solib_map_sections): Use open_bfd callback if present.
-	(symbol_add_stub): Likewise.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* linux-nat.c: Include <sys/vfs.h> and <dirent.h>.
-	(SPUFS_MAGIC): Define.
-	(spu_enumerate_spu_ids): New function.
-	(linux_proc_xfer_spu): New function.
-	(linux_xfer_partial): Handle TARGET_OBJECT_SPU.
-
-	(iterate_over_spus): New function.
-	(struct linux_spu_corefile_data): New data type.
-	(linux_spu_corefile_callback): New function.
-	(linux_spu_make_corefile_notes): New function.
-	(linux_nat_make_corefile_notes): Call it.
-
-	* corelow.c (struct spuid_list): New data type.
-	(add_to_spuid_list): New function.
-	(core_xfer_partial): Handle TARGET_OBJECT_SPU.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* arch-utils.h (save_current_gdbarch): New.
-	* arch-utils.c (restore_current_gdbarch): New function.
-	(save_current_gdbarch): Likewise.
-
-	* frame.c: Include "arch-utils.h".
-	(get_frame_id): Reset current_gdbarch while calling frame
-	sniffer callbacks.
-	(frame_unwind_register_value): Likewise.
-	(get_frame_type): Likewise.
-	(frame_arch_unwind): Likewise.
-
-	* stack.c: Include "arch-utils.h".
-	(print_stack_frame): Reset current_gdbarch to frame arch
-	while handling one frame.
-	(print_frame_args): Likewise.
-	(print_frame_info): Likewise.
-	(print_frame_local_vars): Likewise.
-
-	* regcache.c (regcache_raw_read): Reset current_gdbarch
-	while calling target routines.
-	(regcache_raw_write): Likewise.
-
-	* gdbarch.sh (gdbarch_data): Reset current_gdbarch while
-	calling data post_init callback.
-	* gdbarch.c: Regenerate.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* frame.h (frame_arch_unwind): New.
-	* frame-unwind.h (frame_prev_arch_ftype): New type.
-	(struct frame_unwind): New member prev_arch.
-	* frame.c (struct frame_info): New member prev_arch.
-	(frame_arch_unwind): New function.
-	(get_frame_arch): Reimplement in terms of frame_arch_unwind.
-	* sentinel-frame.c (sentinel_frame_prev_arch): New function.
-	(sentinel_frame_unwinder): Install it.
-
-	* frame.c (select_frame): Reset current_gdbarch.
-
-	* frame.c (frame_pc_unwind): Use frame_arch_unwind instead
-	of get_frame_arch.
-	(frame_unwind_register_value): Likewise.
-	(frame_unwind_register_signed): Likewise.
-	(frame_unwind_register_unsigned): Likewise.
-	* frame-unwind.c (frame_unwind_got_optimized): Likewise.
-	(frame_unwind_got_register): Likewise.
-	(frame_unwind_got_constant): Likewise.
-	(frame_unwind_got_bytes): Likewise.
-	(frame_unwind_got_address): Likewise.
-
-	* frame.h (enum frame_type): New value ARCH_FRAME.
-	* frame.c (fprint_frame_type): Handle ARCH_FRAME.
-	* stack.c (print_frame_info): Likewise.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* target.h (struct target_ops): New member to_thread_architecture.
-	(target_thread_architecture): New macro.
-	* target.c (update_current_target): Inherit to_thread_architecture.
-	(default_thread_architecture): New function.
-	(debug_to_thread_architecture): New function.
-	(setup_target_debug): Handle to_thread_architecture.
-
-	* regcache.h (get_thread_arch_regcache): New.
-	* regcache.c (struct regcache_list): New data type.
-	(current_regcache): Hold regcache list instead of single regcache.
-	(current_thread_ptid, current_thread_arch): New static variables.
-	(get_thread_arch_regcache): New function.
-	(get_thread_regcache): Use it.  Call target_thread_architecture.
-	(regcache_thread_ptid_changed): Update to current_regcache changes.
-	(registers_changed): Likewise.  Reset current_thread_arch and
-	current_thread_ptid.
-
-	* thread.c (switch_to_thread): Reset current_gdbarch.
-
-	* remote.c (remote_wait): Access target registers in target_gdbarch.
-	* linux-nat.c (linux_nat_do_thread_registers): Likewise.
-	* proc-service.c (ps_lgetregs, ps_lsetregs): Likewise.
-	(ps_lgetfpregs, ps_lsetfpregs): Likewise.
-	* sol-thread.c (ps_lgetregs, ps_lsetregs): Likewise.
-	(ps_lgetfpregs, ps_lsetfpregs): Likewise.
-
-
-gdbserver/ChangeLog:
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* linux-ppc-low.c (INSTR_SC, NR_spu_run): Define.
-	(parse_spufs_run): New function.
-	(ppc_get_pc, ppc_set_pc): Detect and handle SPU PC.
-	(ppc_breakpoint_at): Handle SPU breakpoints.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* configure.srv (powerpc*-*-linux*): Add powerpc-cell32l.o
-	and powerpc-cell64l.o to srv_regobj.  Add rs6000/powerpc-cell32l.xml
-	and rs6000/powerpc-cell64l.xml to srv_xmlfiles.
-	* Makefile.in (powerpc-cell32l.o, powerpc-cell32l.c): New rules.
-	(powerpc-cell64l.o, powerpc-cell64l.c): Likewise.
-	* linux-ppc-low.c (PPC_FEATURE_CELL): Define.
-	(init_registers_powerpc_cell32l): Add prototype.
-	(init_registers_powerpc_cell64l): Likewise.
-	(ppc_arch_setup): Detect Cell/B.E. architecture.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* linux-low.c: Include <sys/types.h>, <sys/stat.h>,
-	<sys/vfs.h> and <dirent.h>.
-	(SPUFS_MAGIC): Define.
-	(spu_enumerate_spu_ids): New function.
-	(linux_spu_qxfer_partial): New function.
-	(linux_target_ops): Install linux_spu_qxfer_partial.
-
-
-testsuite/ChangeLog:
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* gdb.xml/tdesc-regs.exp: Skip for SPU targets.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* gdb.base/dump.exp: Handle SPU like 64-bit platforms.
-
-
-doc/ChangeLog:
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* gdb.texinfo (Cell Broadband Engine SPU architecture): Document the
-	"set spu auto-flush-cache" and "show spu auto-flush-cache" commands.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* gdb.texinfo (Cell Broadband Engine SPU architecture): Document the
-	"set spu stop-on-load" and "show spu stop-on-load" commands.
-
-2008-09-11  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* gdb.texinfo (Target Descriptions): Document <compatible> element.
-
-
 --- gdb/Makefile.in
 +++ gdb/Makefile.in
-@@ -499,7 +499,7 @@ ALL_TARGET_OBS = \
+@@ -502,7 +502,7 @@ ALL_TARGET_OBS = \
  	sh64-tdep.o sh-linux-tdep.o shnbsd-tdep.o sh-tdep.o \
  	sparc-linux-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o \
  	sparc-sol2-tdep.o sparc-tdep.o \
@@ -393,7 +9,7 @@ doc/ChangeLog:
  	v850-tdep.o \
  	vaxnbsd-tdep.o vaxobsd-tdep.o vax-tdep.o \
  	xstormy16-tdep.o \
-@@ -1337,7 +1337,7 @@ ALLDEPFILES = \
+@@ -1342,7 +1342,7 @@ ALLDEPFILES = \
  	sparc64-tdep.c sparc64fbsd-nat.c sparc64fbsd-tdep.c \
  	sparc64nbsd-nat.c sparc64nbsd-tdep.c sparc64obsd-tdep.c \
  	sparcnbsd-nat.c sparcnbsd-tdep.c sparcobsd-tdep.c \
@@ -401,7 +17,7 @@ doc/ChangeLog:
 +	spu-linux-nat.c spu-tdep.c spu-multiarch.c solib-spu.c \
  	v850-tdep.c \
  	vax-nat.c vax-tdep.c vaxbsd-nat.c vaxnbsd-tdep.c \
- 	win32-nat.c \
+ 	windows-nat.c windows-tdep.c \
 --- gdb/arch-utils.c
 +++ gdb/arch-utils.c
 @@ -326,15 +326,24 @@ set_endian (char *ignore_args, int from_
@@ -520,16 +136,16 @@ doc/ChangeLog:
  
 --- gdb/breakpoint.c
 +++ gdb/breakpoint.c
-@@ -1089,7 +1089,7 @@ Note: automatically using hardware break
+@@ -1134,7 +1134,7 @@ Note: automatically using hardware break
  		  bpt->overlay_target_info = bpt->target_info;
  		  bpt->overlay_target_info.placed_address = addr;
  		  val = target_insert_breakpoint (&bpt->overlay_target_info);
 -		  if (val != 0)
 +		  if (val > 0)
- 		    fprintf_unfiltered (tmp_error_stream, 
- 					"Overlay breakpoint %d failed: in ROM?", 
+ 		    fprintf_unfiltered (tmp_error_stream,
+ 					"Overlay breakpoint %d failed: in ROM?\n",
  					bpt->owner->number);
-@@ -1112,6 +1112,14 @@ Note: automatically using hardware break
+@@ -1157,6 +1157,14 @@ Note: automatically using hardware break
  	    }
  	}
  
@@ -544,7 +160,7 @@ doc/ChangeLog:
        if (val)
  	{
  	  /* Can't set the breakpoint.  */
-@@ -1588,6 +1596,14 @@ remove_breakpoint (struct bp_location *b
+@@ -1626,6 +1634,14 @@ remove_breakpoint (struct bp_location *b
  	    }
  	}
  
@@ -559,7 +175,7 @@ doc/ChangeLog:
        /* In some cases, we might not be able to remove a breakpoint
  	 in a shared library that has already been removed, but we
  	 have not yet processed the shlib unload event.  */
-@@ -7490,6 +7506,37 @@ breakpoint_re_set (void)
+@@ -7553,6 +7569,37 @@ breakpoint_re_set (void)
    
    create_overlay_event_breakpoint ("_ovly_debug_event");
  }
@@ -599,7 +215,7 @@ doc/ChangeLog:
  
 --- gdb/breakpoint.h
 +++ gdb/breakpoint.h
-@@ -674,6 +674,8 @@ extern int breakpoint_thread_match (CORE
+@@ -670,6 +670,8 @@ extern int breakpoint_thread_match (CORE
  
  extern void until_break_command (char *, int, int);
  
@@ -641,7 +257,7 @@ doc/ChangeLog:
  	  /* Parse start address (optional). */
 --- gdb/configure.tgt
 +++ gdb/configure.tgt
-@@ -349,7 +349,8 @@ powerpc-*-aix* | rs6000-*-*)
+@@ -354,7 +354,8 @@ powerpc-*-aix* | rs6000-*-*)
  powerpc-*-linux* | powerpc64-*-linux*)
  	# Target: PowerPC running Linux
  	gdb_target_obs="rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o \
@@ -653,7 +269,7 @@ doc/ChangeLog:
  	;;
 --- gdb/corelow.c
 +++ gdb/corelow.c
-@@ -542,6 +542,33 @@ core_files_info (struct target_ops *t)
+@@ -560,6 +560,33 @@ core_files_info (struct target_ops *t)
    print_section_info (t, core_bfd);
  }
  
@@ -687,7 +303,7 @@ doc/ChangeLog:
  static LONGEST
  core_xfer_partial (struct target_ops *ops, enum target_object object,
  		   const char *annex, gdb_byte *readbuf,
-@@ -634,6 +661,53 @@ core_xfer_partial (struct target_ops *op
+@@ -652,6 +679,53 @@ core_xfer_partial (struct target_ops *op
  	}
        /* FALL THROUGH */
  
@@ -741,7 +357,7 @@ doc/ChangeLog:
      default:
        if (ops->beneath != NULL)
  	return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
-@@ -673,8 +747,8 @@ core_file_thread_alive (ptid_t tid)
+@@ -691,8 +765,8 @@ core_file_thread_alive (ptid_t tid)
  static const struct target_desc *
  core_read_description (struct target_ops *target)
  {
@@ -754,7 +370,7 @@ doc/ChangeLog:
  }
 --- gdb/doc/gdb.texinfo
 +++ gdb/doc/gdb.texinfo
-@@ -16787,6 +16787,33 @@ and local store addresses and transfer s
+@@ -16910,6 +16910,33 @@ and local store addresses and transfer s
  
  @end table
   
@@ -788,7 +404,7 @@ doc/ChangeLog:
  @node PowerPC
  @subsection PowerPC
  @cindex PowerPC architecture
-@@ -28394,6 +28421,7 @@ are explained further below.
+@@ -29271,6 +29298,7 @@ are explained further below.
  <!DOCTYPE target SYSTEM "gdb-target.dtd">
  <target version="1.0">
    @r{[}@var{architecture}@r{]}
@@ -796,7 +412,7 @@ doc/ChangeLog:
    @r{[}@var{feature}@dots{}@r{]}
  </target>
  @end smallexample
-@@ -28445,9 +28473,33 @@ An @samp{<architecture>} element has thi
+@@ -29322,9 +29350,33 @@ An @samp{<architecture>} element has thi
    <architecture>@var{arch}</architecture>
  @end smallexample
  
@@ -1252,7 +868,7 @@ doc/ChangeLog:
 +</target>
 --- gdb/findvar.c
 +++ gdb/findvar.c
-@@ -308,13 +308,15 @@ value_of_register_lazy (struct frame_inf
+@@ -309,13 +309,15 @@ value_of_register_lazy (struct frame_inf
  /* Given a pointer of type TYPE in target form in BUF, return the
     address it represents.  */
  CORE_ADDR
@@ -1270,7 +886,7 @@ doc/ChangeLog:
  {
    return extract_signed_integer (buf, TYPE_LENGTH (type));
  }
-@@ -322,14 +324,15 @@ signed_pointer_to_address (struct type *
+@@ -323,14 +325,15 @@ signed_pointer_to_address (struct type *
  /* Given an address, store it as a pointer of type TYPE in target
     format in BUF.  */
  void
@@ -1431,7 +1047,7 @@ doc/ChangeLog:
  	}
        else
  	internal_error (__FILE__, __LINE__, _("No unwind_pc method"));
-@@ -647,19 +663,24 @@ get_frame_register (struct frame_info *f
+@@ -650,19 +666,24 @@ get_frame_register (struct frame_info *f
  struct value *
  frame_unwind_register_value (struct frame_info *frame, int regnum)
  {
@@ -1458,7 +1074,7 @@ doc/ChangeLog:
    /* Find the unwinder.  */
    if (frame->unwind == NULL)
      frame->unwind = frame_unwind_find_by_frame (frame, &frame->prologue_cache);
-@@ -692,7 +713,7 @@ frame_unwind_register_value (struct fram
+@@ -695,7 +716,7 @@ frame_unwind_register_value (struct fram
  
  	      fprintf_unfiltered (gdb_stdlog, " bytes=");
  	      fprintf_unfiltered (gdb_stdlog, "[");
@@ -1467,7 +1083,7 @@ doc/ChangeLog:
  		fprintf_unfiltered (gdb_stdlog, "%02x", buf[i]);
  	      fprintf_unfiltered (gdb_stdlog, "]");
  	    }
-@@ -701,6 +722,7 @@ frame_unwind_register_value (struct fram
+@@ -704,6 +725,7 @@ frame_unwind_register_value (struct fram
        fprintf_unfiltered (gdb_stdlog, " }\n");
      }
  
@@ -1475,7 +1091,7 @@ doc/ChangeLog:
    return value;
  }
  
-@@ -715,7 +737,7 @@ frame_unwind_register_signed (struct fra
+@@ -718,7 +740,7 @@ frame_unwind_register_signed (struct fra
  {
    gdb_byte buf[MAX_REGISTER_SIZE];
    frame_unwind_register (frame, regnum, buf);
@@ -1484,7 +1100,7 @@ doc/ChangeLog:
  						     regnum));
  }
  
-@@ -730,7 +752,7 @@ frame_unwind_register_unsigned (struct f
+@@ -733,7 +755,7 @@ frame_unwind_register_unsigned (struct f
  {
    gdb_byte buf[MAX_REGISTER_SIZE];
    frame_unwind_register (frame, regnum, buf);
@@ -1493,7 +1109,7 @@ doc/ChangeLog:
  						       regnum));
  }
  
-@@ -1067,6 +1089,8 @@ select_frame (struct frame_info *fi)
+@@ -1070,6 +1092,8 @@ select_frame (struct frame_info *fi)
       source language of this frame, and switch to it if desired.  */
    if (fi)
      {
@@ -1502,7 +1118,7 @@ doc/ChangeLog:
        /* We retrieve the frame's symtab by using the frame PC.  However
           we cannot use the frame PC as-is, because it usually points to
           the instruction following the "call", which is sometimes the
-@@ -1723,9 +1747,17 @@ enum frame_type
+@@ -1694,9 +1718,17 @@ enum frame_type
  get_frame_type (struct frame_info *frame)
  {
    if (frame->unwind == NULL)
@@ -1523,7 +1139,7 @@ doc/ChangeLog:
    return frame->unwind->type;
  }
  
-@@ -1792,12 +1824,48 @@ safe_frame_unwind_memory (struct frame_i
+@@ -1731,17 +1763,48 @@ safe_frame_unwind_memory (struct frame_i
    return !target_read_memory (addr, buf, len);
  }
  
@@ -1533,7 +1149,10 @@ doc/ChangeLog:
  struct gdbarch *
  get_frame_arch (struct frame_info *this_frame)
  {
--  return current_gdbarch;
+-  /* In the future, this function will return a per-frame
+-     architecture instead of current_gdbarch.  Calling the
+-     routine with a NULL value of this_frame is a bug!  */
+-  gdb_assert (this_frame);
 +  return frame_arch_unwind (this_frame->next);
 +}
 +
@@ -1569,7 +1188,8 @@ doc/ChangeLog:
 +
 +      do_cleanups (old_chain);
 +    }
-+
+ 
+-  return current_gdbarch;
 +  return next_frame->prev_arch.arch;
  }
  
@@ -1585,7 +1205,7 @@ doc/ChangeLog:
    /* Sentinel or registers frame.  This frame obtains register values
       direct from the inferior's registers.  */
    SENTINEL_FRAME
-@@ -518,6 +520,7 @@ extern int safe_frame_unwind_memory (str
+@@ -523,6 +525,7 @@ extern int safe_frame_unwind_memory (str
  /* Return this frame's architecture.  */
  
  extern struct gdbarch *get_frame_arch (struct frame_info *this_frame);
@@ -1643,15 +1263,15 @@ doc/ChangeLog:
    else
 --- gdb/gdbarch.c
 +++ gdb/gdbarch.c
-@@ -225,6 +225,7 @@ struct gdbarch
-   gdbarch_regset_from_core_section_ftype *regset_from_core_section;
+@@ -226,6 +226,7 @@ struct gdbarch
    struct core_regset_section * core_regset_sections;
    gdbarch_core_xfer_shared_libraries_ftype *core_xfer_shared_libraries;
-+  const char * gcore_bfd_target;
+   gdbarch_core_pid_to_str_ftype *core_pid_to_str;
++  const char *gcore_bfd_target;
    int vtable_function_descriptors;
    int vbit_in_delta;
    gdbarch_skip_permanent_breakpoint_ftype *skip_permanent_breakpoint;
-@@ -312,8 +313,8 @@ struct gdbarch startup_gdbarch =
+@@ -314,8 +315,8 @@ struct gdbarch startup_gdbarch =
    0,  /* register_to_value */
    0,  /* value_to_register */
    0,  /* value_from_register */
@@ -1662,23 +1282,23 @@ doc/ChangeLog:
    0,  /* integer_to_address */
    0,  /* return_value */
    0,  /* skip_prologue */
-@@ -357,6 +358,7 @@ struct gdbarch startup_gdbarch =
-   0,  /* regset_from_core_section */
+@@ -360,6 +361,7 @@ struct gdbarch startup_gdbarch =
    0,  /* core_regset_sections */
    0,  /* core_xfer_shared_libraries */
+   0,  /* core_pid_to_str */
 +  0,  /* gcore_bfd_target */
    0,  /* vtable_function_descriptors */
    0,  /* vbit_in_delta */
    0,  /* skip_permanent_breakpoint */
-@@ -608,6 +610,7 @@ verify_gdbarch (struct gdbarch *gdbarch)
-   /* Skip verify of fetch_pointer_argument, has predicate */
-   /* Skip verify of regset_from_core_section, has predicate */
+@@ -613,6 +615,7 @@ verify_gdbarch (struct gdbarch *gdbarch)
+   /* Skip verify of core_reg_section_encodes_pid, invalid_p == 0 */
    /* Skip verify of core_xfer_shared_libraries, has predicate */
+   /* Skip verify of core_pid_to_str, has predicate */
 +  /* Skip verify of gcore_bfd_target, has predicate */
    /* Skip verify of vtable_function_descriptors, invalid_p == 0 */
    /* Skip verify of vbit_in_delta, invalid_p == 0 */
    /* Skip verify of skip_permanent_breakpoint, has predicate */
-@@ -829,6 +832,12 @@ gdbarch_dump (struct gdbarch *gdbarch, s
+@@ -838,6 +841,12 @@ gdbarch_dump (struct gdbarch *gdbarch, s
                        "gdbarch_dump: frame_red_zone_size = %s\n",
                        plongest (gdbarch->frame_red_zone_size));
    fprintf_unfiltered (file,
@@ -1691,7 +1311,7 @@ doc/ChangeLog:
                        "gdbarch_dump: gdbarch_get_longjmp_target_p() = %d\n",
                        gdbarch_get_longjmp_target_p (gdbarch));
    fprintf_unfiltered (file,
-@@ -2055,7 +2064,7 @@ gdbarch_pointer_to_address (struct gdbar
+@@ -2070,7 +2079,7 @@ gdbarch_pointer_to_address (struct gdbar
    gdb_assert (gdbarch->pointer_to_address != NULL);
    if (gdbarch_debug >= 2)
      fprintf_unfiltered (gdb_stdlog, "gdbarch_pointer_to_address called\n");
@@ -1700,7 +1320,7 @@ doc/ChangeLog:
  }
  
  void
-@@ -2072,7 +2081,7 @@ gdbarch_address_to_pointer (struct gdbar
+@@ -2087,7 +2096,7 @@ gdbarch_address_to_pointer (struct gdbar
    gdb_assert (gdbarch->address_to_pointer != NULL);
    if (gdbarch_debug >= 2)
      fprintf_unfiltered (gdb_stdlog, "gdbarch_address_to_pointer called\n");
@@ -1709,7 +1329,7 @@ doc/ChangeLog:
  }
  
  void
-@@ -2931,6 +2940,31 @@ set_gdbarch_core_xfer_shared_libraries (
+@@ -2963,6 +2972,31 @@ set_gdbarch_core_xfer_shared_libraries (
  }
  
  int
@@ -1741,7 +1361,7 @@ doc/ChangeLog:
  gdbarch_vtable_function_descriptors (struct gdbarch *gdbarch)
  {
    gdb_assert (gdbarch != NULL);
-@@ -3367,10 +3401,15 @@ gdbarch_data (struct gdbarch *gdbarch, s
+@@ -3423,10 +3457,15 @@ gdbarch_data (struct gdbarch *gdbarch, s
  	   (as all fields are valid), but be careful to also detect
  	   recursive references.  */
  	{
@@ -1773,7 +1393,7 @@ doc/ChangeLog:
  extern void gdbarch_address_to_pointer (struct gdbarch *gdbarch, struct type *type, gdb_byte *buf, CORE_ADDR addr);
  extern void set_gdbarch_address_to_pointer (struct gdbarch *gdbarch, gdbarch_address_to_pointer_ftype *address_to_pointer);
  
-@@ -652,6 +652,13 @@ typedef LONGEST (gdbarch_core_xfer_share
+@@ -661,6 +661,13 @@ typedef LONGEST (gdbarch_core_xfer_share
  extern LONGEST gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdb_byte *readbuf, ULONGEST offset, LONGEST len);
  extern void set_gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, gdbarch_core_xfer_shared_libraries_ftype *core_xfer_shared_libraries);
  
@@ -1800,7 +1420,7 @@ doc/ChangeLog:
  M:CORE_ADDR:integer_to_address:struct type *type, const gdb_byte *buf:type, buf
  
  # Return the return-value convention that will be used by FUNCTYPE
-@@ -607,6 +607,9 @@ v:struct core_regset_section *:core_regs
+@@ -614,6 +614,9 @@ v:struct core_regset_section *:core_regs
  # core file into buffer READBUF with length LEN.
  M:LONGEST:core_xfer_shared_libraries:gdb_byte *readbuf, ULONGEST offset, LONGEST len:readbuf, offset, len
  
@@ -1810,7 +1430,7 @@ doc/ChangeLog:
  # If the elements of C++ vtables are in-place function descriptors rather
  # than normal function pointers (which may point to code or a descriptor),
  # set this to one.
-@@ -1731,10 +1734,15 @@ gdbarch_data (struct gdbarch *gdbarch, s
+@@ -1743,10 +1746,15 @@ gdbarch_data (struct gdbarch *gdbarch, s
  	   (as all fields are valid), but be careful to also detect
  	   recursive references.  */
  	{
@@ -1828,7 +1448,7 @@ doc/ChangeLog:
  	/* The architecture initialization hasn't completed - punt -
 --- gdb/gdbserver/Makefile.in
 +++ gdb/gdbserver/Makefile.in
-@@ -214,8 +214,8 @@ clean:
+@@ -207,8 +207,8 @@ clean:
  	rm -f reg-cris.c reg-crisv32.c reg-x86-64-linux.c reg-xtensa.c
  	rm -f arm-with-iwmmxt.c mips-linux.c mips64-linux.c
  	rm -f powerpc-32l.c powerpc-64l.c powerpc-e500l.c
@@ -1839,7 +1459,7 @@ doc/ChangeLog:
  	rm -f powerpc-isa205-32l.c powerpc-isa205-64l.c
  	rm -f powerpc-isa205-altivec32l.c powerpc-isa205-vsx32l.c powerpc-isa205-altivec64l.c
  	rm -f powerpc-isa205-vsx64l.c
-@@ -363,6 +363,9 @@ powerpc-32l.c : $(srcdir)/../regformats/
+@@ -356,6 +356,9 @@ powerpc-32l.c : $(srcdir)/../regformats/
  powerpc-altivec32l.o : powerpc-altivec32l.c $(regdef_h)
  powerpc-altivec32l.c : $(srcdir)/../regformats/rs6000/powerpc-altivec32l.dat $(regdat_sh)
  	$(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-altivec32l.dat powerpc-altivec32l.c
@@ -1849,7 +1469,7 @@ doc/ChangeLog:
  powerpc-vsx32l.o : powerpc-vsx32l.c $(regdef_h)
  powerpc-vsx32l.c : $(srcdir)/../regformats/rs6000/powerpc-vsx32l.dat $(regdat_sh)
  	$(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-vsx32l.dat powerpc-vsx32l.c
-@@ -384,6 +387,9 @@ powerpc-64l.c : $(srcdir)/../regformats/
+@@ -377,6 +380,9 @@ powerpc-64l.c : $(srcdir)/../regformats/
  powerpc-altivec64l.o : powerpc-altivec64l.c $(regdef_h)
  powerpc-altivec64l.c : $(srcdir)/../regformats/rs6000/powerpc-altivec64l.dat $(regdat_sh)
  	$(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-altivec64l.dat powerpc-altivec64l.c
@@ -1877,7 +1497,15 @@ doc/ChangeLog:
  			srv_regobj="${srv_regobj} powerpc-vsx64l.o"
  			srv_regobj="${srv_regobj} powerpc-isa205-64l.o"
  			srv_regobj="${srv_regobj} powerpc-isa205-altivec64l.o"
-@@ -130,6 +132,7 @@ case "${target}" in
+@@ -116,6 +118,7 @@ case "${target}" in
+ 			srv_tgtobj="linux-low.o linux-ppc-low.o"
+ 			srv_xmlfiles="rs6000/powerpc-32l.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-altivec32l.xml"
++			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-cell32l.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-vsx32l.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-32l.xml"
+ 			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-altivec32l.xml"
+@@ -130,6 +133,7 @@ case "${target}" in
  			srv_xmlfiles="${srv_xmlfiles} rs6000/power-spe.xml"
  			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-64l.xml"
  			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-altivec64l.xml"
@@ -1887,24 +1515,24 @@ doc/ChangeLog:
  			srv_xmlfiles="${srv_xmlfiles} rs6000/powerpc-isa205-altivec64l.xml"
 --- gdb/gdbserver/linux-low.c
 +++ gdb/gdbserver/linux-low.c
-@@ -33,6 +33,14 @@
- #include <errno.h>
- #include <sys/syscall.h>
- #include <sched.h>
-+#include <sys/types.h>
+@@ -36,8 +36,14 @@
+ #include <ctype.h>
+ #include <pwd.h>
+ #include <sys/types.h>
 +#include <sys/stat.h>
 +#include <sys/vfs.h>
-+#include <dirent.h>
-+
+ #include <dirent.h>
+ 
 +#ifndef SPUFS_MAGIC
 +#define SPUFS_MAGIC 0x23c9b64e
 +#endif
- 
++
  #ifndef PTRACE_GETSIGINFO
  # define PTRACE_GETSIGINFO 0x4202
-@@ -2049,6 +2057,102 @@ linux_read_offsets (CORE_ADDR *text_p, C
+ # define PTRACE_SETSIGINFO 0x4203
+@@ -2218,6 +2224,103 @@ linux_xfer_siginfo (const char *annex, u
+   return len;
  }
- #endif
  
 +
 +/* Enumerate spufs IDs for process PID.  */
@@ -1966,6 +1594,7 @@ doc/ChangeLog:
 +  char buf[128];
 +  int fd = 0;
 +  int ret = 0;
++  int pid = lwpid_of (get_thread_lwp (current_inferior));
 +
 +  if (!writebuf && !readbuf)
 +    return -1;
@@ -1975,10 +1604,10 @@ doc/ChangeLog:
 +      if (!readbuf)
 +        return -1;
 +      else
-+        return spu_enumerate_spu_ids (inferior_pid, readbuf, offset, len);
++        return spu_enumerate_spu_ids (pid, readbuf, offset, len);
 +    }
 +
-+  sprintf (buf, "/proc/%ld/fd/%s", inferior_pid, annex);
++  sprintf (buf, "/proc/%d/fd/%s", pid, annex);
 +  if (debug_threads)
 +    printf ("access [%s] |offset [%lld] | len [%d]\n", buf, offset, len);
 +
@@ -2005,15 +1634,15 @@ doc/ChangeLog:
  static struct target_ops linux_target_ops = {
    linux_create_inferior,
    linux_attach,
-@@ -2079,7 +2183,7 @@ static struct target_ops linux_target_op
+@@ -2248,7 +2350,7 @@ static struct target_ops linux_target_op
  #else
    NULL,
  #endif
 -  NULL,
 +  linux_spu_qxfer_partial,
    hostio_last_error_from_errno,
- };
- 
+   linux_qxfer_osdata,
+   linux_xfer_siginfo,
 --- gdb/gdbserver/linux-ppc-low.c
 +++ gdb/gdbserver/linux-ppc-low.c
 @@ -28,6 +28,7 @@
@@ -2021,7 +1650,7 @@ doc/ChangeLog:
  #define PPC_FEATURE_HAS_ALTIVEC         0x10000000
  #define PPC_FEATURE_HAS_SPE             0x00800000
 +#define PPC_FEATURE_CELL		0x00010000
- #define PPC_FEATURE_ARCH_2_05           0x00001000
+ #define PPC_FEATURE_HAS_DFP             0x00000400
  
  static unsigned long ppc_hwcap;
 @@ -37,6 +38,8 @@ static unsigned long ppc_hwcap;
@@ -2187,7 +1816,7 @@ doc/ChangeLog:
  
 --- gdb/i386-nat.c
 +++ gdb/i386-nat.c
-@@ -640,14 +640,14 @@ i386_insert_hw_breakpoint (struct bp_tar
+@@ -641,14 +641,14 @@ i386_insert_hw_breakpoint (struct bp_tar
  }
  
  /* Remove a hardware-assisted breakpoint at BP_TGT->placed_address.
@@ -2206,7 +1835,7 @@ doc/ChangeLog:
      i386_show_dr ("remove_hwbp", addr, 1, hw_execute);
 --- gdb/inferior.h
 +++ gdb/inferior.h
-@@ -146,13 +146,17 @@ extern CORE_ADDR read_pc (void);
+@@ -156,13 +156,17 @@ extern CORE_ADDR read_pc (void);
  
  extern void write_pc (CORE_ADDR);
  
@@ -2230,7 +1859,7 @@ doc/ChangeLog:
  extern void wait_for_inferior (int treat_exec_as_sigtrap);
 --- gdb/iq2000-tdep.c
 +++ gdb/iq2000-tdep.c
-@@ -86,7 +86,8 @@ insn_addr_from_ptr (CORE_ADDR ptr)	/* ta
+@@ -87,7 +87,8 @@ insn_addr_from_ptr (CORE_ADDR ptr)	/* ta
     Convert a target pointer to an address in host (CORE_ADDR) format. */
  
  static CORE_ADDR
@@ -2240,7 +1869,7 @@ doc/ChangeLog:
  {
    enum type_code target = TYPE_CODE (TYPE_TARGET_TYPE (type));
    CORE_ADDR addr = extract_unsigned_integer (buf, TYPE_LENGTH (type));
-@@ -103,7 +104,8 @@ iq2000_pointer_to_address (struct type *
+@@ -104,7 +105,8 @@ iq2000_pointer_to_address (struct type *
     Convert a host-format address (CORE_ADDR) into a target pointer.  */
  
  static void
@@ -2252,10 +1881,10 @@ doc/ChangeLog:
  
 --- gdb/linux-nat.c
 +++ gdb/linux-nat.c
-@@ -49,6 +49,12 @@
- #include "inf-loop.h"
- #include "event-loop.h"
- #include "event-top.h"
+@@ -53,6 +53,12 @@
+ #include <sys/types.h>
+ #include "gdb_dirent.h"
+ #include "xml-support.h"
 +#include <sys/vfs.h>		/* for struct statfs */
 +#include <dirent.h>		/* for DIR etc. */
 +
@@ -2265,7 +1894,7 @@ doc/ChangeLog:
  
  #ifdef HAVE_PERSONALITY
  # include <sys/personality.h>
-@@ -3411,8 +3417,8 @@ linux_nat_do_thread_registers (bfd *obfd
+@@ -3529,8 +3535,8 @@ linux_nat_do_thread_registers (bfd *obfd
    gdb_gregset_t gregs;
    gdb_fpregset_t fpregs;
    unsigned long lwp = ptid_get_lwp (ptid);
@@ -2276,7 +1905,7 @@ doc/ChangeLog:
    const struct regset *regset;
    int core_regset_p;
    struct cleanup *old_chain;
-@@ -3522,6 +3528,119 @@ linux_nat_corefile_thread_callback (stru
+@@ -3640,6 +3646,119 @@ linux_nat_corefile_thread_callback (stru
    return 0;
  }
  
@@ -2396,7 +2025,7 @@ doc/ChangeLog:
  /* Fills the "to_make_corefile_note" target vector.  Builds the note
     section for a corefile, and returns it in a malloc buffer.  */
  
-@@ -3582,6 +3701,8 @@ linux_nat_make_corefile_notes (bfd *obfd
+@@ -3700,6 +3819,8 @@ linux_nat_make_corefile_notes (bfd *obfd
        xfree (auxv);
      }
  
@@ -2405,7 +2034,7 @@ doc/ChangeLog:
    make_cleanup (xfree, note_data);
    return note_data;
  }
-@@ -3911,6 +4032,99 @@ linux_proc_xfer_partial (struct target_o
+@@ -4031,6 +4152,99 @@ linux_proc_xfer_partial (struct target_o
    return ret;
  }
  
@@ -2505,9 +2134,9 @@ doc/ChangeLog:
  /* Parse LINE as a signal set and add its set bits to SIGS.  */
  
  static void
-@@ -4005,6 +4219,10 @@ linux_xfer_partial (struct target_ops *o
-     return procfs_xfer_auxv (ops, object, annex, readbuf, writebuf,
- 			     offset, len);
+@@ -4236,6 +4450,10 @@ linux_xfer_partial (struct target_ops *o
+     return linux_nat_xfer_osdata (ops, object, annex, readbuf, writebuf,
+                                offset, len);
  
 +  if (object == TARGET_OBJECT_SPU)
 +    return linux_proc_xfer_spu (ops, object, annex, readbuf, writebuf,
@@ -2518,7 +2147,7 @@ doc/ChangeLog:
    if (xfer != 0)
 --- gdb/m32c-tdep.c
 +++ gdb/m32c-tdep.c
-@@ -2397,7 +2397,8 @@ m32c_skip_trampoline_code (struct frame_
+@@ -2401,7 +2401,8 @@ m32c_skip_trampoline_code (struct frame_
     programmer!  :)  */
  
  static void
@@ -2528,7 +2157,7 @@ doc/ChangeLog:
  {
    enum type_code target_code;
    gdb_assert (TYPE_CODE (type) == TYPE_CODE_PTR ||
-@@ -2445,7 +2446,8 @@ m32c_m16c_address_to_pointer (struct typ
+@@ -2449,7 +2450,8 @@ m32c_m16c_address_to_pointer (struct typ
  
  
  static CORE_ADDR
@@ -2561,7 +2190,7 @@ doc/ChangeLog:
  #ifndef PPC_FEATURE_BOOKE
  #define PPC_FEATURE_BOOKE 0x00008000
  #endif
-@@ -1244,6 +1247,7 @@ ppc_linux_read_description (struct targe
+@@ -1238,6 +1241,7 @@ fill_fpregset (const struct regcache *re
    int altivec = 0;
    int vsx = 0;
    int isa205 = 0;
@@ -2569,30 +2198,25 @@ doc/ChangeLog:
  
    int tid = TIDGET (inferior_ptid);
    if (tid == 0)
-@@ -1291,6 +1295,9 @@ ppc_linux_read_description (struct targe
-   if (ppc_linux_get_hwcap () & PPC_FEATURE_ARCH_2_05)
+@@ -1291,17 +1340,24 @@ ppc_linux_read_description (struct targe
+   if (ppc_linux_get_hwcap () & PPC_FEATURE_HAS_DFP)
      isa205 = 1;
  
 +  if (ppc_linux_get_hwcap () & PPC_FEATURE_CELL)
 +    cell = 1;
 +
-   /* Check for 64-bit inferior process.  This is the case when the host is
-      64-bit, and in addition the top bit of the MSR register is set.  */
- #ifdef __powerpc64__
-@@ -1300,7 +1307,9 @@ ppc_linux_read_description (struct targe
-     msr = (long) ptrace (PTRACE_PEEKUSER, tid, PT_MSR * 8, 0);
-     if (errno == 0 && msr < 0)
-       {
--	if (vsx)
-+	if (cell)
-+	  return tdesc_powerpc_cell64l;
-+	else if (vsx)
- 	  return isa205? tdesc_powerpc_isa205_vsx64l : tdesc_powerpc_vsx64l;
- 	else if (altivec)
- 	  return isa205? tdesc_powerpc_isa205_altivec64l : tdesc_powerpc_altivec64l;
-@@ -1310,7 +1319,9 @@ ppc_linux_read_description (struct targe
-   }
- #endif
+   if (ppc_linux_target_wordsize () == 8)
+     {
+-      if (vsx)
++      if (cell)
++	return tdesc_powerpc_cell64l;
++      else if (vsx)
+ 	return isa205? tdesc_powerpc_isa205_vsx64l : tdesc_powerpc_vsx64l;
+       else if (altivec)
+ 	return isa205? tdesc_powerpc_isa205_altivec64l : tdesc_powerpc_altivec64l;
+ 
+       return isa205? tdesc_powerpc_isa205_64l : tdesc_powerpc_64l;
+     }
  
 -  if (vsx)
 +  if (cell)
@@ -2712,7 +2336,7 @@ doc/ChangeLog:
  	return tdesc_powerpc_vsx64l;
        else if (altivec)
  	return tdesc_powerpc_altivec64l;
-@@ -1062,6 +1121,249 @@ ppc_linux_core_read_description (struct
+@@ -1062,6 +1121,258 @@ ppc_linux_core_read_description (struct
      }
  }
  
@@ -2770,15 +2394,24 @@ doc/ChangeLog:
 +  if (!ptid_equal (spe_context_cache_ptid, inferior_ptid))
 +    {
 +      volatile struct gdb_exception ex;
++      struct target_ops *target;
++
++      for (target = current_target.beneath;
++	   target != NULL;
++	   target = target->beneath)
++	{
++	  if (target->to_get_thread_local_address != NULL)
++	   break;
++	}
 +
-+      if (!target_get_thread_local_address_p ())
++      if (target == NULL)
 +	return 0;
 +
 +      TRY_CATCH (ex, RETURN_MASK_ERROR)
 +	{
 +	  spe_context_cache_address
-+	    = target_get_thread_local_address
-+	       (inferior_ptid, spe_context_lm_addr, spe_context_offset);
++	    = target->to_get_thread_local_address
++	       (target, inferior_ptid, spe_context_lm_addr, spe_context_offset);
 +
 +	  spe_context_cache_ptid = inferior_ptid;
 +	}
@@ -2962,7 +2595,7 @@ doc/ChangeLog:
  static void
  ppc_linux_init_abi (struct gdbarch_info info,
                      struct gdbarch *gdbarch)
-@@ -1102,6 +1404,12 @@ ppc_linux_init_abi (struct gdbarch_info
+@@ -1102,6 +1413,12 @@ ppc_linux_init_abi (struct gdbarch_info
        /* Trampolines.  */
        tramp_frame_prepend_unwinder (gdbarch, &ppc32_linux_sigaction_tramp_frame);
        tramp_frame_prepend_unwinder (gdbarch, &ppc32_linux_sighandler_tramp_frame);
@@ -2975,7 +2608,7 @@ doc/ChangeLog:
      }
    
    if (tdep->wordsize == 8)
-@@ -1119,6 +1427,12 @@ ppc_linux_init_abi (struct gdbarch_info
+@@ -1119,6 +1436,12 @@ ppc_linux_init_abi (struct gdbarch_info
        /* Trampolines.  */
        tramp_frame_prepend_unwinder (gdbarch, &ppc64_linux_sigaction_tramp_frame);
        tramp_frame_prepend_unwinder (gdbarch, &ppc64_linux_sighandler_tramp_frame);
@@ -2988,7 +2621,7 @@ doc/ChangeLog:
      }
    set_gdbarch_regset_from_core_section (gdbarch, ppc_linux_regset_from_core_section);
    set_gdbarch_core_read_description (gdbarch, ppc_linux_core_read_description);
-@@ -1158,6 +1472,22 @@ ppc_linux_init_abi (struct gdbarch_info
+@@ -1158,6 +1481,22 @@ ppc_linux_init_abi (struct gdbarch_info
  				   PPC_TRAP_REGNUM, "trap");
  	}
      }
@@ -3011,7 +2644,7 @@ doc/ChangeLog:
  }
  
  void
-@@ -1172,15 +1502,23 @@ _initialize_ppc_linux_tdep (void)
+@@ -1172,15 +1511,23 @@ _initialize_ppc_linux_tdep (void)
    gdbarch_register_osabi (bfd_arch_rs6000, bfd_mach_rs6k, GDB_OSABI_LINUX,
                           ppc_linux_init_abi);
  
@@ -3055,7 +2688,7 @@ doc/ChangeLog:
  extern struct target_desc *tdesc_powerpc_isa205_altivec64l;
 --- gdb/printcmd.c
 +++ gdb/printcmd.c
-@@ -386,7 +386,7 @@ print_scalar_formatted (const void *vala
+@@ -388,7 +388,7 @@ print_scalar_formatted (const void *vala
    /* If we are printing it as unsigned, truncate it in case it is actually
       a negative signed value (e.g. "print/u (short)-1" should print 65535
       (if shorts are 16 bits) instead of 4294967295).  */
@@ -3066,37 +2699,37 @@ doc/ChangeLog:
  	val_long &= ((LONGEST) 1 << HOST_CHAR_BIT * len) - 1;
 --- gdb/proc-service.c
 +++ gdb/proc-service.c
-@@ -257,7 +257,7 @@ ps_lgetregs (gdb_ps_prochandle_t ph, lwp
+@@ -258,7 +258,7 @@ ps_lgetregs (gdb_ps_prochandle_t ph, lwp
    struct regcache *regcache;
  
-   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
+   inferior_ptid = BUILD_LWP (lwpid, ptid_get_pid (ph->ptid));
 -  regcache = get_thread_regcache (inferior_ptid);
 +  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
  
    target_fetch_registers (regcache, -1);
    fill_gregset (regcache, (gdb_gregset_t *) gregset, -1);
-@@ -276,7 +276,7 @@ ps_lsetregs (gdb_ps_prochandle_t ph, lwp
+@@ -277,7 +277,7 @@ ps_lsetregs (gdb_ps_prochandle_t ph, lwp
    struct regcache *regcache;
  
-   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
+   inferior_ptid = BUILD_LWP (lwpid, ptid_get_pid (ph->ptid));
 -  regcache = get_thread_regcache (inferior_ptid);
 +  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
  
    supply_gregset (regcache, (const gdb_gregset_t *) gregset);
    target_store_registers (regcache, -1);
-@@ -296,7 +296,7 @@ ps_lgetfpregs (gdb_ps_prochandle_t ph, l
+@@ -297,7 +297,7 @@ ps_lgetfpregs (gdb_ps_prochandle_t ph, l
    struct regcache *regcache;
  
-   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
+   inferior_ptid = BUILD_LWP (lwpid, ptid_get_pid (ph->ptid));
 -  regcache = get_thread_regcache (inferior_ptid);
 +  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
  
    target_fetch_registers (regcache, -1);
    fill_fpregset (regcache, (gdb_fpregset_t *) fpregset, -1);
-@@ -316,7 +316,7 @@ ps_lsetfpregs (gdb_ps_prochandle_t ph, l
+@@ -317,7 +317,7 @@ ps_lsetfpregs (gdb_ps_prochandle_t ph, l
    struct regcache *regcache;
  
-   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
+   inferior_ptid = BUILD_LWP (lwpid, ptid_get_pid (ph->ptid));
 -  regcache = get_thread_regcache (inferior_ptid);
 +  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
  
@@ -3486,7 +3119,16 @@ doc/ChangeLog:
 +32:vrsave
 --- gdb/remote.c
 +++ gdb/remote.c
-@@ -6747,7 +6747,7 @@ remote_insert_breakpoint (struct bp_targ
+@@ -4526,7 +4526,7 @@ process_stop_reply (struct stop_reply *s
+ 	  for (ix = 0;
+ 	       VEC_iterate(cached_reg_t, stop_reply->regcache, ix, reg);
+ 	       ix++)
+-	    regcache_raw_supply (get_thread_regcache (ptid),
++	    regcache_raw_supply (get_thread_arch_regcache (ptid, target_gdbarch),
+ 				 reg->num, reg->data);
+ 	  VEC_free (cached_reg_t, stop_reply->regcache);
+ 	}
+@@ -6785,7 +6785,7 @@ remote_insert_breakpoint (struct bp_targ
        switch (packet_ok (rs->buf, &remote_protocol_packets[PACKET_Z0]))
  	{
  	case PACKET_ERROR:
@@ -3495,7 +3137,7 @@ doc/ChangeLog:
  	case PACKET_OK:
  	  bp_tgt->placed_address = addr;
  	  bp_tgt->placed_size = bpsize;
-@@ -6934,7 +6934,7 @@ remote_insert_hw_breakpoint (struct bp_t
+@@ -6972,7 +6972,7 @@ remote_insert_hw_breakpoint (struct bp_t
      (target_gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size);
  
    if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE)
@@ -3504,7 +3146,7 @@ doc/ChangeLog:
  
    rs = get_remote_state ();
    p = rs->buf;
-@@ -6954,7 +6954,7 @@ remote_insert_hw_breakpoint (struct bp_t
+@@ -6992,7 +6992,7 @@ remote_insert_hw_breakpoint (struct bp_t
      {
      case PACKET_ERROR:
      case PACKET_UNKNOWN:
@@ -3513,7 +3155,7 @@ doc/ChangeLog:
      case PACKET_OK:
        return 0;
      }
-@@ -6971,7 +6971,7 @@ remote_remove_hw_breakpoint (struct bp_t
+@@ -7009,7 +7009,7 @@ remote_remove_hw_breakpoint (struct bp_t
    char *p = rs->buf;
  
    if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE)
@@ -3522,7 +3164,7 @@ doc/ChangeLog:
  
    *(p++) = 'z';
    *(p++) = '1';
-@@ -6988,7 +6988,7 @@ remote_remove_hw_breakpoint (struct bp_t
+@@ -7026,7 +7026,7 @@ remote_remove_hw_breakpoint (struct bp_t
      {
      case PACKET_ERROR:
      case PACKET_UNKNOWN:
@@ -3531,6 +3173,25 @@ doc/ChangeLog:
      case PACKET_OK:
        return 0;
      }
+--- gdb/rs6000-tdep.c
++++ gdb/rs6000-tdep.c
+@@ -3338,6 +3338,16 @@ rs6000_gdbarch_init (struct gdbarch_info
+   int num_pseudoregs = 0;
+   int cur_reg;
+ 
++  /* INFO may refer to a binary that is not of the PowerPC architecture,
++     e.g. when debugging a stand-alone SPE executable on a Cell/B.E. system.
++     In this case, we must not attempt to infer properties of the (PowerPC
++     side) of the target system from properties of that executable.  Trust
++     the target description instead.  */
++  if (info.abfd
++      && bfd_get_arch (info.abfd) != bfd_arch_powerpc
++      && bfd_get_arch (info.abfd) != bfd_arch_rs6000)
++    info.abfd = NULL;
++
+   from_xcoff_exec = info.abfd && info.abfd->format == bfd_object &&
+     bfd_get_flavour (info.abfd) == bfd_target_xcoff_flavour;
+ 
 --- gdb/sentinel-frame.c
 +++ gdb/sentinel-frame.c
 @@ -76,11 +76,23 @@ sentinel_frame_this_id (struct frame_inf
@@ -3560,16 +3221,16 @@ doc/ChangeLog:
  const struct frame_unwind *const sentinel_frame_unwind = &sentinel_frame_unwinder;
 --- gdb/sol-thread.c
 +++ gdb/sol-thread.c
-@@ -1093,7 +1093,7 @@ ps_lgetregs (gdb_ps_prochandle_t ph, lwp
+@@ -1094,7 +1094,7 @@ ps_lgetregs (gdb_ps_prochandle_t ph, lwp
    old_chain = save_inferior_ptid ();
  
    inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid));
 -  regcache = get_thread_regcache (inferior_ptid);
 +  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
  
-   if (target_has_execution)
-     procfs_ops.to_fetch_registers (regcache, -1);
-@@ -1118,7 +1118,7 @@ ps_lsetregs (gdb_ps_prochandle_t ph, lwp
+   target_fetch_registers (regcache, -1);
+   fill_gregset (regcache, (gdb_gregset_t *) gregset, -1);
+@@ -1119,7 +1119,7 @@ ps_lsetregs (gdb_ps_prochandle_t ph, lwp
    old_chain = save_inferior_ptid ();
  
    inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid));
@@ -3577,17 +3238,17 @@ doc/ChangeLog:
 +  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
  
    supply_gregset (regcache, (const gdb_gregset_t *) gregset);
-   if (target_has_execution)
-@@ -1229,7 +1229,7 @@ ps_lgetfpregs (gdb_ps_prochandle_t ph, l
+   target_store_registers (regcache, -1);
+@@ -1230,7 +1230,7 @@ ps_lgetfpregs (gdb_ps_prochandle_t ph, l
    old_chain = save_inferior_ptid ();
  
    inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid));
 -  regcache = get_thread_regcache (inferior_ptid);
 +  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
  
-   if (target_has_execution)
-     procfs_ops.to_fetch_registers (regcache, -1);
-@@ -1254,7 +1254,7 @@ ps_lsetfpregs (gdb_ps_prochandle_t ph, l
+   target_fetch_registers (regcache, -1);
+   fill_fpregset (regcache, (gdb_fpregset_t *) fpregset, -1);
+@@ -1255,7 +1255,7 @@ ps_lsetfpregs (gdb_ps_prochandle_t ph, l
    old_chain = save_inferior_ptid ();
  
    inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid));
@@ -3598,7 +3259,7 @@ doc/ChangeLog:
    if (target_has_execution)
 --- gdb/solib-spu.c
 +++ gdb/solib-spu.c
-@@ -0,0 +1,478 @@
+@@ -0,0 +1,473 @@
 +/* Cell SPU GNU/Linux support -- shared library handling.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
 +
@@ -3678,27 +3339,22 @@ doc/ChangeLog:
 +{
 +  if (target_has_execution)
 +    {
-+      struct cleanup *old_chain;
 +      struct inferior *inferior = current_inferior ();
 +
-+      /* Suppress MI messages that are unexpected at this point.  */
-+      old_chain = make_cleanup_restore_integer (&suppress_resume_observer);
-+      suppress_resume_observer = 1;
-+      make_cleanup_restore_integer (&suppress_stop_observer);
-+      suppress_stop_observer = 1;
-+
-+      /* We either may or may not have an extra SIGTRAP pending, depending
-+	 on whether we've started a new inferior or attached to one that was
-+	 already running.  We cannot readily distinguish between the two,
-+	 in particular when using the extended-remote target.  Thus, we pass
-+	 TARGET_SIGNAL_TRAP to resume -- this way we will always get a trap.
-+	 (If one was already pending, it will be combined into this trap.)  */
++      /* Only some kernels report an extra SIGTRAP with the binfmt_misc
++	 loader; others do not.  In addition, if we have attached to an
++	 already running inferior instead of starting a new one, we will
++	 not see the extra SIGTRAP -- and we cannot readily distinguish
++	 the two cases, in particular with the extended-remote target.
++
++	 Thus we issue a single-step here.  If no extra SIGTRAP was pending,
++	 this will step past the first instruction of the stand-alone SPE
++	 executable loader, but we don't care about that.  */
++
 +      inferior->stop_soon = STOP_QUIETLY;
-+      resume (0, TARGET_SIGNAL_TRAP);
++      resume (1, TARGET_SIGNAL_0);
 +      wait_for_inferior (1);
 +      inferior->stop_soon = NO_STOP_QUIETLY;
-+
-+      do_cleanups (old_chain);
 +    }
 +}
 +
@@ -4079,7 +3735,7 @@ doc/ChangeLog:
 +
 --- gdb/solib.c
 +++ gdb/solib.c
-@@ -311,15 +311,22 @@ static int
+@@ -345,15 +345,22 @@ static int
  solib_map_sections (void *arg)
  {
    struct so_list *so = (struct so_list *) arg;	/* catch_errors bogon */
@@ -4107,7 +3763,7 @@ doc/ChangeLog:
  
    /* Leave bfd open, core_xfer_memory and "info files" need it.  */
    so->abfd = abfd;
-@@ -338,8 +345,6 @@ solib_map_sections (void *arg)
+@@ -372,8 +379,6 @@ solib_map_sections (void *arg)
  
    for (p = so->sections; p < so->sections_end; p++)
      {
@@ -4116,7 +3772,7 @@ doc/ChangeLog:
        /* Relocate the section binding addresses as recorded in the shared
           object's file by the base address to which the object was actually
           mapped. */
-@@ -420,7 +425,9 @@ static int
+@@ -454,7 +459,9 @@ static int
  symbol_add_stub (void *arg)
  {
    struct so_list *so = (struct so_list *) arg;  /* catch_errs bogon */
@@ -4126,32 +3782,11 @@ doc/ChangeLog:
  
    /* Have we already loaded this shared object?  */
    ALL_OBJFILES (so->objfile)
-@@ -429,11 +436,18 @@ symbol_add_stub (void *arg)
- 	return 1;
-     }
- 
-+  /* Open a second BFD for this file.  */
-+  if (ops->open_bfd)
-+    abfd = ops->open_bfd (so->so_name);
-+
-+  if (!abfd)
-+    abfd = symfile_bfd_open (so->so_name);
-+
-   sap = build_section_addr_info_from_section_table (so->sections,
-                                                     so->sections_end);
- 
--  so->objfile = symbol_file_add (so->so_name, so->from_tty,
--				 sap, 0, OBJF_SHARED);
-+  so->objfile = symbol_file_add_from_bfd (abfd, so->from_tty,
-+					  sap, 0, OBJF_SHARED);
-   free_section_addr_info (sap);
- 
-   return (1);
 --- gdb/solist.h
 +++ gdb/solist.h
-@@ -118,6 +118,10 @@ struct target_so_ops
-        and another from the list returned by current_sos, return 1
-        if they represent the same library.  */
+@@ -123,6 +123,10 @@ struct target_so_ops
+        Falls back to using strcmp on so_original_name field when set
+        to NULL.  */
      int (*same) (struct so_list *gdb, struct so_list *inferior);
 +
 +    /* Extra hook for opening a BFD for a solib.  Can be used to
@@ -4162,7 +3797,7 @@ doc/ChangeLog:
  /* Free the memory associated with a (so_list *).  */
 --- gdb/spu-multiarch.c
 +++ gdb/spu-multiarch.c
-@@ -0,0 +1,450 @@
+@@ -0,0 +1,464 @@
 +/* Cell SPU GNU/Linux multi-architecture debugging support.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
 +
@@ -4283,16 +3918,17 @@ doc/ChangeLog:
 +
 +/* Override the to_wait routine to detect current architecture.  */
 +static ptid_t
-+spu_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
++spu_wait (struct target_ops *ops, ptid_t ptid,
++	  struct target_waitstatus *ourstatus)
 +{
-+  struct target_ops *ops_beneath = find_target_beneath (&spu_ops);
++  struct target_ops *ops_beneath = find_target_beneath (ops);
 +
 +  /* Always switch to PPU while running the inferior.  This allows
 +     linux-thread-db.c code to work as expected.  */
 +  current_gdbarch = target_gdbarch;
 +
 +  /* Run it.  */
-+  ptid = ops_beneath->to_wait (ptid, ourstatus);
++  ptid = ops_beneath->to_wait (ops_beneath, ptid, ourstatus);
 +
 +  /* Detect and switch to current architecture.  */
 +  if (ourstatus->kind == TARGET_WAITKIND_STOPPED)
@@ -4353,6 +3989,11 @@ doc/ChangeLog:
 +  ret = ops_beneath->to_insert_breakpoint (bp);
 +  do_cleanups (old_chain);
 +
++  /* Ignore failure to insert breakpoints in a stand-alone SPE
++     executable just before exit, when the FD is already gone.  */
++  if (spu_standalone_p () && ret > 0)
++    ret = -1;
++
 +  return ret;
 +}
 +
@@ -4382,15 +4023,21 @@ doc/ChangeLog:
 +  ret = ops_beneath->to_remove_breakpoint (bp);
 +  do_cleanups (old_chain);
 +
++  /* Ignore failure to remove breakpoints in a stand-alone SPE
++     executable just before exit, when the FD is already gone.  */
++  if (spu_standalone_p () && ret > 0)
++    ret = -1;
++
 +  return ret;
 +}
 +
 +
 +/* Override the to_fetch_registers routine.  */
 +static void
-+spu_fetch_registers (struct regcache *regcache, int regno)
++spu_fetch_registers (struct target_ops *ops,
++		     struct regcache *regcache, int regno)
 +{
-+  struct target_ops *ops_beneath = find_target_beneath (&spu_ops);
++  struct target_ops *ops_beneath = find_target_beneath (ops);
 +  int spufs_fd;
 +  CORE_ADDR spufs_addr;
 +
@@ -4402,7 +4049,7 @@ doc/ChangeLog:
 +	ops_beneath = find_target_beneath (ops_beneath);
 +
 +      gdb_assert (ops_beneath);
-+      ops_beneath->to_fetch_registers (regcache, regno);
++      ops_beneath->to_fetch_registers (ops_beneath, regcache, regno);
 +      return;
 +    }
 +
@@ -4452,9 +4099,10 @@ doc/ChangeLog:
 +
 +/* Override the to_store_registers routine.  */
 +static void
-+spu_store_registers (struct regcache *regcache, int regno)
++spu_store_registers (struct target_ops *ops,
++		     struct regcache *regcache, int regno)
 +{
-+  struct target_ops *ops_beneath = find_target_beneath (&spu_ops);
++  struct target_ops *ops_beneath = find_target_beneath (ops);
 +  int spufs_fd;
 +  CORE_ADDR spufs_addr;
 +
@@ -4466,7 +4114,7 @@ doc/ChangeLog:
 +	ops_beneath = find_target_beneath (ops_beneath);
 +
 +      gdb_assert (ops_beneath);
-+      ops_beneath->to_store_registers (regcache, regno);
++      ops_beneath->to_store_registers (ops_beneath, regcache, regno);
 +      return;
 +    }
 +
@@ -4578,7 +4226,8 @@ doc/ChangeLog:
 +static void
 +spu_mourn_inferior (struct target_ops *ops)
 +{
-+  find_target_beneath (&spu_ops)->to_mourn_inferior (ops);
++  struct target_ops *ops_beneath = find_target_beneath (ops);
++  ops_beneath->to_mourn_inferior (ops_beneath);
 +  spu_multiarch_disable ();
 +}
 +
@@ -5169,7 +4818,7 @@ doc/ChangeLog:
 +/* This handler is called when the inferior has stopped.  If it is stopped in
 +   SPU architecture then flush the ea cache if used.  */
 +static void
-+spu_attach_normal_stop (struct bpstats *bs)
++spu_attach_normal_stop (struct bpstats *bs, int unused)
 +{
 +  if (!spu_auto_flush_cache_p)
 +    return;
@@ -5367,9 +5016,9 @@ doc/ChangeLog:
 --- gdb/stack.c
 +++ gdb/stack.c
 @@ -45,6 +45,7 @@
- #include "valprint.h"
  #include "gdbthread.h"
  #include "cp-support.h"
+ #include "disasm.h"
 +#include "arch-utils.h"
  
  #include "gdb_assert.h"
@@ -5444,7 +5093,7 @@ doc/ChangeLog:
  }
  
  static void
-@@ -1440,6 +1458,7 @@ static void
+@@ -1435,6 +1453,7 @@ static void
  print_frame_local_vars (struct frame_info *frame, int num_tabs,
  			struct ui_file *stream)
  {
@@ -5452,7 +5101,7 @@ doc/ChangeLog:
    struct block *block = get_frame_block (frame, 0);
    int values_printed = 0;
  
-@@ -1449,6 +1468,9 @@ print_frame_local_vars (struct frame_inf
+@@ -1444,6 +1463,9 @@ print_frame_local_vars (struct frame_inf
        return;
      }
  
@@ -5462,7 +5111,7 @@ doc/ChangeLog:
    while (block)
      {
        if (print_block_frame_locals (block, frame, num_tabs, stream))
-@@ -1462,6 +1484,8 @@ print_frame_local_vars (struct frame_inf
+@@ -1457,6 +1479,8 @@ print_frame_local_vars (struct frame_inf
  
    if (!values_printed)
      fprintf_filtered (stream, _("No locals.\n"));
@@ -5624,15 +5273,15 @@ doc/ChangeLog:
  static void init_dummy_target (void);
  
  static struct target_ops debug_target;
-@@ -485,6 +488,7 @@ update_current_target (void)
+@@ -480,6 +483,7 @@ update_current_target (void)
        INHERIT (to_find_memory_regions, t);
        INHERIT (to_make_corefile_notes, t);
-       INHERIT (to_get_thread_local_address, t);
+       /* Do not inherit to_get_thread_local_address.  */
 +      INHERIT (to_thread_architecture, t);
        INHERIT (to_can_execute_reverse, t);
        /* Do not inherit to_read_description.  */
        INHERIT (to_get_ada_task_ptid, t);
-@@ -647,6 +651,8 @@ update_current_target (void)
+@@ -639,6 +643,8 @@ update_current_target (void)
    de_fault (to_async_mask,
  	    (int (*) (int))
  	    return_one);
@@ -5641,7 +5290,7 @@ doc/ChangeLog:
    current_target.to_read_description = NULL;
    de_fault (to_get_ada_task_ptid,
              (ptid_t (*) (long, long))
-@@ -2098,7 +2104,8 @@ target_require_runnable (void)
+@@ -2134,7 +2140,8 @@ target_require_runnable (void)
        /* Do not worry about thread_stratum targets that can not
  	 create inferiors.  Assume they will be pushed again if
  	 necessary, and continue to the process_stratum.  */
@@ -5651,7 +5300,7 @@ doc/ChangeLog:
  	continue;
  
        error (_("\
-@@ -2238,6 +2245,12 @@ default_watchpoint_addr_within_range (st
+@@ -2294,6 +2301,12 @@ default_watchpoint_addr_within_range (st
    return addr >= start && addr < start + length;
  }
  
@@ -5664,7 +5313,7 @@ doc/ChangeLog:
  static int
  return_zero (void)
  {
-@@ -3131,6 +3144,19 @@ debug_to_find_new_threads (void)
+@@ -3145,6 +3158,19 @@ debug_to_find_new_threads (void)
    fputs_unfiltered ("target_find_new_threads ()\n", gdb_stdlog);
  }
  
@@ -5684,7 +5333,7 @@ doc/ChangeLog:
  static void
  debug_to_stop (ptid_t ptid)
  {
-@@ -3216,6 +3242,7 @@ setup_target_debug (void)
+@@ -3224,6 +3250,7 @@ setup_target_debug (void)
    current_target.to_stop = debug_to_stop;
    current_target.to_rcmd = debug_to_rcmd;
    current_target.to_pid_to_exec_file = debug_to_pid_to_exec_file;
@@ -5695,16 +5344,16 @@ doc/ChangeLog:
 --- gdb/target.h
 +++ gdb/target.h
 @@ -62,7 +62,8 @@ enum strata
-     file_stratum,		/* Executable files, etc */
      core_stratum,		/* Core dump files */
      process_stratum,		/* Executing processes */
--    thread_stratum		/* Executing threads */
-+    thread_stratum,		/* Executing threads */
+     thread_stratum,		/* Executing threads */
+-    record_stratum		/* Support record debugging */
++    record_stratum,		/* Support record debugging */
 +    arch_stratum		/* Architecture overrides */
    };
  
  enum thread_control_capabilities
-@@ -541,6 +542,9 @@ struct target_ops
+@@ -544,6 +545,9 @@ struct target_ops
         simultaneously?  */
      int (*to_supports_multi_process) (void);
  
@@ -5714,7 +5363,7 @@ doc/ChangeLog:
      int to_magic;
      /* Need sub-structure for target machine related rather than comm related?
       */
-@@ -1046,6 +1050,11 @@ extern char *normal_pid_to_str (ptid_t p
+@@ -1043,6 +1047,11 @@ extern char *normal_pid_to_str (ptid_t p
  #define target_pid_to_exec_file(pid) \
       (current_target.to_pid_to_exec_file) (pid)
  
@@ -5762,7 +5411,7 @@ doc/ChangeLog:
  # If no core registers were specified, assume this target does not
 --- gdb/thread.c
 +++ gdb/thread.c
-@@ -766,6 +766,7 @@ switch_to_thread (ptid_t ptid)
+@@ -824,6 +824,7 @@ switch_to_thread (ptid_t ptid)
    inferior_ptid = ptid;
    reinit_frame_cache ();
    registers_changed ();
@@ -5772,7 +5421,7 @@ doc/ChangeLog:
       while in the TARGET_RUNNING state, e.g., while handling an
 --- gdb/utils.c
 +++ gdb/utils.c
-@@ -3021,7 +3021,6 @@ core_addr_to_string_nz (const CORE_ADDR
+@@ -3119,7 +3119,6 @@ core_addr_to_string_nz (const CORE_ADDR
  CORE_ADDR
  string_to_core_addr (const char *my_string)
  {
@@ -5780,7 +5429,7 @@ doc/ChangeLog:
    CORE_ADDR addr = 0;
  
    if (my_string[0] == '0' && tolower (my_string[1]) == 'x')
-@@ -3037,17 +3036,6 @@ string_to_core_addr (const char *my_stri
+@@ -3135,17 +3134,6 @@ string_to_core_addr (const char *my_stri
  	  else
  	    error (_("invalid hex \"%s\""), my_string);
  	}
@@ -5809,12 +5458,11 @@ doc/ChangeLog:
  
    if (frame_addr == (CORE_ADDR) 0)
      return NULL;
-@@ -436,7 +438,17 @@ find_frame_addr_in_frame_chain (CORE_ADD
-       frame = get_prev_frame (frame);
-       if (frame == NULL)
- 	return NULL;
+@@ -435,7 +437,16 @@ find_frame_addr_in_frame_chain (CORE_ADD
+        frame != NULL;
+        frame = get_prev_frame (frame))
+     {
 -      if (get_frame_base_address (frame) == frame_addr)
-+
 +      /* The CORE_ADDR we get as argument was parsed from a string GDB
 +	 output as $fp.  This output got truncated to gdbarch_addr_bit.
 +	 Truncate the frame base address in the same manner before
@@ -5827,7 +5475,7 @@ doc/ChangeLog:
 +      if (frame_base == frame_addr)
  	return frame;
      }
- }
+ 
 --- gdb/xml-tdesc.c
 +++ gdb/xml-tdesc.c
 @@ -106,6 +106,20 @@ tdesc_end_arch (struct gdb_xml_parser *p
--- gdb.spec.orig
+++ gdb.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package gdb (Version 6.8.50.20081120)
+# spec file for package gdb (Version 6.8.50.20090505)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,8 +19,8 @@
 
 Name:           gdb
 Summary:        The GNU Debugger
-Version:        6.8.50.20081120
-Release:        2
+Version:        6.8.50.20090505
+Release:        1
 BuildRequires:  bison dejagnu flex gcc-c++ gcc-fortran gcc-java gcc-objc python-devel readline-devel zlib-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  libexpat-devel
@@ -40,10 +40,8 @@ AutoReqProv:    on
 %ifarch ppc64
 Obsoletes:      gdb-64bit
 %endif
-%ifarch  ppc
-Obsoletes:      gdb-32bit
-%endif
 PreReq:         %{install_info_prereq}
+Recommends:     python
 %define sss -cvs
 Source:         gdb-%{version}%{sss}.tar.bz2
 Patch:          cell-combined.diff
@@ -56,9 +54,7 @@ Patch7:         pie-relocate.diff
 Patch8:         find-separate-debug-file.diff
 Patch9:         fix-gdb-backtrace.diff
 Patch10:        expand-line-sal-maybe.diff
-Patch11:        startup-inferior.diff
-Patch12:        resume.diff
-Patch13:        testsuite.diff
+Patch11:        gdb-readline6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -116,6 +112,7 @@ Authors:
     Steve Chamberlain <sac@cygnus.com>
     Stu Grossman <grossman@cygnus.com>
 
+%debug_package
 %prep
 %setup -q -n %{name}-%{version}%{sss}
 %patch
@@ -129,8 +126,6 @@ Authors:
 %patch9
 %patch10
 %patch11
-%patch12
-%patch13
 
 %build
 %ifarch %ix86 ia64 ppc ppc64 s390 s390x x86_64
@@ -141,10 +136,10 @@ Authors:
 %define target_list i686 ia64 powerpc powerpc64 s390 s390x x86_64
 %define DIST %(echo '%distribution' | sed 's/ (.*)//')
 %if %build_multitarget
-ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')"
-ADDITIONAL_TARGETS="$ADDITIONAL_TARGETS spu-elf"
+EXTRA_TARGETS="%(printf ,%%s-suse-linux %target_list)"
+EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %else
-ADDITIONAL_TARGETS=
+EXTRA_TARGETS=
 %endif
 ./configure CFLAGS="$RPM_OPT_FLAGS" \
   --prefix=%{_prefix} --libdir=%{_libdir} --infodir=%{_infodir} \
@@ -156,9 +151,12 @@ ADDITIONAL_TARGETS=
 %endif
   --with-separate-debug-dir=%{_prefix}/lib/debug \
   --enable-64-bit-bfd --disable-werror --disable-sim \
-  --with-bugurl=http://bugs.opensuse.org/ --with-pkgversion="GDB; %{DIST}" \
+  --with-bugurl=http://bugs.opensuse.org/ \
+%if 0%{?distribution:1}
+  --with-pkgversion="GDB; %{DIST}" \
+%endif
   --build=%{_target_cpu}-suse-linux \
-  ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"}
+  ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs}
 make info
 
--- pie-relocate.diff.orig
+++ pie-relocate.diff
@@ -1,6 +1,6 @@
 --- gdb/breakpoint.c
 +++ gdb/breakpoint.c
-@@ -4125,6 +4125,7 @@ describe_other_breakpoints (CORE_ADDR pc
+@@ -3876,6 +3876,7 @@ describe_other_breakpoints (CORE_ADDR pc
  	      printf_filtered (" (thread %d)", b->thread);
  	    printf_filtered ("%s%s ",
  			     ((b->enable_state == bp_disabled || 
@@ -8,7 +8,7 @@
  			       b->enable_state == bp_call_disabled) 
  			      ? " (disabled)"
  			      : b->enable_state == bp_permanent 
-@@ -4200,6 +4201,7 @@ check_duplicates_for (CORE_ADDR address,
+@@ -3947,6 +3948,7 @@ check_duplicates_for (CORE_ADDR address,
    ALL_BP_LOCATIONS (b)
      if (b->owner->enable_state != bp_disabled
  	&& b->owner->enable_state != bp_call_disabled
@@ -16,7 +16,7 @@
  	&& b->enabled
  	&& !b->shlib_disabled
  	&& b->address == address	/* address / overlay match */
-@@ -4235,6 +4237,7 @@ check_duplicates_for (CORE_ADDR address,
+@@ -3982,6 +3984,7 @@ check_duplicates_for (CORE_ADDR address,
  	  {
  	    if (b->owner->enable_state != bp_disabled
  		&& b->owner->enable_state != bp_call_disabled
@@ -24,8 +24,8 @@
  		&& b->enabled && !b->shlib_disabled		
  		&& b->address == address	/* address / overlay match */
  		&& (!overlay_debugging || b->section == section)
-@@ -4766,6 +4769,60 @@ disable_breakpoints_in_unloaded_shlib (s
-   }
+@@ -4707,6 +4710,60 @@ create_catchpoint (int tempflag, char *c
+   return b;
  }
  
 +void
@@ -84,8 +84,8 @@
 +
  static void
  create_fork_vfork_event_catchpoint (int tempflag, char *cond_string,
- 				    enum bptype bp_kind)
-@@ -7561,6 +7618,7 @@ breakpoint_re_set_one (void *bint)
+                                     struct breakpoint_ops *ops)
+@@ -7435,6 +7492,7 @@ breakpoint_re_set_one (void *bint)
  	  if (not_found 
  	      && (b->condition_not_parsed 
  		  || (b->loc && b->loc->shlib_disabled)
@@ -95,7 +95,7 @@
  
 --- gdb/breakpoint.h
 +++ gdb/breakpoint.h
-@@ -142,6 +142,7 @@ enum enable_state
+@@ -126,6 +126,7 @@ enum enable_state
  			   automatically enabled and reset when the call 
  			   "lands" (either completes, or stops at another 
  			   eventpoint). */
@@ -103,7 +103,7 @@
      bp_permanent	/* There is a breakpoint instruction hard-wired into
  			   the target's code.  Don't try to write another
  			   breakpoint instruction on top of it, or restore
-@@ -843,6 +844,10 @@ extern void remove_thread_event_breakpoi
+@@ -820,6 +821,10 @@ extern void remove_thread_event_breakpoi
  
  extern void disable_breakpoints_in_shlibs (void);
  
@@ -116,7 +116,7 @@
  
 --- gdb/dwarf2read.c
 +++ gdb/dwarf2read.c
-@@ -1258,7 +1258,7 @@ dwarf2_build_psymtabs (struct objfile *o
+@@ -1285,7 +1285,7 @@ dwarf2_build_psymtabs (struct objfile *o
    else
      dwarf2_per_objfile->loc_buffer = NULL;
  
@@ -138,7 +138,7 @@
        mainline = 0;
 --- gdb/ia64-tdep.c
 +++ gdb/ia64-tdep.c
-@@ -3243,8 +3243,13 @@ ia64_convert_from_func_ptr_addr (struct
+@@ -3361,8 +3361,13 @@ ia64_convert_from_func_ptr_addr (struct
       the target address itself points to a section that is executable.  */
    if (s && (s->the_bfd_section->flags & SEC_CODE) == 0)
      {
@@ -156,7 +156,7 @@
          return pc;
 --- gdb/infrun.c
 +++ gdb/infrun.c
-@@ -1972,6 +1972,11 @@ handle_inferior_event (struct execution_
+@@ -2233,6 +2233,11 @@ handle_inferior_event (struct execution_
  #endif
  	  target_terminal_inferior ();
  
@@ -168,7 +168,7 @@
  	  /* If requested, stop when the dynamic linker notifies
  	     gdb of events.  This allows the user to get control
  	     and place breakpoints in initializer routines for
-@@ -2896,6 +2901,11 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
+@@ -3193,6 +3198,11 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (
  #endif
  	  target_terminal_inferior ();
  
@@ -211,15 +211,15 @@
  /* Create the terminating entry of OBJFILE's minimal symbol table.
 --- gdb/solib-svr4.c
 +++ gdb/solib-svr4.c
-@@ -31,6 +31,7 @@
- #include "gdbcore.h"
+@@ -32,6 +32,7 @@
  #include "target.h"
  #include "inferior.h"
+ #include "regcache.h"
 +#include "command.h"
  #include "gdbthread.h"
  
  #include "gdb_assert.h"
-@@ -286,8 +287,6 @@ static CORE_ADDR main_lm_addr;
+@@ -287,8 +288,6 @@ static CORE_ADDR main_lm_addr;
  
  /* Local function prototypes */
  
@@ -228,7 +228,7 @@
  static CORE_ADDR bfd_lookup_symbol (bfd *, char *);
  
  /*
-@@ -524,6 +523,8 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
+@@ -525,6 +524,8 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
    Elf32_External_Dyn *x_dynp_32;
    Elf64_External_Dyn *x_dynp_64;
    struct bfd_section *sect;
@@ -237,7 +237,7 @@
  
    if (abfd == NULL)
      return 0;
-@@ -531,11 +532,20 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
+@@ -532,11 +533,20 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
    if (arch_size == -1)
     return 0;
  
@@ -258,7 +258,7 @@
  
    /* Read in .dynamic from the BFD.  We will get the actual value
       from memory later.  */
-@@ -577,7 +587,7 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
+@@ -578,7 +588,7 @@ scan_dyntag (int dyntag, bfd *abfd, CORE
  	     CORE_ADDR ptr_addr;
  
  	     ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr;
@@ -267,7 +267,7 @@
  	     if (target_read_memory (ptr_addr, ptr_buf, arch_size / 8) == 0)
  	       dyn_ptr = extract_typed_address (ptr_buf, ptr_type);
  	     *ptr = dyn_ptr;
-@@ -983,11 +993,55 @@ svr4_current_sos (void)
+@@ -984,11 +994,55 @@ svr4_current_sos (void)
           decide when to ignore it. */
        if (IGNORE_FIRST_LINK_MAP_ENTRY (new) && ldsomap == 0)
  	{
@@ -324,7 +324,7 @@
  	  int errcode;
  	  char *buffer;
  
-@@ -1005,10 +1059,8 @@ svr4_current_sos (void)
+@@ -1006,10 +1060,8 @@ svr4_current_sos (void)
  	    }
  	  xfree (buffer);
  
@@ -337,7 +337,7 @@
  	    free_so (new);
  	  else
  	    {
-@@ -1059,24 +1111,6 @@ svr4_fetch_objfile_link_map (struct objf
+@@ -1060,24 +1112,6 @@ svr4_fetch_objfile_link_map (struct objf
    return 0;
  }
  
@@ -362,7 +362,7 @@
  /* Return 1 if PC lies in the dynamic symbol resolution code of the
     SVR4 run time loader.  */
  static CORE_ADDR interp_text_sect_low;
-@@ -1606,6 +1640,8 @@ svr4_solib_create_inferior_hook (void)
+@@ -1607,6 +1641,8 @@ svr4_solib_create_inferior_hook (void)
    while (tp->stop_signal != TARGET_SIGNAL_TRAP);
    inf->stop_soon = NO_STOP_QUIETLY;
  #endif /* defined(_SCO_DS) */
@@ -373,7 +373,7 @@
  static void
 --- gdb/solib.c
 +++ gdb/solib.c
-@@ -432,8 +432,22 @@ symbol_add_stub (void *arg)
+@@ -466,15 +466,37 @@ symbol_add_stub (void *arg)
    /* Have we already loaded this shared object?  */
    ALL_OBJFILES (so->objfile)
      {
@@ -396,26 +396,25 @@
 +        return 1;
      }
  
-   /* Open a second BFD for this file.  */
-@@ -446,8 +460,15 @@ symbol_add_stub (void *arg)
    sap = build_section_addr_info_from_section_table (so->sections,
                                                      so->sections_end);
  
--  so->objfile = symbol_file_add_from_bfd (abfd, so->from_tty,
--					  sap, 0, OBJF_SHARED);
+-  so->objfile = symbol_file_add_from_bfd (so->abfd, so->from_tty,
+-					  sap, 0, OBJF_SHARED | OBJF_KEEPBFD);
 +  if (so->main_p)
 +    {
-+      so->objfile = symbol_file_add_from_bfd (abfd, 0, sap, 1, 0);
++      so->objfile = symbol_file_add_from_bfd (so->abfd, 0,
++					      sap, 1, OBJF_KEEPBFD);
 +      so->main_relocated = 1;
 +    }
 +  else
-+    so->objfile = symbol_file_add_from_bfd (abfd, so->from_tty,
-+					    sap, 0, OBJF_SHARED);
++    so->objfile = symbol_file_add_from_bfd (so->abfd, so->from_tty,
++					    sap, 0, OBJF_SHARED | OBJF_KEEPBFD);
 +
    free_section_addr_info (sap);
  
    return (1);
-@@ -633,28 +654,7 @@ update_solib_list (int from_tty, struct
+@@ -660,28 +682,7 @@ update_solib_list (int from_tty, struct
        /* Fill in the rest of each of the `struct so_list' nodes.  */
        for (i = inferior; i; i = i->next)
  	{
@@ -445,7 +444,7 @@
  
  	  /* Notify any observer that the shared object has been
               loaded now that we've added it to GDB's tables.  */
-@@ -750,6 +750,39 @@ solib_add (char *pattern, int from_tty,
+@@ -777,6 +778,39 @@ solib_add (char *pattern, int from_tty,
    }
  }
  
@@ -496,7 +495,7 @@
      struct objfile *objfile;	/* objfile for loaded lib */
      struct section_table *sections;
      struct section_table *sections_end;
-@@ -133,6 +135,10 @@ struct so_list *master_so_list (void);
+@@ -142,6 +144,10 @@ extern bfd *solib_bfd_fopen (char *pathn
  /* Find solib binary file and open it.  */
  extern bfd *solib_bfd_open (char *in_pathname);
  
@@ -538,7 +537,7 @@
      {
        asection *lower_sect;
        asection *sect;
-@@ -918,14 +918,14 @@ new_symfile_objfile (struct objfile *obj
+@@ -914,14 +914,14 @@ new_symfile_objfile (struct objfile *obj
    /* If this is the main symbol file we have to clean up all users of the
       old main symbol file. Otherwise it is sufficient to fixup all the
       breakpoints that may have been redefined by this symbol file.  */
@@ -555,7 +554,7 @@
      {
        breakpoint_re_set ();
      }
-@@ -971,7 +971,7 @@ symbol_file_add_with_addrs_or_offsets (b
+@@ -967,7 +967,7 @@ symbol_file_add_with_addrs_or_offsets (b
       interactively wiping out any existing symbols.  */
  
    if ((have_full_symbols () || have_partial_symbols ())
@@ -564,24 +563,14 @@
        && from_tty
        && !query ("Load new symbol table from \"%s\"? ", name))
      error (_("Not confirmed."));
-@@ -1160,6 +1160,11 @@ symbol_file_clear (int from_tty)
- 		    symfile_objfile->name)
+@@ -1156,6 +1156,10 @@ symbol_file_clear (int from_tty)
  	  : !query (_("Discard symbol table? "))))
      error (_("Not confirmed."));
-+
+ 
 +#ifdef CLEAR_SOLIB
 +  CLEAR_SOLIB ();
 +#endif
 +
-     free_all_objfiles ();
+   free_all_objfiles ();
  
-     /* solib descriptors may have handles to objfiles.  Since their
-@@ -2454,6 +2459,8 @@ reread_symbols (void)
- 	      /* Discard cleanups as symbol reading was successful.  */
- 	      discard_cleanups (old_cleanups);
- 
-+	      init_entry_point_info (objfile);
-+
- 	      /* If the mtime has changed between the time we set new_modtime
- 	         and now, we *want* this to be out of date, so don't call stat
- 	         again now.  */
+  /* solib descriptors may have handles to objfiles.  Since their

Places

File project.diff of Package gdb (Revision 094d4965c2a98fa6cb50792737059008)

Places