2003-10-09 Andrew Cagney <cagney@redhat.com>

	Changes from 2003-09-09 Jimi Xenidis <jimix@watson.ibm.com>:
	* config/rs6000/tm-rs6000.h (SOFTWARE_SINGLE_STEP): Delete macro.
	(SOFTWARE_SINGLE_STEP_P): Ditto.
	* config/powerpc/tm-ppc-eabi.h (SOFTWARE_SINGLE_STEP_P): Ditto.
	* config/powerpc/tm-linux.h (SOFTWARE_SINGLE_STEP): Ditto.
	(SOFTWARE_SINGLE_STEP_P): Ditto.
	* rs6000-tdep.c (rs6000_gdbarch_init): When AIX, set
	software_single_step to rs6000_software_single_step.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index df6667a2b33df33652223beadb8684b3be43160b..b5229ff4e1a8f068a8b1b9ee74380794b9640b9e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-09  Andrew Cagney  <cagney@redhat.com>
+
+       Changes from 2003-09-09 Jimi Xenidis <jimix@watson.ibm.com>:
+       * config/rs6000/tm-rs6000.h (SOFTWARE_SINGLE_STEP): Delete macro.
+       (SOFTWARE_SINGLE_STEP_P): Ditto.
+       * config/powerpc/tm-ppc-eabi.h (SOFTWARE_SINGLE_STEP_P): Ditto.
+       * config/powerpc/tm-linux.h (SOFTWARE_SINGLE_STEP): Ditto.
+       (SOFTWARE_SINGLE_STEP_P): Ditto.
+       * rs6000-tdep.c (rs6000_gdbarch_init): When AIX, set
+       software_single_step to rs6000_software_single_step.
+       
 2003-10-09  Andrew Cagney  <cagney@redhat.com>
 
        * MAINTAINERS: Mark m32r-elf as buildable with -Werror.

diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h
index e5383900ad6d90b0bb40e52184a91988483b58b5..d7faf7ec567585868b379ccce6bb9f576399c1a3 100644 (file)
--- a/gdb/config/powerpc/tm-linux.h
+++ b/gdb/config/powerpc/tm-linux.h
@@ -31,12 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #undef IN_SOLIB_CALL_TRAMPOLINE
 #undef SKIP_TRAMPOLINE_CODE
 
-/* We can single step on linux */
-#undef  SOFTWARE_SINGLE_STEP
-#define SOFTWARE_SINGLE_STEP(p,q) internal_error (__FILE__, __LINE__, "Will never execute!")
-#undef  SOFTWARE_SINGLE_STEP_P
-#define SOFTWARE_SINGLE_STEP_P() 0
-
 /* Make sure nexti gets the help it needs for debugging assembly code
    without symbols */
 

diff --git a/gdb/config/powerpc/tm-ppc-eabi.h b/gdb/config/powerpc/tm-ppc-eabi.h
index e49b2bd0c9774914bfde88e1ac51760289b574ea..d29b05ddcd0d9830a010ed32e4e8ff3c6ab70c25 100644 (file)
--- a/gdb/config/powerpc/tm-ppc-eabi.h
+++ b/gdb/config/powerpc/tm-ppc-eabi.h
@@ -24,9 +24,6 @@
 
 /* Use generic RS6000 definitions. */
 #include "rs6000/tm-rs6000.h"
-/* except we want to allow single stepping */
-#undef SOFTWARE_SINGLE_STEP_P
-#define SOFTWARE_SINGLE_STEP_P() 0
 
 #undef PROCESS_LINENUMBER_HOOK
 

diff --git a/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h
index 003b5b95caa3ee905c96c886878003bb28e3b962..41183fb1a94be88ad4fe6db4749bab0b75fb58e7 100644 (file)
--- a/gdb/config/rs6000/tm-rs6000.h
+++ b/gdb/config/rs6000/tm-rs6000.h
@@ -84,12 +84,6 @@ extern void aix_process_linenos (void);
   (fromleaf ? DEPRECATED_SAVED_PC_AFTER_CALL (prev->next) : \
              prev->next ? DEPRECATED_FRAME_SAVED_PC (prev->next) : read_pc ())
 
-/* RS6000/AIX does not support PT_STEP.  Has to be simulated.  */
-
-#define SOFTWARE_SINGLE_STEP_P() 1
-extern void rs6000_software_single_step (enum target_signal, int);
-#define SOFTWARE_SINGLE_STEP(sig,bp_p) rs6000_software_single_step (sig, bp_p)
-
 /* Notice when a new child process is started. */
 
 #define TARGET_CREATE_INFERIOR_HOOK rs6000_create_inferior

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index fe51340d5630f2e8c52ce646914acb6d034af16f..bc0cff9c8f308c725f22878d7db15ef533d8b54b 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -3008,6 +3008,16 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   /* Hook in ABI-specific overrides, if they have been registered.  */
   gdbarch_init_osabi (info, gdbarch);
 
+  if (from_xcoff_exec)
+    {
+      /* NOTE: jimix/2003-06-09: This test should really check for
+        GDB_OSABI_AIX when that is defined and becomes
+        available. (Actually, once things are properly split apart,
+        the test goes away.) */
+       /* RS6000/AIX does not support PT_STEP.  Has to be simulated.  */
+       set_gdbarch_software_single_step (gdbarch, rs6000_software_single_step);
+    }
+
   return gdbarch;
 }