Thu May 21 13:14:25 1998 John Metzler <jmetzler@cygnus.com>

	* gnu-nat.c (init_gnu_ops): Initialization of target ops by assignment.
	(_initialize_gnu_nat):      Call new init
	* mac-nat.c (init_child_ops):          Ditto
	(_initialize_mac_nat):                 Ditto
	* monitor.c (init_base_monitor_ops):   Ditto
	(_initialize_remote_monitors) :        Ditto
	* ppc-bdm.c (init_bdm_ppc_ops):        Ditto
	(_initialize_bdm_ppc):                 Ditto
	* remote-adapt.c ( init_adapt_ops):    Ditto
	(_initialize_remote_adapt):            Ditto
	* remote-array.c (init_array_ops) :    Ditto
	(_initialize_array):                   Ditto
	* remote-bug (init_bug_ops) :          Ditto
	(_initialize_remote_bug):              Ditto
	* remote-e7000.c (init_e7000_ops):     Ditto
	(_initialize_remote_e7000) :           Ditto
	* remote-eb.c (init_eb_ops) :          Ditto
	(_initialize_remote_eb) :              Ditto
	*remote-es.c (init_es1800_ops) :       Ditto
	(init_es1800_child_ops) :              Ditto
	(_initialize_es1800) ;                 Ditto
	*remote-hms.c (init_hms_ops):          Ditto
	(_initialize_remote_hms) :             Ditto
	* remote-mm.c (init_mm_ops):           Ditto
	(_initialize_remote_mm) :              Ditto
	* remote-nindy.c (init_nindy_ops):     Ditto
	(_initialize_nindy):                   Ditto
	* remote_nrom.c (init_nrom_ops) :      Ditto
	(_initialize_remote_nrom) :            Ditto
	*remote-os9k (init_rombug_ops) :       Ditto
	(_initialize_remote_os9k) :            Ditto
	*remote-rdi.c (init_rdi_ops) :         Ditto
	(_initialize_remote_rdi) :             Ditto
	* remote-rdp.c (init_remote_rdp_ops) : Ditto
	(_initialize_remote_rdp) :             Ditto
	* remote-sds.c (init_sds_ops) :        Ditto
	(_initialize_remote_sds) :             Ditto
	* remote-sim.c (init_gdbsim_ops) :     Ditto
	(_initialize_remote_sim) :             Ditto
	* remote-st.c (init_st2000_ops):       Ditto
	(_initialize_remote_st2000):           Ditto
	*remote-udi.c (init_udi_ops) :         Ditto
	(_initialize_remote_udi) :             Ditto
	* remote-vx.c (init_vx_ops) :          Ditto
	(init_vx_run_ops) :                    Ditto
	(_initialize_vx) :                     Ditto
	* remote.c (init_remote_ops):          Ditto
	(init_extended_remote_ops):            Ditto
	(_initialize_remote):                  Ditto
	* sparcl-tdep.c (init_sparclite_ops):  Ditto
	(_initialize_sparcl_tdep):             Ditto
	* v850ice.c (init_850ice_ops):         Ditto
	(_initialize_v850ice):                 Ditto
	*win32-nat.c: (init_child_ops):        Ditto
	(_initialize_inftarg):                 Ditto

1 files changed, 48 insertions, 44 deletions

diff --git a/gdb/v850ice.c b/gdb/v850ice.c
index 43da8e4..5e0ca67 100755
--- a/gdb/v850ice.c
+++ b/gdb/v850ice.c
@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "gdbthread.h"
 #endif
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <windows.h> 
 
 /* Prototypes for local functions */
 
@@ -73,6 +73,8 @@ static int v850ice_remove_breakpoint PARAMS ((CORE_ADDR, char *));
 
 static int ice_open = 0;
 
+static struct target_ops v850ice_ops ;	
+
 #ifndef EXPORT
 #define EXPORT __declspec(dllexport)
 #endif
@@ -151,7 +153,6 @@ EXPORT long __stdcall GdbCallBack (void);
 #define StatHardBreak	10  /* hit hardware breakpoint */
 #define StatFailure	11  /* an error occured in the last run/single */
 
-extern struct target_ops v850ice_ops;	/* Forward decl */
 
 /*   "pir", "tkcw", "chcw", "adtre" */
 
@@ -501,51 +502,54 @@ v850ice_mourn ()
 
 /* Define the target subroutine names */
 
-struct target_ops v850ice_ops = {
-  "ice",			/* to_shortname */
-  "NEC V850 ICE interface",	/* to_longname */
-  "Debug a system controlled by a NEC 850 ICE.", /* to_doc */
-  v850ice_open,			/* to_open */
-  v850ice_close,		/* to_close */
-  NULL,				/* to_attach */
-  v850ice_detach,		/* to_detach */
-  v850ice_resume,		/* to_resume */
-  v850ice_wait,			/* to_wait */
-  v850ice_fetch_registers,	/* to_fetch_registers */
-  v850ice_store_registers,	/* to_store_registers */
-  v850ice_prepare_to_store,	/* to_prepare_to_store */
-  v850ice_xfer_memory,		/* to_xfer_memory */
-  v850ice_files_info,		/* to_files_info */
-  v850ice_insert_breakpoint,	/* to_insert_breakpoint */
-  v850ice_remove_breakpoint,	/* to_remove_breakpoint */
-  NULL,				/* to_terminal_init */
-  NULL,				/* to_terminal_inferior */
-  NULL,				/* to_terminal_ours_for_output */
-  NULL,				/* to_terminal_ours */
-  NULL,				/* to_terminal_info */
-  v850ice_kill,			/* to_kill */
-  generic_load,			/* to_load */
-  NULL,				/* to_lookup_symbol */
-  NULL,				/* to_create_inferior */
-  v850ice_mourn,		/* to_mourn_inferior */
-  0,				/* to_can_run */
-  0,				/* to_notice_signals */
-  NULL,				/* to_thread_alive */
-  0,				/* to_stop */
-  process_stratum,		/* to_stratum */
-  NULL,				/* to_next */
-  1,				/* to_has_all_memory */
-  1,				/* to_has_memory */
-  1,				/* to_has_stack */
-  1,				/* to_has_registers */
-  1,				/* to_has_execution */
-  NULL,				/* sections */
-  NULL,				/* sections_end */
-  OPS_MAGIC			/* to_magic */
-};
+
+static void init_850ice_ops(void)
+{
+  v850ice_ops.to_shortname   =   "ice";		
+  v850ice_ops.to_longname    =   "NEC V850 ICE interface";
+  v850ice_ops.to_doc         =   "Debug a system controlled by a NEC 850 ICE.";
+  v850ice_ops.to_open        =   v850ice_open;		
+  v850ice_ops.to_close       =   v850ice_close;	
+  v850ice_ops.to_attach      =   NULL;		
+  v850ice_ops.to_detach      =   v850ice_detach;	
+  v850ice_ops.to_resume      =   v850ice_resume;	
+  v850ice_ops.to_wait        =   v850ice_wait;	
+  v850ice_ops.to_fetch_registers  =   v850ice_fetch_registers;
+  v850ice_ops.to_store_registers  =   v850ice_store_registers;
+  v850ice_ops.to_prepare_to_store =   v850ice_prepare_to_store;
+  v850ice_ops.to_xfer_memory =   v850ice_xfer_memory;	
+  v850ice_ops.to_files_info  =   v850ice_files_info;	
+  v850ice_ops.to_insert_breakpoint =   v850ice_insert_breakpoint;
+  v850ice_ops.to_remove_breakpoint =   v850ice_remove_breakpoint;
+  v850ice_ops.to_terminal_init    =   NULL;		
+  v850ice_ops.to_terminal_inferior =   NULL;		
+  v850ice_ops.to_terminal_ours_for_output =   NULL;	
+  v850ice_ops.to_terminal_ours   =   NULL;		
+  v850ice_ops.to_terminal_info   =   NULL;		
+  v850ice_ops.to_kill            =   v850ice_kill;		
+  v850ice_ops.to_load            =   generic_load;		
+  v850ice_ops.to_lookup_symbol   =   NULL;		
+  v850ice_ops.to_create_inferior =   NULL;		
+  v850ice_ops.to_mourn_inferior  =   v850ice_mourn;
+  v850ice_ops.to_can_run         =   0;		
+  v850ice_ops.to_notice_signals  =   0;		
+  v850ice_ops.to_thread_alive    =    NULL;	
+  v850ice_ops.to_stop            =   0;			
+  v850ice_ops.to_stratum         =   process_stratum;	
+  v850ice_ops.DONT_USE           =   NULL;		
+  v850ice_ops.to_has_all_memory  =   1;		
+  v850ice_ops.to_has_memory      =   1;		
+  v850ice_ops.to_has_stack       =   1;		
+  v850ice_ops.to_has_registers   =   1;		
+  v850ice_ops.to_has_execution   =   1;		
+  v850ice_ops.to_sections        =   NULL;		
+  v850ice_ops.to_sections_end    =   NULL;		
+  v850ice_ops.to_magic           =   OPS_MAGIC	;
+}
 
 void
 _initialize_v850ice ()
 {
+  init_850ice_ops() ;
   add_target (&v850ice_ops);
 }