Remove sanitized-out Magic Cap support, will never be released

diff --git a/gdb/config/.Sanitize b/gdb/config/.Sanitize
index 6ba56c0..4b36c2f 100644 (file)
--- a/gdb/config/.Sanitize
+++ b/gdb/config/.Sanitize
@@ -15,20 +15,6 @@
 
 Do-first:
 
-gm_files="tm-magic.h"
-
-if ( echo $* | grep keep\-gm > /dev/null ) ; then
-       keep_these_too="${gm_files} ${keep_these_too}"
-       if [ -n "${verbose}" ] ; then
-               echo Keeping ${gm_files}
-       fi
-else
-       lose_these_too="${gm_files} ${lose_these_too}"
-       if [ -n "${verbose}" ] ; then
-               echo Deleting ${gm_files}
-       fi
-fi
-
 tic80_files="tic80"
 
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then

diff --git a/gdb/config/mips/.Sanitize b/gdb/config/mips/.Sanitize
index be1b378..0e3dc69 100644 (file)
--- a/gdb/config/mips/.Sanitize
+++ b/gdb/config/mips/.Sanitize
@@ -114,31 +114,4 @@ tm-r3900l.h
 
 Do-last:
 
-if ( echo $* | grep keep\-gm > /dev/null ) ; then
-       for i in * ; do
-               if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping gm stuff in $i
-                       fi
-               fi
-       done
-else
-       for i in * ; do
-               if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"gm\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-gm/,/end-\sanitize\-gm/d' < $i > new
-                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-                               if [ -n "${verbose}" ] ; then
-                                       echo Caching $i in .Recover...
-                               fi
-                               mv $i .Recover
-                       fi
-                       mv new $i
-               fi
-       done
-fi
-
 # End of file.

diff --git a/gdb/config/mips/tm-embed.h b/gdb/config/mips/tm-embed.h
index 4f82d3f..4a4aa75 100644 (file)
--- a/gdb/config/mips/tm-embed.h
+++ b/gdb/config/mips/tm-embed.h
@@ -44,27 +44,6 @@ int remote_mips_remove_watchpoint PARAMS ((CORE_ADDR addr, int len, int type));
 
 #define STOPPED_BY_WATCHPOINT(w) remote_mips_stopped_by_watchpoint ()
 
-/* start-sanitize-gm */
-#ifdef GENERAL_MAGIC
-
-#include "tm-magic.h"          /* Include generic stuff */
-
-/* For some reason GM can't hack this... */
-
-#undef GET_LONGJMP_TARGET
-
-#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
-       (1 == 1)                /* We allow all types of hardware watchpoints */
-
-#define FLUSH_CACHED_MEMORY() flush_cached_memory()
-
-#else
-/* end-sanitize-gm */
-
 #define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
   remote_mips_can_use_hardware_watchpoint(cnt)
 int remote_mips_can_use_hardware_watchpoint PARAMS ((int cnt));
-
-/* start-sanitize-gm */
-#endif /* GENERAL_MAGIC */
-/* end-sanitize-gm */

diff --git a/gdb/config/mips/tm-irix5.h b/gdb/config/mips/tm-irix5.h
index c8c6a49..d70afd5 100644 (file)
--- a/gdb/config/mips/tm-irix5.h
+++ b/gdb/config/mips/tm-irix5.h
@@ -42,9 +42,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #undef SIGFRAME_FPREGSAVE_OFF
 #define SIGFRAME_FPREGSAVE_OFF (SIGFRAME_BASE + 2 * 4 + 8 + 32 * 8 + 4)
 #define SIGFRAME_REG_SIZE      8
-
-/* start-sanitize-gm */
-#ifdef GENERAL_MAGIC
-#include "tm-magic.h"
-#endif /* GENERAL_MAGIC */
-/* end-sanitize-gm */

diff --git a/gdb/config/mips/tm-r3900.h b/gdb/config/mips/tm-r3900.h
index 17ba87b..47bcfb5 100644 (file)
--- a/gdb/config/mips/tm-r3900.h
+++ b/gdb/config/mips/tm-r3900.h
@@ -22,39 +22,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #undef DEFAULT_MIPS_TYPE
 #define DEFAULT_MIPS_TYPE "r3051"
-
-/* start-sanitize-gm */
-#ifdef GENERAL_MAGIC
-
-#include "tm-magic.h"          /* Include generic stuff */
-
-/* For some reason GM can't hack this... */
-
-#undef GET_LONGJMP_TARGET
-
-/* Watchpoint support */
-
-#define TARGET_HAS_HARDWARE_WATCHPOINTS
-
-#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
-       (1 == 1)        /* We allow all types of hardware watchpoints */
-
-/* Use these macros for watchpoint insertion/deletion.  */
-/* type can be 0: write watch, 1: read watch, 2: access watch (read/write) */
-
-#define target_insert_watchpoint(addr, len, type) \
-       remote_mips_set_watchpoint (addr, len, type)
-
-#define target_remove_watchpoint(addr, len, type) \
-       remote_mips_remove_watchpoint (addr, len, type)
-
-/* We need to remove watchpoints when stepping, else we hit them again! */
-
-#define HAVE_NONSTEPPABLE_WATCHPOINT
-
-#define STOPPED_BY_WATCHPOINT(w) remote_mips_stopped_by_watchpoint ()
-
-#define FLUSH_CACHED_MEMORY() flush_cached_memory()
-
-#endif /* GENERAL_MAGIC */
-/* end-sanitize-gm */

diff --git a/gdb/config/tm-magic.h b/gdb/config/tm-magic.h
deleted file mode 100644 (file)
index db709f4..0000000
--- a/gdb/config/tm-magic.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Definitions for General Magic target.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-
-This file is part of GDB.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "gmagic.h"
-
-#define TARGET_SYMFILE_POSTREAD(OBJFILE) init_magic ()
-
-#define TARGET_CREATE_INFERIOR_HOOK(PID) magic_create_inferior_hook ()
-
-/* Magic Cap method stepping support.
-   We use the shared library trampoline support to implement stepping over
-   the method dispatcher.  We consider the entire dispatcher to be one big
-   trampoline, and use SKIP_TRAMPOLINE_CODE() to skip from a dispatcher
-   entry point to the dispatcher exit site, or from the exit site to the
-   first instruction of the dispatched-to method.  */
-
-#define DYNAMIC_TRAMPOLINE_NEXTPC(pc) \
-       magic_skip_dispatcher(pc)
-
-#if 0
-#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) \
-       magic_in_dispatcher(pc, name)
-
-#define IN_SOLIB_RETURN_TRAMPOLINE(pc, name) \
-       magic_in_dispatcher(pc, name)
-#endif