From 4b1ac624b9555956d6a4d57004d34f7a20573a76 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 3 Sep 2003 21:01:44 +0000 Subject: [PATCH] 2003-09-03 Andrew Cagney * config/rs6000/tm-rs6000.h (IBM6000_TARGET): Delete definition. * config/rs6000/nm-rs6000.h (DEPRECATED_IBM6000_TARGET): Define. * symfile.c (syms_from_objfile): Update. (reread_symbols): `Update * exec.c (exec_file_attach): Update. (exec_file_attach): Update. * config/powerpc/tm-nbsd.h: Delete #undef IBM6000_TARGET, revert 2003-08-29 change. * config/powerpc/tm-linux.h: Delete #undef IBM6000_TARGET. --- gdb/ChangeLog | 12 ++++++++++++ gdb/config/powerpc/tm-linux.h | 4 ---- gdb/config/powerpc/tm-nbsd.h | 4 ---- gdb/config/rs6000/nm-rs6000.h | 3 +++ gdb/config/rs6000/tm-rs6000.h | 3 --- gdb/exec.c | 4 ++-- gdb/symfile.c | 6 +++--- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7d58f886a1..00ff80a133 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2003-09-03 Andrew Cagney + + * config/rs6000/tm-rs6000.h (IBM6000_TARGET): Delete definition. + * config/rs6000/nm-rs6000.h (DEPRECATED_IBM6000_TARGET): Define. + * symfile.c (syms_from_objfile): Update. + (reread_symbols): `Update + * exec.c (exec_file_attach): Update. + (exec_file_attach): Update. + * config/powerpc/tm-nbsd.h: Delete #undef IBM6000_TARGET, revert + 2003-08-29 change. + * config/powerpc/tm-linux.h: Delete #undef IBM6000_TARGET. + 2003-09-03 Daniel Jacobowitz * arm-tdep.c: Include frame-unwind.h, frame-base.h, and diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h index 34d95cadca..e5383900ad 100644 --- a/gdb/config/powerpc/tm-linux.h +++ b/gdb/config/powerpc/tm-linux.h @@ -44,10 +44,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ at_subroutine_call_instruction_target(prevpc,stoppc) extern int at_subroutine_call_instruction_target(); -/* We _want_ the SVR4 section offset calculations (see syms_from_objfile() - in symfile.c) */ -#undef IBM6000_TARGET - extern int ppc_linux_in_sigtramp (CORE_ADDR pc, char *func_name); #undef IN_SIGTRAMP #define IN_SIGTRAMP(pc,func_name) ppc_linux_in_sigtramp (pc,func_name) diff --git a/gdb/config/powerpc/tm-nbsd.h b/gdb/config/powerpc/tm-nbsd.h index d98fc791f8..d167830523 100644 --- a/gdb/config/powerpc/tm-nbsd.h +++ b/gdb/config/powerpc/tm-nbsd.h @@ -23,8 +23,4 @@ #include "powerpc/tm-ppc-eabi.h" -/* We _want_ the SVR4 section offset calculations (see syms_from_objfile() - in symfile.c). */ -#undef IBM6000_TARGET - #endif /* TM_NBSD_H */ diff --git a/gdb/config/rs6000/nm-rs6000.h b/gdb/config/rs6000/nm-rs6000.h index 728497e787..34bc0feebc 100644 --- a/gdb/config/rs6000/nm-rs6000.h +++ b/gdb/config/rs6000/nm-rs6000.h @@ -64,3 +64,6 @@ extern char *xcoff_solib_address (CORE_ADDR); #define KERNEL_U_SIZE kernel_u_size() extern int kernel_u_size (void); + +/* Flag for machine-specific stuff in shared files. FIXME */ +#define DEPRECATED_IBM6000_TARGET diff --git a/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h index c73658922b..66b2f28d4e 100644 --- a/gdb/config/rs6000/tm-rs6000.h +++ b/gdb/config/rs6000/tm-rs6000.h @@ -90,9 +90,6 @@ extern void aix_process_linenos (void); extern CORE_ADDR init_frame_pc_noop (int fromleaf, struct frame_info *prev); #define DEPRECATED_INIT_FRAME_PC(fromleaf, prev) (init_frame_pc_noop (fromleaf, prev)) -/* Flag for machine-specific stuff in shared files. FIXME */ -#define IBM6000_TARGET - /* RS6000/AIX does not support PT_STEP. Has to be simulated. */ #define SOFTWARE_SINGLE_STEP_P() 1 diff --git a/gdb/exec.c b/gdb/exec.c index 0bde096c7c..468b0ea299 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -242,7 +242,7 @@ exec_file_attach (char *filename, int from_tty) /* FIXME - This should only be run for RS6000, but the ifdef is a poor way to accomplish. */ -#ifdef IBM6000_TARGET +#ifdef DEPRECATED_IBM6000_TARGET /* Setup initial vmap. */ map_vmap (exec_bfd, 0); @@ -254,7 +254,7 @@ exec_file_attach (char *filename, int from_tty) error ("\"%s\": can't find the file sections: %s", scratch_pathname, bfd_errmsg (bfd_get_error ())); } -#endif /* IBM6000_TARGET */ +#endif /* DEPRECATED_IBM6000_TARGET */ if (build_section_table (exec_bfd, &exec_ops.to_sections, &exec_ops.to_sections_end)) diff --git a/gdb/symfile.c b/gdb/symfile.c index b1ff445e19..f9b78ce99c 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -710,7 +710,7 @@ syms_from_objfile (struct objfile *objfile, init_objfile_sect_indices (objfile); } -#ifndef IBM6000_TARGET +#ifndef DEPRECATED_IBM6000_TARGET /* This is a SVR4/SunOS specific hack, I think. In any event, it screws RS/6000. sym_offsets should be doing this sort of thing, because it knows the mapping between bfd sections and @@ -758,7 +758,7 @@ syms_from_objfile (struct objfile *objfile, s->offset += s_addr; } } -#endif /* not IBM6000_TARGET */ +#endif /* not DEPRECATED_IBM6000_TARGET */ (*objfile->sf->sym_read) (objfile, mainline); @@ -1861,7 +1861,7 @@ reread_symbols (void) { if (objfile->obfd) { -#ifdef IBM6000_TARGET +#ifdef DEPRECATED_IBM6000_TARGET /* If this object is from a shared library, then you should stat on the library name, not member name. */ -- 2.11.0