4 files changed, 3 insertions, 11 deletions
diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h
index 34d95ca..e538390 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 d98fc79..d167830 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 728497e..34bc0fe 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 c736589..66b2f28 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