import gdb-1999-07-07 post reformat

author: Jason Molenda <jsm@bugshack.cygnus.com> 1999-07-07 20:19:36 +0000
committer: Jason Molenda <jsm@bugshack.cygnus.com> 1999-07-07 20:19:36 +0000
commit: a87029ef15e59af2cc0b27cb4024b0db313fa88e (patch)
tree: a5cc2d6f8ebdbbd957642e72e0e88cc5fe5cd2e1 /gdb/config
parent: 528824cc847e5a13831dd41e5aacb34679143c94 (diff)
download: gdb-a87029ef15e59af2cc0b27cb4024b0db313fa88e.tar.gz
300 files changed, 5603 insertions, 5321 deletions
diff --git a/gdb/config/a29k/nm-ultra3.h b/gdb/config/a29k/nm-ultra3.h
index a3bc47452c4..1e3cb0760b2 100644
--- a/gdb/config/a29k/nm-ultra3.h
+++ b/gdb/config/a29k/nm-ultra3.h
@@ -2,21 +2,22 @@
    Copyright (C) 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
    Contributed by David Wood (wood@lab.ultra.nyu.edu).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* If we ever *do* end up using the standard fetch_inferior_registers,
    this is the right value for U_REGS_OFFSET.  */
diff --git a/gdb/config/a29k/tm-a29k.h b/gdb/config/a29k/tm-a29k.h
index 8eb476e3cb2..5d759e79bf5 100644
--- a/gdb/config/a29k/tm-a29k.h
+++ b/gdb/config/a29k/tm-a29k.h
@@ -2,21 +2,22 @@
    Copyright 1990, 1991, 1993, 1994 Free Software Foundation, Inc.
    Contributed by Cygnus Support.  Written by Jim Kingdon.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Parameters for an EB29K (a board which plugs into a PC and is
    accessed through EBMON software running on the PC, which we
@@ -135,7 +136,7 @@ CORE_ADDR a29k_skip_prologue ();
 /*
  * Converts an sdb register number to an internal gdb register number.
  * Currently under epi, gr96->0...gr127->31...lr0->32...lr127->159, or...
- * 		  	gr64->0...gr95->31, lr0->32...lr127->159.
+ *                      gr64->0...gr95->31, lr0->32...lr127->159.
  */
 #define SDB_REG_TO_REGNUM(value) \
   (((value) >= 96 && (value) <= 127) ? ((value) - 96) : \
@@ -148,8 +149,8 @@ CORE_ADDR a29k_skip_prologue ();
  * register sets.  Namely, gcc can compile (-mkernel-registers) so that
  * it uses gr64-gr95 in stead of gr96-gr127.
  */
-#define MSP_HW_REGNUM	125		/* gr125 */
-#define RAB_HW_REGNUM	126		/* gr126 */
+#define MSP_HW_REGNUM	125	/* gr125 */
+#define RAB_HW_REGNUM	126	/* gr126 */
 
 /* Convert Processor Special register #x to REGISTER_NAMES register # */
 #define SR_REGNUM(x) \
@@ -170,7 +171,7 @@ CORE_ADDR a29k_skip_prologue ();
 /* This needs to be the memory stack pointer, not the register stack pointer,
    to make call_function work right.  */
 #define SP_REGNUM MSP_REGNUM
-#define FP_REGNUM 33 /* lr1 */
+#define FP_REGNUM 33		/* lr1 */
 
 /* Return register for transparent calling convention (gr122).  */
 #define TPC_REGNUM (122 - 96 + GR96_REGNUM)
@@ -207,8 +208,8 @@ CORE_ADDR a29k_skip_prologue ();
 #define RBP_REGNUM (VAB_REGNUM + 7)
 #define TMC_REGNUM (VAB_REGNUM + 8)
 #define TMR_REGNUM (VAB_REGNUM + 9)
-#define NPC_REGNUM (VAB_REGNUM + 10)  /* pc0 */
-#define PC_REGNUM  (VAB_REGNUM + 11)  /* pc1 */
+#define NPC_REGNUM (VAB_REGNUM + 10)	/* pc0 */
+#define PC_REGNUM  (VAB_REGNUM + 11)	/* pc1 */
 #define PC2_REGNUM (VAB_REGNUM + 12)
 #define MMU_REGNUM (VAB_REGNUM + 13)
 #define LRU_REGNUM (VAB_REGNUM + 14)
@@ -223,7 +224,7 @@ CORE_ADDR a29k_skip_prologue ();
 #define IPA_REGNUM (VAB_REGNUM + 22)
 #define IPB_REGNUM (VAB_REGNUM + 23)
 
-#endif	/* !defined(REGISTER_NAMES) */
+#endif /* !defined(REGISTER_NAMES) */
 
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.  */
@@ -309,8 +310,7 @@ extern use_struct_convention_fn a29k_use_struct_convention;
     write_register_bytes (REGISTER_BYTE (RETURN_REGNUM), (char *)(VALBUF),  \
 			  TYPE_LENGTH (TYPE));				  \
   }
-
-/* *INDENT-OFF* */
+/* *INDENT-OFF* */
 /* The a29k user's guide documents well what the stacks look like.
    But what isn't so clear there is how this interracts with the
    symbols, or with GDB.
@@ -321,10 +321,10 @@ extern use_struct_convention_fn a29k_use_struct_convention;
    alloca()), the result of the calculation msp + msize.
 
    LOC_ARG, LOC_LOCAL - For GCC, these are relative to saved_msp.
-     For high C, these are relative to msp (making alloca impossible).
+   For high C, these are relative to msp (making alloca impossible).
    LOC_REGISTER, LOC_REGPARM - The register number is the number at the
-     time the function is running (after the prologue), or in the case
-     of LOC_REGPARM, may be a register number in the range 160-175.
+   time the function is running (after the prologue), or in the case
+   of LOC_REGPARM, may be a register number in the range 160-175.
 
    The compilers do things like store an argument into memory, and then put out
    a LOC_ARG for it, or put it into global registers and put out a
@@ -349,74 +349,75 @@ extern use_struct_convention_fn a29k_use_struct_convention;
    registers need to be filled in the function epilogue.
 
    Consider the code:
-              < call bar>
-       	loc1: . . .
-        bar:  sub gr1,gr1,rsize_b
-	      . . .
-	      add mfp,msp,0
-	      sub msp,msp,msize_b
-	      . . .
-	      < call foo >
-	loc2: . . .
-        foo:  sub gr1,gr1,rsize_f
-	      . . .
-	      add mfp,msp,0
-	      sub msp,msp,msize_f
-	      . . .
-        loc3: < suppose the inferior stops here >
-
-                   memory stack      register stack
-		   |           |     |____________|
-		   |           |     |____loc1____|
-	  +------->|___________|     |            |   ^
-	  |        | ^         |     |  locals_b  |   |
-	  |        | |         |     |____________|   |
-	  |        | |         |     |            |   | rsize_b
-	  |        | | msize_b |     | args_to_f  |   |
-	  |        | |         |     |____________|   |
-	  |        | |         |     |____lr1_____|   V
-	  |        | V         |     |____loc2____|<----------------+
-	  |   +--->|___________|<---------mfp     |   ^             |
-	  |   |    | ^         |     |  locals_f  |   |             |
-	  |   |    | | msize_f |     |____________|   |             |
-	  |   |    | |         |     |            |   | rsize_f     |
-	  |   |    | V         |     |   args     |   |             |
-	  |   |    |___________|<msp |____________|   |             |
-	  |   |                      |_____lr1____|   V             |
-	  |   |                      |___garbage__| <- gr1 <----+   |
- 	  |   |                 		                |   |
-          |   |                 		                |   |
-	  |   |	       	       	     pc=loc3	                |   |
-	  |   |         		      	                |   |
-	  |   |         		      	                |   |
-	  |   |            frame cache	      	                |   |
-          |   |       |_________________|     	                |   |
-          |   |       |rsize=rsize_b    |     	                |   |
-          |   |       |msize=msize_b    |     	                |   |
-          +---|--------saved_msp        |     	                |   |
-              |       |frame------------------------------------|---+
-              |       |pc=loc2          |                       |
-              |       |_________________|                       |
-              |       |rsize=rsize_f    |                       |
-              |       |msize=msize_f    |                       |
-              +--------saved_msp        |                       |
-                      |frame------------------------------------+
-                      |pc=loc3          |
-                      |_________________|
+   < call bar>
+   loc1: . . .
+   bar:  sub gr1,gr1,rsize_b
+   . . .
+   add mfp,msp,0
+   sub msp,msp,msize_b
+   . . .
+   < call foo >
+   loc2: . . .
+   foo:  sub gr1,gr1,rsize_f
+   . . .
+   add mfp,msp,0
+   sub msp,msp,msize_f
+   . . .
+   loc3: < suppose the inferior stops here >
+
+   memory stack      register stack
+   |           |     |____________|
+   |           |     |____loc1____|
+   +------->|___________|     |            |   ^
+   |        | ^         |     |  locals_b  |   |
+   |        | |         |     |____________|   |
+   |        | |         |     |            |   | rsize_b
+   |        | | msize_b |     | args_to_f  |   |
+   |        | |         |     |____________|   |
+   |        | |         |     |____lr1_____|   V
+   |        | V         |     |____loc2____|<----------------+
+   |   +--->|___________|<---------mfp     |   ^             |
+   |   |    | ^         |     |  locals_f  |   |             |
+   |   |    | | msize_f |     |____________|   |             |
+   |   |    | |         |     |            |   | rsize_f     |
+   |   |    | V         |     |   args     |   |             |
+   |   |    |___________|<msp |____________|   |             |
+   |   |                      |_____lr1____|   V             |
+   |   |                      |___garbage__| <- gr1 <----+   |
+   |   |                                                |   |
+   |   |                                                |   |
+   |   |                             pc=loc3                    |   |
+   |   |                                                |   |
+   |   |                                                |   |
+   |   |            frame cache                         |   |
+   |   |       |_________________|                      |   |
+   |   |       |rsize=rsize_b    |                      |   |
+   |   |       |msize=msize_b    |                      |   |
+   +---|--------saved_msp        |                      |   |
+   |       |frame------------------------------------|---+
+   |       |pc=loc2          |                       |
+   |       |_________________|                       |
+   |       |rsize=rsize_f    |                       |
+   |       |msize=msize_f    |                       |
+   +--------saved_msp        |                       |
+   |frame------------------------------------+
+   |pc=loc3          |
+   |_________________|
 
    So, is that sufficiently confusing?  Welcome to the 29000.
    Notes:
    * The frame for foo uses a memory frame pointer but the frame for
-     bar does not.  In the latter case the saved_msp is
-     computed by adding msize to the saved_msp of the
-     next frame.
+   bar does not.  In the latter case the saved_msp is
+   computed by adding msize to the saved_msp of the
+   next frame.
    * msize is in the frame cache only for high C's sake.  */
 /* *INDENT-ON* */
 
+
 void read_register_stack ();
 long read_register_stack_integer ();
 
-#define FRAME_INIT_SAVED_REGS(fi) /*no-op*/
+#define FRAME_INIT_SAVED_REGS(fi)	/*no-op */
 
 #define EXTRA_FRAME_INFO  \
   CORE_ADDR saved_msp;    \
@@ -436,8 +437,8 @@ void init_extra_frame_info ();
 
 #define INIT_FRAME_PC(fromleaf, fci) init_frame_pc(fromleaf, fci)
 void init_frame_pc ();
-
 
+
 /* FRAME_CHAIN takes a FRAME
    and produces the frame's chain-pointer.
 
@@ -510,7 +511,7 @@ extern CORE_ADDR frame_locals_address ();
 enum lval_type;
 struct frame_info;
 #endif
-void a29k_get_saved_register PARAMS ((char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lvalp));
+void a29k_get_saved_register PARAMS ((char *raw_buffer, int *optimized, CORE_ADDR * addrp, struct frame_info * frame, int regnum, enum lval_type * lvalp));
 #define GET_SAVED_REGISTER(raw_buffer, optimized, addrp, frame, regnum, lval) \
       a29k_get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval)
 
@@ -567,6 +568,8 @@ void a29k_get_saved_register PARAMS ((char *raw_buffer, int *optimized, CORE_ADD
    retaddr_dummy:  This points to a breakpoint instruction in the dummy.  */
 /* *INDENT-ON* */
 
+
+
 /* Rsize for dummy frame, in bytes.  */
 
 /* Bytes for outgoing args, lr1, and retaddr.  */
@@ -603,14 +606,14 @@ extern void pop_frame ();
    mtsrim cr, 15
    loadm 0, 0, lr2, msp     ; load first 16 words of arguments into registers
    add msp, msp, 16 * 4     ; point to the remaining arguments
- CONST_INSN:
-   const lr0,inf		; (replaced by       half of target addr)
-   consth lr0,inf		; (replaced by other half of target addr)
+   CONST_INSN:
+   const lr0,inf                ; (replaced by       half of target addr)
+   consth lr0,inf               ; (replaced by other half of target addr)
    calli lr0, lr0 
    aseq 0x40,gr1,gr1   ; nop
- BREAKPT_INSN:
-   asneq 0x50,gr1,gr1  ; breakpoint	(replaced by local breakpoint insn)
-   */
+   BREAKPT_INSN:
+   asneq 0x50,gr1,gr1  ; breakpoint     (replaced by local breakpoint insn)
+ */
 
 #if TARGET_BYTE_ORDER == HOST_BYTE_ORDER
 #define BS(const)	const
@@ -635,7 +638,7 @@ extern void pop_frame ();
 		BS(0x72500101)}
 #define CALL_DUMMY_LENGTH (8 * 4)
 
-#define CALL_DUMMY_START_OFFSET 0  /* Start execution at beginning of dummy */
+#define CALL_DUMMY_START_OFFSET 0	/* Start execution at beginning of dummy */
 
 /* Helper macro for FIX_CALL_DUMMY.  WORDP is a long * which points to a
    word in target byte order; bits 0-7 and 16-23 of *WORDP are replaced with
@@ -650,9 +653,9 @@ extern void pop_frame ();
 #else /* Target is little endian.  */
 #define STUFF_I16(WORDP, DATA) \
   {
-    *(char *)(WORDP) = ((DATA) & 0xff);
-    *((char *)(WORDP) + 2) = (((DATA) >> 8) & 0xff);
-  }
+*(char *) (WORDP) = ((DATA) & 0xff);
+*((char *) (WORDP) + 2) = (((DATA) >> 8) & 0xff);
+}
 #endif /* Target is little endian.  */
 
 /* Insert the specified number of args and function address
@@ -696,7 +699,8 @@ extern void pop_frame ();
 	         (num), SYMBOL_SOURCE_NAME (sym)), (num)	\
 	   : (num))
 
-extern enum a29k_processor_types {
+extern enum a29k_processor_types
+{
   a29k_unknown,
 
   /* Bit 0x400 of the CPS does *not* identify freeze mode, i.e. 29000,
@@ -705,7 +709,8 @@ extern enum a29k_processor_types {
 
   /* Bit 0x400 of the CPS does identify freeze mode, i.e. 29050.  */
   a29k_freeze_mode
-} processor_type;
+}
+processor_type;
 
 /* We need three arguments for a general frame specification for the
    "frame" or "info frame" command.  */
diff --git a/gdb/config/a29k/tm-ultra3.h b/gdb/config/a29k/tm-ultra3.h
index 8b96210e475..d7314bfbe12 100644
--- a/gdb/config/a29k/tm-ultra3.h
+++ b/gdb/config/a29k/tm-ultra3.h
@@ -1,22 +1,23 @@
 /* Parameters for NYU Ultracomputer 29000 target, for GDB, the GNU debugger.
    Copyright 1990, 1991 Free Software Foundation, Inc.
    Contributed by David Wood @ New York University (wood@nyu.edu). 
-   
-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 file is part of GDB.
 
-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.
+   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.
 
-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.  */
+   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.  */
 
 /* This file includes tm-a29k.h, but predefines REGISTER_NAMES and
    related macros.  The file supports a a29k running our flavor of
@@ -28,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Initializer for an array of names of registers.
    There should be NUM_REGS strings in this initializer.
  */
-#define NUM_REGS   (EXO_REGNUM + 1)	
+#define NUM_REGS   (EXO_REGNUM + 1)
 
 #define REGISTER_NAMES { 						 \
  "gr1",									 \
@@ -62,14 +63,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
 #ifdef KERNEL_DEBUGGING
-# define	PADDR_U_REGNUM	22		/* gr86 */
-# define	RETURN_REGNUM	GR64_REGNUM	
+#define	PADDR_U_REGNUM	22	/* gr86 */
+#define	RETURN_REGNUM	GR64_REGNUM
 #else
-# define	RETURN_REGNUM	GR96_REGNUM	
-#endif	/* KERNEL_DEBUGGING */
+#define	RETURN_REGNUM	GR96_REGNUM
+#endif /* KERNEL_DEBUGGING */
 
 
-/* Should rename all GR96_REGNUM to RETURN_REGNUM */ 
+/* Should rename all GR96_REGNUM to RETURN_REGNUM */
 #define GR1_REGNUM 	(0)
 #define GR64_REGNUM	1
 #define GR96_REGNUM 	(GR64_REGNUM + 32)
@@ -90,41 +91,41 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define RFB_REGNUM (127 - 96 + RETURN_REGNUM)
 /* Register Stack Pointer.  */
 #define RSP_REGNUM GR1_REGNUM
-#define LR0_REGNUM ( 32 +  GR96_REGNUM) 
+#define LR0_REGNUM ( 32 +  GR96_REGNUM)
 
 /* Protected Special registers */
 #define VAB_REGNUM (LR0_REGNUM +  128)
-#define OPS_REGNUM (VAB_REGNUM + 1)  
-#define CPS_REGNUM (VAB_REGNUM + 2)  
-#define CFG_REGNUM (VAB_REGNUM + 3)  
-#define CHA_REGNUM (VAB_REGNUM + 4)  
-#define CHD_REGNUM (VAB_REGNUM + 5)  
-#define CHC_REGNUM (VAB_REGNUM + 6)  
-#define RBP_REGNUM (VAB_REGNUM + 7)  
-#define TMC_REGNUM (VAB_REGNUM + 8)  
-#define TMR_REGNUM (VAB_REGNUM + 9)  
+#define OPS_REGNUM (VAB_REGNUM + 1)
+#define CPS_REGNUM (VAB_REGNUM + 2)
+#define CFG_REGNUM (VAB_REGNUM + 3)
+#define CHA_REGNUM (VAB_REGNUM + 4)
+#define CHD_REGNUM (VAB_REGNUM + 5)
+#define CHC_REGNUM (VAB_REGNUM + 6)
+#define RBP_REGNUM (VAB_REGNUM + 7)
+#define TMC_REGNUM (VAB_REGNUM + 8)
+#define TMR_REGNUM (VAB_REGNUM + 9)
 #define NPC_REGNUM (VAB_REGNUM + 10)	/* pc0 */
-#define PC_REGNUM  (VAB_REGNUM + 11)  	/* pc1 */
-#define PC2_REGNUM (VAB_REGNUM + 12)  	/* pc2 */
+#define PC_REGNUM  (VAB_REGNUM + 11)	/* pc1 */
+#define PC2_REGNUM (VAB_REGNUM + 12)	/* pc2 */
 #define MMU_REGNUM (VAB_REGNUM + 13)
 #define LRU_REGNUM (VAB_REGNUM + 14)
 	/* Register sequence gap */
 /* Unprotected Special registers */
-#define IPC_REGNUM (LRU_REGNUM + 1) 
-#define IPA_REGNUM (IPC_REGNUM + 1) 
-#define IPB_REGNUM (IPC_REGNUM + 2) 
-#define Q_REGNUM   (IPC_REGNUM + 3) 
-#define ALU_REGNUM (IPC_REGNUM + 4) 
+#define IPC_REGNUM (LRU_REGNUM + 1)
+#define IPA_REGNUM (IPC_REGNUM + 1)
+#define IPB_REGNUM (IPC_REGNUM + 2)
+#define Q_REGNUM   (IPC_REGNUM + 3)
+#define ALU_REGNUM (IPC_REGNUM + 4)
 #define PS_REGNUM  ALU_REGNUM
-#define BP_REGNUM  (IPC_REGNUM + 5) 
-#define FC_REGNUM  (IPC_REGNUM + 6) 
-#define CR_REGNUM  (IPC_REGNUM + 7) 
+#define BP_REGNUM  (IPC_REGNUM + 5)
+#define FC_REGNUM  (IPC_REGNUM + 6)
+#define CR_REGNUM  (IPC_REGNUM + 7)
 	/* Register sequence gap */
-#define FPE_REGNUM (CR_REGNUM  + 1) 
-#define INT_REGNUM (FPE_REGNUM + 1) 
-#define FPS_REGNUM (FPE_REGNUM + 2) 
+#define FPE_REGNUM (CR_REGNUM  + 1)
+#define INT_REGNUM (FPE_REGNUM + 1)
+#define FPS_REGNUM (FPE_REGNUM + 2)
 	/* Register sequence gap */
-#define EXO_REGNUM (FPS_REGNUM + 1) 
+#define EXO_REGNUM (FPS_REGNUM + 1)
 
 /* Special register #x.  */
 #define SR_REGNUM(x) \
@@ -160,7 +161,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /*
  * Converts an sdb register number to an internal gdb register number.
  * Currently under gcc, gr96->0...gr128->31...lr0->32...lr127->159, or...
- * 		  	gr64->0...gr95->31, lr0->32...lr127->159.
+ *                      gr64->0...gr95->31, lr0->32...lr127->159.
  */
 #define SDB_REG_TO_REGNUM(value) (((value)<32) ? ((value)+RETURN_REGNUM) : \
 		 		                 ((value)-32+LR0_REGNUM))
@@ -168,7 +169,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifdef KERNEL_DEBUGGING
   /* ublock virtual address as defined in our sys/param.h */
   /* FIXME: Should get this from sys/param.h */
-# define UVADDR	((32*0x100000)-8192)    
+#define UVADDR	((32*0x100000)-8192)
 #endif
 
 /*
@@ -177,11 +178,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
  */
 #if !defined(KERNEL_DEBUGGING)
 #ifdef SYM1
-# define IN_SIGTRAMP(pc, name) (name && STREQ ("sigtramp", name))
+#define IN_SIGTRAMP(pc, name) (name && STREQ ("sigtramp", name))
 #else
-        Need to define IN_SIGTRAMP() for sym2.
+Need to define
+IN_SIGTRAMP () for sym2.
 #endif
-#endif /* !KERNEL_DEBUGGING */
+#endif				/* !KERNEL_DEBUGGING */
 
 #include "a29k/tm-a29k.h"
 
@@ -191,36 +193,35 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    mtsrim cr, 15
    loadm 0, 0, lr2, msp     ; load first 16 words of arguments into registers
    add msp, msp, 16 * 4     ; point to the remaining arguments
-  CONST_INSN:
+   CONST_INSN:
    const gr96,inf
    consth gr96,inf
    calli lr0, gr96
    aseq 0x40,gr1,gr1   ; nop
    asneq 0x50,gr1,gr1  ; breakpoint
    When KERNEL_DEBUGGIN is defined, msp -> gr93, gr96 -> gr64,
-                                    7d  -> 5d,    60  -> 40
-   */
+   7d  -> 5d,    60  -> 40
+ */
 
 /* Position of the "const" instruction within CALL_DUMMY in bytes.  */
 #undef CALL_DUMMY
 #if TARGET_BYTE_ORDER == HOST_BYTE_ORDER
-#ifdef KERNEL_DEBUGGING /* gr96 -> gr64 */
-#  define CALL_DUMMY {0x0400870f, 0x3600825d, 0x155d5d40, 0x03ff40ff,    \
+#ifdef KERNEL_DEBUGGING		/* gr96 -> gr64 */
+#define CALL_DUMMY {0x0400870f, 0x3600825d, 0x155d5d40, 0x03ff40ff,    \
                     0x02ff40ff, 0xc8008040, 0x70400101, 0x72500101}
 #else
-#  define CALL_DUMMY {0x0400870f, 0x3600827d, 0x157d7d40, 0x03ff60ff,    \
+#define CALL_DUMMY {0x0400870f, 0x3600827d, 0x157d7d40, 0x03ff60ff,    \
                     0x02ff60ff, 0xc8008060, 0x70400101, 0x72500101}
-#endif /* KERNEL_DEBUGGING */
-#else /* Byte order differs.  */
-  you lose
-#endif /* Byte order differs.  */
+#endif				/* KERNEL_DEBUGGING */
+#else				/* Byte order differs.  */
+you lose
+#endif				/* Byte order differs.  */
 
 #if !defined(KERNEL_DEBUGGING)
-# ifdef SYM1
-#  undef  DECR_PC_AFTER_BREAK
-#  define DECR_PC_AFTER_BREAK 0	/* Sym1 kernel does the decrement */
-# else
-    ->"ULTRA3 running other than sym1 OS"!;
-# endif
+#ifdef SYM1
+#undef  DECR_PC_AFTER_BREAK
+#define DECR_PC_AFTER_BREAK 0	/* Sym1 kernel does the decrement */
+#else
+->"ULTRA3 running other than sym1 OS" !;
+#endif
 #endif /* !KERNEL_DEBUGGING */
-
diff --git a/gdb/config/a29k/tm-vx29k.h b/gdb/config/a29k/tm-vx29k.h
index 140df051682..5d9866f349e 100644
--- a/gdb/config/a29k/tm-vx29k.h
+++ b/gdb/config/a29k/tm-vx29k.h
@@ -2,21 +2,22 @@
    Copyright 1994, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "a29k/tm-a29k.h"
 #include "tm-vxworks.h"
@@ -68,9 +69,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    want the inferior to stop after the function call has completed.
    call_function_by_hand () sets a breakpoint here (via CALL_DUMMY_BREAK_SET),
    which POP_FRAME later deletes (via CALL_DUMMY_BREAK_DELETE).  */
- 
+
 #define CALL_DUMMY_STOP_OFFSET (7 * 4)
- 
+
 /* The offset of the first instruction of the CALL_DUMMY code fragment
    relative to the frame pointer for a dummy frame.  This is equal to
    the size of the CALL_DUMMY plus the arg_slop area size (see the diagram
@@ -118,12 +119,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    frame pointer in the dummy frame.
 
    NOTE: in the both of the following definitions, we take advantage of
-	 knowledge of the implementation of the target breakpoint operation,
-	 in that we pass a null pointer as the second argument.  It seems
-	 reasonable to assume that any target requiring the use of 
-	 CALL_DUMMY_BREAK_{SET,DELETE} will not store the breakpoint
-	 shadow contents in GDB; in any case, this assumption is vaild
-	 for all VxWorks-related targets.  */
+   knowledge of the implementation of the target breakpoint operation,
+   in that we pass a null pointer as the second argument.  It seems
+   reasonable to assume that any target requiring the use of 
+   CALL_DUMMY_BREAK_{SET,DELETE} will not store the breakpoint
+   shadow contents in GDB; in any case, this assumption is vaild
+   for all VxWorks-related targets.  */
 
 #define CALL_DUMMY_BREAK_SET(call_dummy_addr) \
   target_insert_breakpoint ((call_dummy_addr) + CALL_DUMMY_STOP_OFFSET, \
@@ -146,7 +147,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    the CALL_DUMMY handling for all targets (at least, a clean solution
    would probably require this).  Arguably, this should go in "tm-29k.h"
    rather than here.  */
-   
+
 #define STRUCT_VAL_ARGS_UNSUPPORTED
 
 #define BKPT_OFFSET	(7 * 4)
@@ -159,16 +160,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
     STUFF_I16((char *)dummyname + CONST_INSN + 4, fun >> 16);\
     *(int *)((char *)dummyname + BKPT_OFFSET) = BKPT_INSTR;\
   }
-
 
+
 /* Offsets into jmp_buf.  They are derived from VxWorks' REG_SET struct
    (see VxWorks' setjmp.h). Note that Sun2, Sun3 and SunOS4 and VxWorks have
    different REG_SET structs, hence different layouts for the jmp_buf struct.
    Only JB_PC is needed for getting the saved PC value.  */
 
-#define JB_ELEMENT_SIZE 4       /* size of each element in jmp_buf */
+#define JB_ELEMENT_SIZE 4	/* size of each element in jmp_buf */
 #define JB_PC		3	/* offset of pc (pc1) in jmp_buf */
- 
+
 /* Figure out where the longjmp will land.  We expect that we have just entered
    longjmp and haven't yet setup the stack frame, so the args are still in the
    output regs.  lr2 (LR2_REGNUM) points at the jmp_buf structure from which we
@@ -179,14 +180,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 extern int get_longjmp_target PARAMS ((CORE_ADDR *));
 
 /* VxWorks adjusts the PC after a breakpoint has been hit.  */
- 
+
 #undef DECR_PC_AFTER_BREAK
 #define DECR_PC_AFTER_BREAK 0
 
 /* Do whatever promotions are appropriate on a value being returned
    from a function.  VAL is the user-supplied value, and FUNC_TYPE
    is the return type of the function if known, else 0.
- 
+
    For the Am29k, as far as I understand, if the function return type is known,
    cast the value to that type; otherwise, ensure that integer return values
    fill all of gr96.
@@ -195,7 +196,7 @@ extern int get_longjmp_target PARAMS ((CORE_ADDR *));
    to most Am29K-based systems; but once moved into that file, it might
    need to be redefined for all Am29K-based targets that also redefine
    STORE_RETURN_VALUE.  For now, to be safe, we define it here.  */
- 
+
 #define PROMOTE_RETURN_VALUE(val, func_type) \
   do {                                                                  \
       if (func_type)                                                    \
diff --git a/gdb/config/a29k/xm-ultra3.h b/gdb/config/a29k/xm-ultra3.h
index ec0b1081cf2..b2773e31e53 100644
--- a/gdb/config/a29k/xm-ultra3.h
+++ b/gdb/config/a29k/xm-ultra3.h
@@ -2,21 +2,22 @@
    Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
    Contributed by David Wood (wood@lab.ultra.nyu.edu).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Here at NYU we have what we call an ULTRA3 PE board.  So
    ifdefs for ULTRA3 are my doing.  At this point in time,
@@ -27,22 +28,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define HAVE_WAIT_STRUCT
 
 #ifndef L_SET
-# define L_SET   0 /* set the seek pointer */
-# define L_INCR  1 /* increment the seek pointer */
-# define L_XTND  2 /* extend the file size */
+#define L_SET   0		/* set the seek pointer */
+#define L_INCR  1		/* increment the seek pointer */
+#define L_XTND  2		/* extend the file size */
 #endif
 
 #ifndef O_RDONLY
-# define O_RDONLY 0
-# define O_WRONLY 1
-# define O_RDWR	  2
+#define O_RDONLY 0
+#define O_WRONLY 1
+#define O_RDWR	  2
 #endif
 
 #ifndef F_OK
-# define R_OK 4
-# define W_OK 2
-# define X_OK 1
-# define F_OK 0
+#define R_OK 4
+#define W_OK 2
+#define X_OK 1
+#define F_OK 0
 #endif
 
 /* System doesn't provide siginterrupt().  */
diff --git a/gdb/config/alpha/nm-linux.h b/gdb/config/alpha/nm-linux.h
index 1c167306422..99df5c681e0 100644
--- a/gdb/config/alpha/nm-linux.h
+++ b/gdb/config/alpha/nm-linux.h
@@ -1,21 +1,22 @@
 /* Native definitions for alpha running Linux.
    Copyright (C) 1993, 1994 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.  */
+   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.  */
 
 /* Figure out where the longjmp will land.  We expect that we have just entered
    longjmp and haven't yet setup the stack frame, so the args are still in the
diff --git a/gdb/config/alpha/nm-osf.h b/gdb/config/alpha/nm-osf.h
index e06140d95a4..df0030a2761 100644
--- a/gdb/config/alpha/nm-osf.h
+++ b/gdb/config/alpha/nm-osf.h
@@ -1,21 +1,22 @@
 /* Native definitions for alpha running OSF/1.
    Copyright (C) 1993, 1994 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.  */
+   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.  */
 
 /* Figure out where the longjmp will land.  We expect that we have just entered
    longjmp and haven't yet setup the stack frame, so the args are still in the
diff --git a/gdb/config/alpha/nm-osf2.h b/gdb/config/alpha/nm-osf2.h
index 01725efd5ce..dfbff819681 100644
--- a/gdb/config/alpha/nm-osf2.h
+++ b/gdb/config/alpha/nm-osf2.h
@@ -1,21 +1,22 @@
 /* Native definitions for alpha running OSF/1-2.x, using procfs.
    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.  */
+   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.  */
 
 /* Get generic OSF/1 definitions.  */
 #include "alpha/nm-osf.h"
diff --git a/gdb/config/alpha/nm-osf3.h b/gdb/config/alpha/nm-osf3.h
index a1871a68136..4a6118a478c 100644
--- a/gdb/config/alpha/nm-osf3.h
+++ b/gdb/config/alpha/nm-osf3.h
@@ -1,21 +1,22 @@
 /* Native definitions for alpha running OSF/1-3.x and higher, using procfs.
    Copyright (C) 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* OSF/1-3.x fixes some OSF/1-2.x procfs peculiarities and adds
    a new one.  */
diff --git a/gdb/config/alpha/tm-alpha.h b/gdb/config/alpha/tm-alpha.h
index bbfd2d846e0..aaa2a825725 100644
--- a/gdb/config/alpha/tm-alpha.h
+++ b/gdb/config/alpha/tm-alpha.h
@@ -2,21 +2,22 @@
    also used by the Alpha/Netware and Alpha/Linux targets.
    Copyright 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_ALPHA_H
 #define TM_ALPHA_H
@@ -69,7 +70,7 @@ extern CORE_ADDR alpha_skip_prologue PARAMS ((CORE_ADDR addr, int lenient));
 
 #define SAVED_PC_AFTER_CALL(frame)	alpha_saved_pc_after_call(frame)
 extern CORE_ADDR
-alpha_saved_pc_after_call PARAMS ((struct frame_info *));
+  alpha_saved_pc_after_call PARAMS ((struct frame_info *));
 
 /* Are we currently handling a signal ?  */
 
@@ -79,7 +80,7 @@ alpha_saved_pc_after_call PARAMS ((struct frame_info *));
 
 #define INNER_THAN(lhs,rhs) ((lhs) < (rhs))
 
-#define BREAKPOINT {0x80, 0, 0, 0} /* call_pal bpt */
+#define BREAKPOINT {0x80, 0, 0, 0}	/* call_pal bpt */
 
 /* Amount PC must be decremented by after a breakpoint.
    This is often the number of bytes in BREAKPOINT
@@ -130,8 +131,8 @@ alpha_saved_pc_after_call PARAMS ((struct frame_info *));
 #define SP_REGNUM 30		/* Contains address of top of stack */
 #define RA_REGNUM 26		/* Contains return address value */
 #define ZERO_REGNUM 31		/* Read-only register, always 0 */
-#define FP0_REGNUM 32           /* Floating point register 0 */
-#define FPA0_REGNUM 48          /* First float arg during a subr call */
+#define FP0_REGNUM 32		/* Floating point register 0 */
+#define FPA0_REGNUM 48		/* First float arg during a subr call */
 #define FPCR_REGNUM 63		/* Floating point control register */
 #define PC_REGNUM 64		/* Contains program counter */
 #define FP_REGNUM 65		/* Virtual frame pointer */
@@ -172,10 +173,10 @@ alpha_saved_pc_after_call PARAMS ((struct frame_info *));
    from raw format to virtual format.
    The alpha needs a conversion between register and memory format if
    the register is a floating point register and
-      memory format is float, as the register format must be double
+   memory format is float, as the register format must be double
    or
-      memory format is an integer with 4 bytes or less, as the representation
-      of integers in floating point registers is different. */
+   memory format is an integer with 4 bytes or less, as the representation
+   of integers in floating point registers is different. */
 
 #define REGISTER_CONVERTIBLE(N) ((N) >= FP0_REGNUM && (N) < FP0_REGNUM + 31)
 
@@ -205,7 +206,8 @@ alpha_register_convert_to_raw PARAMS ((struct type *, int, char *, char *));
 /* Store the address of the place in which to copy the structure the
    subroutine will return.  Handled by alpha_push_arguments.  */
 
-#define STORE_STRUCT_RETURN(addr, sp)	/**/
+#define STORE_STRUCT_RETURN(addr, sp)
+/**/
 
 /* Extract from an array REGBUF containing the (raw) register state
    a function return value of type TYPE, and copy that, in virtual format,
@@ -238,8 +240,8 @@ alpha_store_return_value PARAMS ((struct type *, char *));
 
 /* Structures are returned by ref in extra arg0 */
 #define USE_STRUCT_CONVENTION(gcc_p, type)	1
-
 
+
 /* Describe the pointer in each stack frame to the previous stack frame
    (its caller).  */
 
@@ -262,7 +264,7 @@ extern CORE_ADDR alpha_frame_chain PARAMS ((struct frame_info *));
 
 #define FRAME_SAVED_PC(FRAME)	(alpha_frame_saved_pc(FRAME))
 extern CORE_ADDR
-alpha_frame_saved_pc PARAMS ((struct frame_info *));
+  alpha_frame_saved_pc PARAMS ((struct frame_info *));
 
 /* The alpha has two different virtual pointers for arguments and locals.
 
@@ -306,14 +308,14 @@ extern void alpha_find_saved_regs PARAMS ((struct frame_info *));
       alpha_find_saved_regs (frame_info); \
     (frame_info)->saved_regs[SP_REGNUM] = (frame_info)->frame; \
   } while (0)
-
 
+
 /* Things needed for making the inferior call functions.  */
 
 #define PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) \
   (alpha_push_arguments((nargs), (args), (sp), (struct_return), (struct_addr)))
 extern CORE_ADDR
-alpha_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int, CORE_ADDR));
+  alpha_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int, CORE_ADDR));
 
 /* Push an empty stack frame, to record the current PC, etc.  */
 
@@ -366,7 +368,7 @@ extern CORE_ADDR alpha_call_dummy_address PARAMS ((void));
 /* There's a mess in stack frame creation.  See comments in blockframe.c
    near reference to INIT_FRAME_PC_FIRST.  */
 
-#define	INIT_FRAME_PC(fromleaf, prev) /* nada */
+#define	INIT_FRAME_PC(fromleaf, prev)	/* nada */
 
 #define INIT_FRAME_PC_FIRST(fromleaf, prev) \
   (prev)->pc = ((fromleaf) ? SAVED_PC_AFTER_CALL ((prev)->next) : \
@@ -382,10 +384,12 @@ extern void ecoff_relocate_efi PARAMS ((struct symbol *, CORE_ADDR));
    This overlays the ALPHA's PDR records, 
    alpharead.c (ab)uses this to save memory */
 
-typedef struct alpha_extra_func_info {
-	long	numargs;	/* number of args to procedure (was iopt) */
-	PDR	pdr;		/* Procedure descriptor record */
-} *alpha_extra_func_info_t;
+typedef struct alpha_extra_func_info
+  {
+    long numargs;		/* number of args to procedure (was iopt) */
+    PDR pdr;			/* Procedure descriptor record */
+  }
+ *alpha_extra_func_info_t;
 
 /* Define the extra_func_info that mipsread.c needs.
    FIXME: We should define our own PDR interface, perhaps in a separate
diff --git a/gdb/config/alpha/tm-alphalinux.h b/gdb/config/alpha/tm-alphalinux.h
index d836a7054c8..313667e7828 100644
--- a/gdb/config/alpha/tm-alphalinux.h
+++ b/gdb/config/alpha/tm-alphalinux.h
@@ -2,21 +2,22 @@
    definitions here are used when the _target_ system is running Linux.
    Copyright 1996 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.  */
+   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.  */
 
 #ifndef TM_LINUXALPHA_H
 #define TM_LINUXALPHA_H
diff --git a/gdb/config/alpha/xm-alphalinux.h b/gdb/config/alpha/xm-alphalinux.h
index fb4316b44f5..d72378b15f8 100644
--- a/gdb/config/alpha/xm-alphalinux.h
+++ b/gdb/config/alpha/xm-alphalinux.h
@@ -1,21 +1,22 @@
 /* Host definitions for GDB running on an Alpha under Linux
    Copyright (C) 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #if !defined (HOST_BYTE_ORDER)
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
diff --git a/gdb/config/alpha/xm-alphaosf.h b/gdb/config/alpha/xm-alphaosf.h
index e143538a23d..2b8f4894266 100644
--- a/gdb/config/alpha/xm-alphaosf.h
+++ b/gdb/config/alpha/xm-alphaosf.h
@@ -1,21 +1,22 @@
 /* Host definitions for GDB running on an alpha under OSF/1
    Copyright (C) 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #if !defined (HOST_BYTE_ORDER)
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
diff --git a/gdb/config/arc/tm-arc.h b/gdb/config/arc/tm-arc.h
index 6eb5d81139e..90949e36921 100644
--- a/gdb/config/arc/tm-arc.h
+++ b/gdb/config/arc/tm-arc.h
@@ -2,21 +2,22 @@
    Copyright (C) 1995 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Used by arc-tdep.c to set the default cpu type.  */
 #define DEFAULT_ARC_CPU_TYPE "base"
@@ -116,15 +117,15 @@ extern void arc_software_single_step PARAMS ((unsigned int, int));
 /* Register numbers of various important registers (used to index
    into arrays of register names and register values).  */
 
-#define R0_REGNUM   0	   /* First local register		*/
-#define R59_REGNUM 59	   /* Last local register		*/
-#define FP_REGNUM  27	   /* Contains address of executing stack frame */
-#define SP_REGNUM  28      /* stack pointer */
-#define BLINK_REGNUM 31    /* link register */
-#define	STA_REGNUM 61	   /* processor status word */
-#define PC_REGNUM  91	   /* instruction pointer */
-#define AUX_BEG_REGNUM  61 /* aux reg begins */
-#define AUX_END_REGNUM  90 /* aux reg ends, pc not real aux reg */
+#define R0_REGNUM   0		/* First local register           */
+#define R59_REGNUM 59		/* Last local register            */
+#define FP_REGNUM  27		/* Contains address of executing stack frame */
+#define SP_REGNUM  28		/* stack pointer */
+#define BLINK_REGNUM 31		/* link register */
+#define	STA_REGNUM 61		/* processor status word */
+#define PC_REGNUM  91		/* instruction pointer */
+#define AUX_BEG_REGNUM  61	/* aux reg begins */
+#define AUX_END_REGNUM  90	/* aux reg ends, pc not real aux reg */
 
 /* Fake registers used to mark immediate data.  */
 #define SHIMM_FLAG_REGNUM 61
@@ -158,8 +159,8 @@ extern void arc_software_single_step PARAMS ((unsigned int, int));
       0 \
     } \
 }
-   
-#define PFP_REGNUM R0_REGNUM	/* Previous frame pointer	*/
+
+#define PFP_REGNUM R0_REGNUM	/* Previous frame pointer */
 
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.  */
@@ -184,8 +185,8 @@ extern void arc_software_single_step PARAMS ((unsigned int, int));
 /* Return the GDB type object for the "standard" data type
    of data in register N.  */
 #define REGISTER_VIRTUAL_TYPE(N) (builtin_type_int)
-
 
+
 /* Macros for understanding function return values... */
 
 /* Does the specified function use the "struct returning" convention
@@ -207,7 +208,7 @@ extern void arc_software_single_step PARAMS ((unsigned int, int));
    a function return value of type TYPE, and copy that, in virtual format,
    into VALBUF.  This is only called if USE_STRUCT_CONVENTION for this
    type is 0.
-*/
+ */
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
 	memcpy(VALBUF, REGBUF+REGISTER_BYTE(R0_REGNUM), TYPE_LENGTH (TYPE))
 
@@ -228,8 +229,8 @@ extern void arc_software_single_step PARAMS ((unsigned int, int));
    subroutine will return.  This is called from call_function. */
 #define STORE_STRUCT_RETURN(ADDR, SP) \
     error ("Returning values from functions is not implemented in arc gdb")
-
 
+
 /* Describe the pointer in each stack frame to the previous stack frame
    (its caller).  */
 
@@ -275,7 +276,7 @@ extern void arc_software_single_step PARAMS ((unsigned int, int));
    A leaf function may never save blink, so we have to check for that here.  */
 
 #define FRAME_SAVED_PC(frame) (arc_frame_saved_pc (frame))
-struct frame_info; /* in case frame.h not included yet */
+struct frame_info;		/* in case frame.h not included yet */
 CORE_ADDR arc_frame_saved_pc PARAMS ((struct frame_info *));
 
 /* If the argument is on the stack, it will be here.
@@ -304,9 +305,9 @@ CORE_ADDR arc_frame_saved_pc PARAMS ((struct frame_info *));
 
 #define FRAME_FIND_SAVED_REGS(frame_info_addr, sr) \
 	frame_find_saved_regs (frame_info_addr, &sr)
-extern void frame_find_saved_regs();		/* See arc-tdep.c */
-
+extern void frame_find_saved_regs ();	/* See arc-tdep.c */
 
+
 /* Things needed for making calls to functions in the inferior process */
 #define PUSH_DUMMY_FRAME \
 	push_dummy_frame ()
@@ -316,14 +317,14 @@ extern void frame_find_saved_regs();		/* See arc-tdep.c */
 	pop_frame ()
 
 /* This sequence of words is the instructions  bl xxxx, flag 1 */
-#define CALL_DUMMY { 0x28000000, 0x1fbe8001 }   
+#define CALL_DUMMY { 0x28000000, 0x1fbe8001 }
 #define CALL_DUMMY_LENGTH 8
 
 /* Start execution at beginning of dummy */
-#define CALL_DUMMY_START_OFFSET 0 
+#define CALL_DUMMY_START_OFFSET 0
 
 /* Insert the specified number of args and function address
-   into a call sequence of the above form stored at 'dummyname'.*/  
+   into a call sequence of the above form stored at 'dummyname'. */
 #define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p) \
 { \
         int from, to, delta, loc; \
@@ -336,4 +337,3 @@ extern void frame_find_saved_regs();		/* See arc-tdep.c */
         *((char *)(dummyname) + 3) = ((delta >> 9) & 0xff); \
         *((char *)(dummyname) + 4) = ((delta >> 17) & 0x7); \
 }
-
diff --git a/gdb/config/arm/nm-arm.h b/gdb/config/arm/nm-arm.h
index 970a885363f..45ef76c3288 100644
--- a/gdb/config/arm/nm-arm.h
+++ b/gdb/config/arm/nm-arm.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on an ARM under RISCiX (4.3bsd).
    Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This is the amount to subtract from u.u_ar0
    to get the offset in the core file of the register values.  */
diff --git a/gdb/config/arm/tm-arm.h b/gdb/config/arm/tm-arm.h
index cc3a27f66c4..8a3553ff622 100644
--- a/gdb/config/arm/tm-arm.h
+++ b/gdb/config/arm/tm-arm.h
@@ -1,23 +1,24 @@
 /* Definitions to make GDB target for an ARM
    Copyright 1986-1989, 1991, 1993-1999 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
-#ifdef __STDC__		/* Forward decls for prototypes */
+#ifdef __STDC__			/* Forward decls for prototypes */
 struct type;
 struct value;
 #endif
@@ -199,7 +200,7 @@ extern char **arm_register_names;
 
 /* Largest value REGISTER_RAW_SIZE can have.  */
 
-#define MAX_REGISTER_RAW_SIZE 12 
+#define MAX_REGISTER_RAW_SIZE 12
 
 /* Largest value REGISTER_VIRTUAL_SIZE can have.  */
 
@@ -275,8 +276,8 @@ extern use_struct_convention_fn arm_use_struct_convention;
    lexical context are listed after the beginning LBRAC instead of
    before in the executables list of symbols.  */
 #define VARIABLES_INSIDE_BLOCK(desc, gcc_p) (!(gcc_p))
-
 
+
 /* Define other aspects of the stack frame. 
    We keep the offsets of all saved registers, 'cause we need 'em a lot!
    We also keep the current size of the stack frame, and the offset of
@@ -289,7 +290,7 @@ extern use_struct_convention_fn arm_use_struct_convention;
   int frameoffset;		\
   int framereg;
 
-extern void arm_init_extra_frame_info PARAMS ((struct frame_info *fi));
+extern void arm_init_extra_frame_info PARAMS ((struct frame_info * fi));
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) arm_init_extra_frame_info (fi)
 
 /* Return the frame address.  On ARM, it is R11; on Thumb it is R7.  */
@@ -315,7 +316,7 @@ extern int arm_frame_chain_valid PARAMS ((CORE_ADDR, struct frame_info *));
 
 /* An expression that tells us whether the function invocation represented
    by FI does not have a frame on the stack associated with it. */
-extern int arm_frameless_function_invocation PARAMS ((struct frame_info *frame));
+extern int arm_frameless_function_invocation PARAMS ((struct frame_info * frame));
 #define FRAMELESS_FUNCTION_INVOCATION(FI) (arm_frameless_function_invocation (FI))
 
 /* Saved Pc.  */
@@ -344,13 +345,13 @@ extern CORE_ADDR arm_frame_saved_pc PARAMS ((struct frame_info *));
 
 struct frame_saved_regs;
 struct frame_info;
-void frame_find_saved_regs PARAMS((struct frame_info *fi,
-				   struct frame_saved_regs *fsr));
+void frame_find_saved_regs PARAMS ((struct frame_info * fi,
+				    struct frame_saved_regs * fsr));
 
 #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs) \
  arm_frame_find_saved_regs (frame_info, &(frame_saved_regs));
-
 
+
 /* Things needed for making the inferior call functions.  */
 
 #define PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) \
@@ -371,15 +372,15 @@ void arm_pop_frame PARAMS ((void));
 
 /* This sequence of words is the instructions
 
-     mov 	lr,pc
-     mov	pc,r4
-     illegal
+   mov  lr,pc
+   mov  pc,r4
+   illegal
 
    Note this is 12 bytes.  */
 
 #define CALL_DUMMY {0xe1a0e00f, 0xe1a0f004, 0xE7FFDEFE}
 
-#define CALL_DUMMY_START_OFFSET 0  /* Start execution at beginning of dummy */
+#define CALL_DUMMY_START_OFFSET 0	/* Start execution at beginning of dummy */
 
 #define CALL_DUMMY_BREAKPOINT_OFFSET arm_call_dummy_breakpoint_offset()
 extern int arm_call_dummy_breakpoint_offset PARAMS ((void));
@@ -391,15 +392,15 @@ extern int arm_call_dummy_breakpoint_offset PARAMS ((void));
    arm_fix_call_dummy (dummyname, pc, fun, nargs, args, type, gcc_p)
 
 void arm_fix_call_dummy PARAMS ((char *dummy, CORE_ADDR pc, CORE_ADDR fun,
-				 int nargs, struct value **args,
-				 struct type *type, int gcc_p));
+				 int nargs, struct value ** args,
+				 struct type * type, int gcc_p));
 
 CORE_ADDR arm_get_next_pc PARAMS ((CORE_ADDR));
 
 /* Functions for dealing with Thumb call thunks.  */
 #define IN_SOLIB_CALL_TRAMPOLINE(pc, name)	arm_in_call_stub (pc, name)
 #define SKIP_TRAMPOLINE_CODE(pc)		arm_skip_stub (pc)
-extern int arm_in_call_stub PARAMS ((CORE_ADDR pc,  char *name));
+extern int arm_in_call_stub PARAMS ((CORE_ADDR pc, char *name));
 extern CORE_ADDR arm_skip_stub PARAMS ((CORE_ADDR pc));
 
 /* Function to determine whether MEMADDR is in a Thumb function.  */
@@ -414,18 +415,18 @@ extern int arm_pc_is_thumb_dummy PARAMS ((bfd_vma memaddr));
    "info" field is used for this purpose. This field is already
    being used to store the symbol size, so the assumption is
    that the symbol size cannot exceed 2^31.
- 
+
    COFF_MAKE_MSYMBOL_SPECIAL
-   ELF_MAKE_MSYMBOL_SPECIAL	tests whether the COFF or ELF symbol corresponds 
-                        to a thumb function, and sets a "special" bit in a
-                        minimal symbol to indicate that it does
-   MSYMBOL_SET_SPECIAL	actually sets the "special" bit
+   ELF_MAKE_MSYMBOL_SPECIAL     tests whether the COFF or ELF symbol corresponds 
+   to a thumb function, and sets a "special" bit in a
+   minimal symbol to indicate that it does
+   MSYMBOL_SET_SPECIAL  actually sets the "special" bit
    MSYMBOL_IS_SPECIAL   tests the "special" bit in a minimal symbol
    MSYMBOL_SIZE         returns the size of the minimal symbol, i.e.
-                        the "info" field with the "special" bit masked out
-*/
- 
-extern int coff_sym_is_thumb(int val);
+   the "info" field with the "special" bit masked out
+ */
+
+extern int coff_sym_is_thumb (int val);
 #define MSYMBOL_SET_SPECIAL(msym) \
     MSYMBOL_INFO (msym) = (char *) (((long) MSYMBOL_INFO (msym)) | 0x80000000)
 #define MSYMBOL_IS_SPECIAL(msym) \
@@ -437,7 +438,7 @@ extern int coff_sym_is_thumb(int val);
 #define ELF_MAKE_MSYMBOL_SPECIAL(sym,msym) \
  { if(ELF_ST_TYPE(((elf_symbol_type *)(sym))->internal_elf_sym.st_info) == STT_LOPROC) \
 	MSYMBOL_SET_SPECIAL(msym); }
-  
+
 #define COFF_MAKE_MSYMBOL_SPECIAL(val,msym) \
  { if(coff_sym_is_thumb(val)) MSYMBOL_SET_SPECIAL(msym); }
 
diff --git a/gdb/config/arm/xm-arm.h b/gdb/config/arm/xm-arm.h
index 34c0bd376b5..d73095a3eee 100644
--- a/gdb/config/arm/xm-arm.h
+++ b/gdb/config/arm/xm-arm.h
@@ -1,25 +1,26 @@
 /* Definitions to make GDB run on an ARM under RISCiX (4.3bsd).
    Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
-
 
+
 #if 0
 /* Interface definitions for kernel debugger KDB.  */
 
diff --git a/gdb/config/convex/tm-convex.h b/gdb/config/convex/tm-convex.h
index 953f767c044..f41b72695b2 100644
--- a/gdb/config/convex/tm-convex.h
+++ b/gdb/config/convex/tm-convex.h
@@ -44,12 +44,12 @@
 /* OBSOLETE /* Advance PC across any function entry prologue instructions */
 /* OBSOLETE    to reach some "real" code. */
 /* OBSOLETE    Convex prolog is: */
-/* OBSOLETE        [sub.w #-,sp]		in one of 3 possible sizes */
-/* OBSOLETE        [mov psw,-		fc/vc main program prolog */
-/* OBSOLETE         and #-,-		  (skip it because the "mov psw" saves the */
-/* OBSOLETE 	mov -,psw]		   T bit, so continue gets a surprise trap) */
-/* OBSOLETE        [and #-,sp]		fc/vc O2 main program prolog */
-/* OBSOLETE        [ld.- -(ap),-]		pcc/gcc register arg loads */
+/* OBSOLETE        [sub.w #-,sp]                in one of 3 possible sizes */
+/* OBSOLETE        [mov psw,-           fc/vc main program prolog */
+/* OBSOLETE         and #-,-              (skip it because the "mov psw" saves the */
+/* OBSOLETE     mov -,psw]                 T bit, so continue gets a surprise trap) */
+/* OBSOLETE        [and #-,sp]          fc/vc O2 main program prolog */
+/* OBSOLETE        [ld.- -(ap),-]               pcc/gcc register arg loads */
 /* OBSOLETE *x/ */
 /* OBSOLETE  */
 /* OBSOLETE extern CORE_ADDR convex_skip_prologue PARAMS ((CORE_ADDR pc)); */
@@ -78,9 +78,9 @@
 /* OBSOLETE  */
 /* OBSOLETE /* We need to manipulate trap bits in the psw *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define PSW_TRAP_FLAGS	0x69670000 */
-/* OBSOLETE #define PSW_T_BIT	0x08000000 */
-/* OBSOLETE #define PSW_S_BIT	0x01000000 */
+/* OBSOLETE #define PSW_TRAP_FLAGS      0x69670000 */
+/* OBSOLETE #define PSW_T_BIT   0x08000000 */
+/* OBSOLETE #define PSW_S_BIT   0x01000000 */
 /* OBSOLETE  */
 /* OBSOLETE /* Stack grows downward.  *x/ */
 /* OBSOLETE  */
@@ -112,8 +112,8 @@
 /* OBSOLETE    There should be NUM_REGS strings in this initializer.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define REGISTER_NAMES {"pc","psw","fp","ap","a5","a4","a3","a2","a1","sp",\ */
-/* OBSOLETE 			"s7","s6","s5","s4","s3","s2","s1","s0",\ */
-/* OBSOLETE 			"S7","S6","S5","S4","S3","S2","S1","S0"} */
+/* OBSOLETE                     "s7","s6","s5","s4","s3","s2","s1","s0",\ */
+/* OBSOLETE                     "S7","S6","S5","S4","S3","S2","S1","S0"} */
 /* OBSOLETE  */
 /* OBSOLETE /* Register numbers of various important registers. */
 /* OBSOLETE    Note that some of these values are "real" register numbers, */
@@ -122,17 +122,17 @@
 /* OBSOLETE    to be actual register numbers as far as the user is concerned */
 /* OBSOLETE    but do serve to get the desired values when passed to read_register.  *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define S0_REGNUM 25		/* the real S regs *x/ */
+/* OBSOLETE #define S0_REGNUM 25                /* the real S regs *x/ */
 /* OBSOLETE #define S7_REGNUM 18 */
-/* OBSOLETE #define s0_REGNUM 17		/* low-order halves of S regs *x/ */
+/* OBSOLETE #define s0_REGNUM 17                /* low-order halves of S regs *x/ */
 /* OBSOLETE #define s7_REGNUM 10 */
-/* OBSOLETE #define SP_REGNUM 9 		/* A regs *x/ */
+/* OBSOLETE #define SP_REGNUM 9                 /* A regs *x/ */
 /* OBSOLETE #define A1_REGNUM 8 */
 /* OBSOLETE #define A5_REGNUM 4 */
 /* OBSOLETE #define AP_REGNUM 3 */
-/* OBSOLETE #define FP_REGNUM 2		/* Contains address of executing stack frame *x/ */
-/* OBSOLETE #define PS_REGNUM 1		/* Contains processor status *x/ */
-/* OBSOLETE #define PC_REGNUM 0		/* Contains program counter *x/ */
+/* OBSOLETE #define FP_REGNUM 2         /* Contains address of executing stack frame *x/ */
+/* OBSOLETE #define PS_REGNUM 1         /* Contains processor status *x/ */
+/* OBSOLETE #define PC_REGNUM 0         /* Contains program counter *x/ */
 /* OBSOLETE  */
 /* OBSOLETE /* convert dbx stab register number (from `r' declaration) to a gdb REGNUM *x/ */
 /* OBSOLETE  */
@@ -158,8 +158,8 @@
 /* OBSOLETE    NB: must match structure of struct syscall_context for correct operation *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define REGISTER_BYTE(N) ((N) < s7_REGNUM ? 4*(N) : \ */
-/* OBSOLETE 			  (N) < S7_REGNUM ? 44 + 8 * ((N)-s7_REGNUM) : \ */
-/* OBSOLETE 			                    40 + 8 * ((N)-S7_REGNUM)) */
+/* OBSOLETE                       (N) < S7_REGNUM ? 44 + 8 * ((N)-s7_REGNUM) : \ */
+/* OBSOLETE                                         40 + 8 * ((N)-S7_REGNUM)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Number of bytes of storage in the actual machine representation */
 /* OBSOLETE    for register N. *x/ */
@@ -197,8 +197,8 @@
 /* OBSOLETE  */
 /* OBSOLETE #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \ */
 /* OBSOLETE   memcpy (VALBUF, &((char *) REGBUF) [REGISTER_BYTE (S0_REGNUM) + \ */
-/* OBSOLETE 			     8 - TYPE_LENGTH (TYPE)],\ */
-/* OBSOLETE 	 TYPE_LENGTH (TYPE)) */
+/* OBSOLETE                          8 - TYPE_LENGTH (TYPE)],\ */
+/* OBSOLETE      TYPE_LENGTH (TYPE)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Write into appropriate registers a function return value */
 /* OBSOLETE    of type TYPE, given in virtual format.  *x/ */
@@ -258,7 +258,7 @@
 /* OBSOLETE /* We need the boundaries of the text in the exec file, as a kludge, */
 /* OBSOLETE    for FRAMELESS_FUNCTION_INVOCATION and CALL_DUMMY_LOCATION. *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define	NEED_TEXT_START_END 1 */
+/* OBSOLETE #define     NEED_TEXT_START_END 1 */
 /* OBSOLETE  */
 /* OBSOLETE /* An expression that tells us whether the function invocation represented */
 /* OBSOLETE    by FI does not have a frame on the stack associated with it. */
@@ -298,132 +298,132 @@
 /* OBSOLETE    random load as a saved register; this is harmless.  vc does not */
 /* OBSOLETE    declare its register allocation actions in the stabs.  *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)		\ */
-/* OBSOLETE { register int regnum;							\ */
-/* OBSOLETE   register int frame_length =	/* 3 short, 2 long, 1 extended, 0 context *x/\ */
-/* OBSOLETE       (read_memory_integer ((frame_info)->frame + 4, 4) >> 25) & 3;	\ */
-/* OBSOLETE   register CORE_ADDR frame_fp =						\ */
-/* OBSOLETE       read_memory_integer ((frame_info)->frame + 8, 4);			\ */
-/* OBSOLETE   register CORE_ADDR next_addr;						\ */
-/* OBSOLETE   memset (&frame_saved_regs, '\0', sizeof frame_saved_regs);			\ */
-/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 0;		\ */
-/* OBSOLETE   (frame_saved_regs).regs[PS_REGNUM] = (frame_info)->frame + 4;		\ */
-/* OBSOLETE   (frame_saved_regs).regs[FP_REGNUM] = (frame_info)->frame + 8;		\ */
-/* OBSOLETE   (frame_saved_regs).regs[AP_REGNUM] = frame_fp + 12;			\ */
-/* OBSOLETE   next_addr = (frame_info)->frame + 12;					\ */
-/* OBSOLETE   if (frame_length < 3)							\ */
-/* OBSOLETE     for (regnum = A5_REGNUM; regnum < SP_REGNUM; ++regnum)		\ */
-/* OBSOLETE       (frame_saved_regs).regs[regnum] = (next_addr += 4);		\ */
-/* OBSOLETE   if (frame_length < 2)							\ */
-/* OBSOLETE     (frame_saved_regs).regs[SP_REGNUM] = (next_addr += 4);		\ */
-/* OBSOLETE   next_addr -= 4;							\ */
-/* OBSOLETE   if (frame_length < 3)							\ */
-/* OBSOLETE     for (regnum = S7_REGNUM; regnum < S0_REGNUM; ++regnum)		\ */
-/* OBSOLETE       (frame_saved_regs).regs[regnum] = (next_addr += 8);		\ */
-/* OBSOLETE   if (frame_length < 2)							\ */
-/* OBSOLETE     (frame_saved_regs).regs[S0_REGNUM] = (next_addr += 8);		\ */
-/* OBSOLETE   else									\ */
-/* OBSOLETE     (frame_saved_regs).regs[SP_REGNUM] = next_addr + 8;			\ */
-/* OBSOLETE   if (frame_length == 3) {						\ */
-/* OBSOLETE     CORE_ADDR pc = read_memory_integer ((frame_info)->frame, 4);	\ */
-/* OBSOLETE     int op, ix, disp;							\ */
-/* OBSOLETE     op = read_memory_integer (pc, 2);					\ */
-/* OBSOLETE     if ((op & 0xffc7) == 0x1480) pc += 4; 	/* add.w #-,sp *x/	\ */
-/* OBSOLETE     else if ((op & 0xffc7) == 0x58c0) pc += 2;	/* add.w #-,sp *x/	\ */
-/* OBSOLETE     op = read_memory_integer (pc, 2);					\ */
-/* OBSOLETE     if ((op & 0xffc7) == 0x2a06) pc += 4;	/* ld.w -,ap *x/		\ */
-/* OBSOLETE     for (;;) {								\ */
-/* OBSOLETE       op = read_memory_integer (pc, 2);					\ */
-/* OBSOLETE       ix = (op >> 3) & 7;						\ */
-/* OBSOLETE       if ((op & 0xfcc0) == 0x2800) {		/* ld.- -,ak *x/		\ */
-/* OBSOLETE         regnum = SP_REGNUM - (op & 7);					\ */
-/* OBSOLETE 	disp = read_memory_integer (pc + 2, 2);				\ */
-/* OBSOLETE 	pc += 4;}							\ */
-/* OBSOLETE       else if ((op & 0xfcc0) == 0x2840) {	/* ld.- -,ak *x/		\ */
-/* OBSOLETE         regnum = SP_REGNUM - (op & 7);					\ */
-/* OBSOLETE 	disp = read_memory_integer (pc + 2, 4);				\ */
-/* OBSOLETE 	pc += 6;}							\ */
-/* OBSOLETE       if ((op & 0xfcc0) == 0x3000) {		/* ld.- -,sk *x/		\ */
-/* OBSOLETE         regnum = S0_REGNUM - (op & 7);					\ */
-/* OBSOLETE 	disp = read_memory_integer (pc + 2, 2);				\ */
-/* OBSOLETE 	pc += 4;}							\ */
-/* OBSOLETE       else if ((op & 0xfcc0) == 0x3040) {	/* ld.- -,sk *x/		\ */
-/* OBSOLETE         regnum = S0_REGNUM - (op & 7);					\ */
-/* OBSOLETE 	disp = read_memory_integer (pc + 2, 4);				\ */
-/* OBSOLETE 	pc += 6;}							\ */
-/* OBSOLETE       else if ((op & 0xff00) == 0x7100) {	/* br crossjump *x/	\ */
-/* OBSOLETE         pc += 2 * (char) op;						\ */
-/* OBSOLETE         continue;}							\ */
-/* OBSOLETE       else if (op == 0x0140) {			/* jmp crossjump *x/	\ */
-/* OBSOLETE         pc = read_memory_integer (pc + 2, 4);				\ */
-/* OBSOLETE         continue;}							\ */
-/* OBSOLETE       else break;							\ */
-/* OBSOLETE       if ((frame_saved_regs).regs[regnum])				\ */
-/* OBSOLETE 	break;								\ */
-/* OBSOLETE       if (ix == 7) disp += frame_fp;					\ */
-/* OBSOLETE       else if (ix == 6) disp += read_memory_integer (frame_fp + 12, 4);	\ */
-/* OBSOLETE       else if (ix != 0) break;						\ */
-/* OBSOLETE       (frame_saved_regs).regs[regnum] =					\ */
-/* OBSOLETE 	disp - 8 + (1 << ((op >> 8) & 3));				\ */
-/* OBSOLETE       if (regnum >= S7_REGNUM)						\ */
-/* OBSOLETE         (frame_saved_regs).regs[regnum - S0_REGNUM + s0_REGNUM] =	\ */
-/* OBSOLETE 	  disp - 4 + (1 << ((op >> 8) & 3));				\ */
-/* OBSOLETE     }									\ */
-/* OBSOLETE   }									\ */
+/* OBSOLETE #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)         \ */
+/* OBSOLETE { register int regnum;                                                      \ */
+/* OBSOLETE   register int frame_length =       /* 3 short, 2 long, 1 extended, 0 context *x/\ */
+/* OBSOLETE       (read_memory_integer ((frame_info)->frame + 4, 4) >> 25) & 3; \ */
+/* OBSOLETE   register CORE_ADDR frame_fp =                                             \ */
+/* OBSOLETE       read_memory_integer ((frame_info)->frame + 8, 4);                     \ */
+/* OBSOLETE   register CORE_ADDR next_addr;                                             \ */
+/* OBSOLETE   memset (&frame_saved_regs, '\0', sizeof frame_saved_regs);                        \ */
+/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 0;             \ */
+/* OBSOLETE   (frame_saved_regs).regs[PS_REGNUM] = (frame_info)->frame + 4;             \ */
+/* OBSOLETE   (frame_saved_regs).regs[FP_REGNUM] = (frame_info)->frame + 8;             \ */
+/* OBSOLETE   (frame_saved_regs).regs[AP_REGNUM] = frame_fp + 12;                       \ */
+/* OBSOLETE   next_addr = (frame_info)->frame + 12;                                     \ */
+/* OBSOLETE   if (frame_length < 3)                                                     \ */
+/* OBSOLETE     for (regnum = A5_REGNUM; regnum < SP_REGNUM; ++regnum)          \ */
+/* OBSOLETE       (frame_saved_regs).regs[regnum] = (next_addr += 4);           \ */
+/* OBSOLETE   if (frame_length < 2)                                                     \ */
+/* OBSOLETE     (frame_saved_regs).regs[SP_REGNUM] = (next_addr += 4);          \ */
+/* OBSOLETE   next_addr -= 4;                                                   \ */
+/* OBSOLETE   if (frame_length < 3)                                                     \ */
+/* OBSOLETE     for (regnum = S7_REGNUM; regnum < S0_REGNUM; ++regnum)          \ */
+/* OBSOLETE       (frame_saved_regs).regs[regnum] = (next_addr += 8);           \ */
+/* OBSOLETE   if (frame_length < 2)                                                     \ */
+/* OBSOLETE     (frame_saved_regs).regs[S0_REGNUM] = (next_addr += 8);          \ */
+/* OBSOLETE   else                                                                      \ */
+/* OBSOLETE     (frame_saved_regs).regs[SP_REGNUM] = next_addr + 8;                     \ */
+/* OBSOLETE   if (frame_length == 3) {                                          \ */
+/* OBSOLETE     CORE_ADDR pc = read_memory_integer ((frame_info)->frame, 4);    \ */
+/* OBSOLETE     int op, ix, disp;                                                       \ */
+/* OBSOLETE     op = read_memory_integer (pc, 2);                                       \ */
+/* OBSOLETE     if ((op & 0xffc7) == 0x1480) pc += 4;   /* add.w #-,sp *x/      \ */
+/* OBSOLETE     else if ((op & 0xffc7) == 0x58c0) pc += 2;      /* add.w #-,sp *x/      \ */
+/* OBSOLETE     op = read_memory_integer (pc, 2);                                       \ */
+/* OBSOLETE     if ((op & 0xffc7) == 0x2a06) pc += 4;   /* ld.w -,ap *x/                \ */
+/* OBSOLETE     for (;;) {                                                              \ */
+/* OBSOLETE       op = read_memory_integer (pc, 2);                                     \ */
+/* OBSOLETE       ix = (op >> 3) & 7;                                           \ */
+/* OBSOLETE       if ((op & 0xfcc0) == 0x2800) {                /* ld.- -,ak *x/                \ */
+/* OBSOLETE         regnum = SP_REGNUM - (op & 7);                                      \ */
+/* OBSOLETE     disp = read_memory_integer (pc + 2, 2);                         \ */
+/* OBSOLETE     pc += 4;}                                                       \ */
+/* OBSOLETE       else if ((op & 0xfcc0) == 0x2840) {   /* ld.- -,ak *x/                \ */
+/* OBSOLETE         regnum = SP_REGNUM - (op & 7);                                      \ */
+/* OBSOLETE     disp = read_memory_integer (pc + 2, 4);                         \ */
+/* OBSOLETE     pc += 6;}                                                       \ */
+/* OBSOLETE       if ((op & 0xfcc0) == 0x3000) {                /* ld.- -,sk *x/                \ */
+/* OBSOLETE         regnum = S0_REGNUM - (op & 7);                                      \ */
+/* OBSOLETE     disp = read_memory_integer (pc + 2, 2);                         \ */
+/* OBSOLETE     pc += 4;}                                                       \ */
+/* OBSOLETE       else if ((op & 0xfcc0) == 0x3040) {   /* ld.- -,sk *x/                \ */
+/* OBSOLETE         regnum = S0_REGNUM - (op & 7);                                      \ */
+/* OBSOLETE     disp = read_memory_integer (pc + 2, 4);                         \ */
+/* OBSOLETE     pc += 6;}                                                       \ */
+/* OBSOLETE       else if ((op & 0xff00) == 0x7100) {   /* br crossjump *x/     \ */
+/* OBSOLETE         pc += 2 * (char) op;                                                \ */
+/* OBSOLETE         continue;}                                                  \ */
+/* OBSOLETE       else if (op == 0x0140) {                      /* jmp crossjump *x/    \ */
+/* OBSOLETE         pc = read_memory_integer (pc + 2, 4);                               \ */
+/* OBSOLETE         continue;}                                                  \ */
+/* OBSOLETE       else break;                                                   \ */
+/* OBSOLETE       if ((frame_saved_regs).regs[regnum])                          \ */
+/* OBSOLETE     break;                                                          \ */
+/* OBSOLETE       if (ix == 7) disp += frame_fp;                                        \ */
+/* OBSOLETE       else if (ix == 6) disp += read_memory_integer (frame_fp + 12, 4);     \ */
+/* OBSOLETE       else if (ix != 0) break;                                              \ */
+/* OBSOLETE       (frame_saved_regs).regs[regnum] =                                     \ */
+/* OBSOLETE     disp - 8 + (1 << ((op >> 8) & 3));                              \ */
+/* OBSOLETE       if (regnum >= S7_REGNUM)                                              \ */
+/* OBSOLETE         (frame_saved_regs).regs[regnum - S0_REGNUM + s0_REGNUM] =   \ */
+/* OBSOLETE       disp - 4 + (1 << ((op >> 8) & 3));                            \ */
+/* OBSOLETE     }                                                                       \ */
+/* OBSOLETE   }                                                                 \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* Things needed for making the inferior call functions.  *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define	CALL_DUMMY_LOCATION	BEFORE_TEXT_END */
+/* OBSOLETE #define     CALL_DUMMY_LOCATION     BEFORE_TEXT_END */
 /* OBSOLETE  */
 /* OBSOLETE /* Push an empty stack frame, to record the current PC, etc.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define PUSH_DUMMY_FRAME \ */
-/* OBSOLETE { register CORE_ADDR sp = read_register (SP_REGNUM);			\ */
-/* OBSOLETE   register int regnum;				    			\ */
-/* OBSOLETE   char buf[8];					    			\ */
-/* OBSOLETE   long word;								\ */
-/* OBSOLETE   for (regnum = S0_REGNUM; regnum >= S7_REGNUM; --regnum) { 		\ */
-/* OBSOLETE     read_register_bytes (REGISTER_BYTE (regnum), buf, 8); 		\ */
-/* OBSOLETE     sp = push_bytes (sp, buf, 8);}		    			\ */
-/* OBSOLETE   for (regnum = SP_REGNUM; regnum >= FP_REGNUM; --regnum) { 		\ */
-/* OBSOLETE     word = read_register (regnum);					\ */
-/* OBSOLETE     sp = push_bytes (sp, &word, 4);}   					\ */
-/* OBSOLETE   word = (read_register (PS_REGNUM) &~ (3<<25)) | (1<<25);		\ */
-/* OBSOLETE   sp = push_bytes (sp, &word, 4); 					\ */
-/* OBSOLETE   word = read_register (PC_REGNUM);					\ */
-/* OBSOLETE   sp = push_bytes (sp, &word, 4);   					\ */
-/* OBSOLETE   write_register (SP_REGNUM, sp);		    			\ */
-/* OBSOLETE   write_register (FP_REGNUM, sp);		    			\ */
+/* OBSOLETE { register CORE_ADDR sp = read_register (SP_REGNUM);                        \ */
+/* OBSOLETE   register int regnum;                                                      \ */
+/* OBSOLETE   char buf[8];                                                              \ */
+/* OBSOLETE   long word;                                                                \ */
+/* OBSOLETE   for (regnum = S0_REGNUM; regnum >= S7_REGNUM; --regnum) {                 \ */
+/* OBSOLETE     read_register_bytes (REGISTER_BYTE (regnum), buf, 8);           \ */
+/* OBSOLETE     sp = push_bytes (sp, buf, 8);}                                  \ */
+/* OBSOLETE   for (regnum = SP_REGNUM; regnum >= FP_REGNUM; --regnum) {                 \ */
+/* OBSOLETE     word = read_register (regnum);                                  \ */
+/* OBSOLETE     sp = push_bytes (sp, &word, 4);}                                        \ */
+/* OBSOLETE   word = (read_register (PS_REGNUM) &~ (3<<25)) | (1<<25);          \ */
+/* OBSOLETE   sp = push_bytes (sp, &word, 4);                                   \ */
+/* OBSOLETE   word = read_register (PC_REGNUM);                                 \ */
+/* OBSOLETE   sp = push_bytes (sp, &word, 4);                                           \ */
+/* OBSOLETE   write_register (SP_REGNUM, sp);                                   \ */
+/* OBSOLETE   write_register (FP_REGNUM, sp);                                   \ */
 /* OBSOLETE   write_register (AP_REGNUM, sp);} */
 /* OBSOLETE  */
 /* OBSOLETE /* Discard from the stack the innermost frame, restoring all registers.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define POP_FRAME  do {\ */
-/* OBSOLETE   register CORE_ADDR fp = read_register (FP_REGNUM);	    \ */
-/* OBSOLETE   register int regnum;					    \ */
-/* OBSOLETE   register int frame_length =	/* 3 short, 2 long, 1 extended, 0 context *x/ \ */
+/* OBSOLETE   register CORE_ADDR fp = read_register (FP_REGNUM);            \ */
+/* OBSOLETE   register int regnum;                                          \ */
+/* OBSOLETE   register int frame_length =       /* 3 short, 2 long, 1 extended, 0 context *x/ \ */
 /* OBSOLETE       (read_memory_integer (fp + 4, 4) >> 25) & 3;          \ */
-/* OBSOLETE   char buf[8];					            \ */
+/* OBSOLETE   char buf[8];                                                  \ */
 /* OBSOLETE   write_register (PC_REGNUM, read_memory_integer (fp, 4));  \ */
 /* OBSOLETE   write_register (PS_REGNUM, read_memory_integer (fp += 4, 4));  \ */
 /* OBSOLETE   write_register (FP_REGNUM, read_memory_integer (fp += 4, 4));  \ */
 /* OBSOLETE   write_register (AP_REGNUM, read_memory_integer (fp += 4, 4));  \ */
-/* OBSOLETE   if (frame_length < 3) 				     \ */
+/* OBSOLETE   if (frame_length < 3)                                  \ */
 /* OBSOLETE     for (regnum = A5_REGNUM; regnum < SP_REGNUM; ++regnum)   \ */
 /* OBSOLETE       write_register (regnum, read_memory_integer (fp += 4, 4)); \ */
-/* OBSOLETE   if (frame_length < 2)					     \ */
+/* OBSOLETE   if (frame_length < 2)                                          \ */
 /* OBSOLETE     write_register (SP_REGNUM, read_memory_integer (fp += 4, 4)); \ */
-/* OBSOLETE   fp -= 4;							\ */
-/* OBSOLETE   if (frame_length < 3)  					\ */
-/* OBSOLETE     for (regnum = S7_REGNUM; regnum < S0_REGNUM; ++regnum) {	\ */
-/* OBSOLETE       read_memory (fp += 8, buf, 8);				\ */
+/* OBSOLETE   fp -= 4;                                                  \ */
+/* OBSOLETE   if (frame_length < 3)                                     \ */
+/* OBSOLETE     for (regnum = S7_REGNUM; regnum < S0_REGNUM; ++regnum) {        \ */
+/* OBSOLETE       read_memory (fp += 8, buf, 8);                                \ */
 /* OBSOLETE       write_register_bytes (REGISTER_BYTE (regnum), buf, 8);}   \ */
-/* OBSOLETE   if (frame_length < 2)	{					\ */
-/* OBSOLETE     read_memory (fp += 8, buf, 8);				\ */
+/* OBSOLETE   if (frame_length < 2)     {                                       \ */
+/* OBSOLETE     read_memory (fp += 8, buf, 8);                          \ */
 /* OBSOLETE     write_register_bytes (REGISTER_BYTE (regnum), buf, 8);}     \ */
-/* OBSOLETE   else write_register (SP_REGNUM, fp + 8);			\ */
-/* OBSOLETE   flush_cached_frames ();					\ */
+/* OBSOLETE   else write_register (SP_REGNUM, fp + 8);                  \ */
+/* OBSOLETE   flush_cached_frames ();                                   \ */
 /* OBSOLETE } while (0) */
 /* OBSOLETE  */
 /* OBSOLETE /* This sequence of words is the instructions */
@@ -443,7 +443,7 @@
 /* OBSOLETE    into a call sequence of the above form stored at DUMMYNAME.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p)   \ */
-/* OBSOLETE { *(int *)((char *) dummyname + 4) = nargs;	\ */
+/* OBSOLETE { *(int *)((char *) dummyname + 4) = nargs; \ */
 /* OBSOLETE   *(int *)((char *) dummyname + 10) = fun; } */
 /* OBSOLETE  */
 /* OBSOLETE /* Defs to read soff symbol tables, see dbxread.c *x/ */
@@ -459,28 +459,28 @@
 /* OBSOLETE     (BUFFER = STRING_TABLE_SIZE) */
 /* OBSOLETE  */
 /* OBSOLETE #define DECLARE_FILE_HEADERS \ */
-/* OBSOLETE   FILEHDR filehdr;							\ */
-/* OBSOLETE   OPTHDR opthdr;							\ */
+/* OBSOLETE   FILEHDR filehdr;                                                  \ */
+/* OBSOLETE   OPTHDR opthdr;                                                    \ */
 /* OBSOLETE   SCNHDR txthdr */
 /* OBSOLETE  */
 /* OBSOLETE #define READ_FILE_HEADERS(DESC,NAME) \ */
-/* OBSOLETE {									\ */
-/* OBSOLETE   int n;								\ */
-/* OBSOLETE   val = myread (DESC, &filehdr, sizeof filehdr);			\ */
-/* OBSOLETE   if (val < 0)								\ */
-/* OBSOLETE     perror_with_name (NAME);						\ */
-/* OBSOLETE   if (! IS_SOFF_MAGIC (filehdr.h_magic))				\ */
-/* OBSOLETE     error ("%s: not an executable file.", NAME);			\ */
-/* OBSOLETE   lseek (DESC, 0L, 0);							\ */
-/* OBSOLETE   if (myread (DESC, &filehdr, sizeof filehdr) < 0)			\ */
-/* OBSOLETE     perror_with_name (NAME);						\ */
-/* OBSOLETE   if (myread (DESC, &opthdr, filehdr.h_opthdr) <= 0)			\ */
-/* OBSOLETE     perror_with_name (NAME);						\ */
-/* OBSOLETE   for (n = 0; n < filehdr.h_nscns; n++)					\ */
-/* OBSOLETE     {									\ */
-/* OBSOLETE       if (myread (DESC, &txthdr, sizeof txthdr) < 0)			\ */
-/* OBSOLETE 	perror_with_name (NAME);					\ */
-/* OBSOLETE       if ((txthdr.s_flags & S_TYPMASK) == S_TEXT)			\ */
-/* OBSOLETE 	break;								\ */
-/* OBSOLETE     }									\ */
+/* OBSOLETE {                                                                   \ */
+/* OBSOLETE   int n;                                                            \ */
+/* OBSOLETE   val = myread (DESC, &filehdr, sizeof filehdr);                    \ */
+/* OBSOLETE   if (val < 0)                                                              \ */
+/* OBSOLETE     perror_with_name (NAME);                                                \ */
+/* OBSOLETE   if (! IS_SOFF_MAGIC (filehdr.h_magic))                            \ */
+/* OBSOLETE     error ("%s: not an executable file.", NAME);                    \ */
+/* OBSOLETE   lseek (DESC, 0L, 0);                                                      \ */
+/* OBSOLETE   if (myread (DESC, &filehdr, sizeof filehdr) < 0)                  \ */
+/* OBSOLETE     perror_with_name (NAME);                                                \ */
+/* OBSOLETE   if (myread (DESC, &opthdr, filehdr.h_opthdr) <= 0)                        \ */
+/* OBSOLETE     perror_with_name (NAME);                                                \ */
+/* OBSOLETE   for (n = 0; n < filehdr.h_nscns; n++)                                     \ */
+/* OBSOLETE     {                                                                       \ */
+/* OBSOLETE       if (myread (DESC, &txthdr, sizeof txthdr) < 0)                        \ */
+/* OBSOLETE     perror_with_name (NAME);                                        \ */
+/* OBSOLETE       if ((txthdr.s_flags & S_TYPMASK) == S_TEXT)                   \ */
+/* OBSOLETE     break;                                                          \ */
+/* OBSOLETE     }                                                                       \ */
 /* OBSOLETE } */
diff --git a/gdb/config/d10v/tm-d10v.h b/gdb/config/d10v/tm-d10v.h
index 8dfa9fd3d17..1983f690ac6 100644
--- a/gdb/config/d10v/tm-d10v.h
+++ b/gdb/config/d10v/tm-d10v.h
@@ -1,21 +1,22 @@
 /* Target-specific definition for the Mitsubishi D10V
    Copyright (C) 1996,1999 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Contributed by Martin Hunt, hunt@cygnus.com */
 
@@ -86,7 +87,7 @@ extern char *d10v_register_name PARAMS ((int reg_nr));
 #define REGISTER_SIZE 2
 
 /* Say how much memory is needed to store a copy of the register set */
-#define REGISTER_BYTES    ((37/*NUM_REGS*/-2)*2+16) 
+#define REGISTER_BYTES    ((37/*NUM_REGS*/-2)*2+16)
 
 /* Index within `registers' of the first byte of the space for
    register N.  */
@@ -99,7 +100,7 @@ extern int d10v_register_raw_size PARAMS ((int reg_nr));
 #define REGISTER_RAW_SIZE(N) (d10v_register_raw_size (N))
 
 /* Number of bytes of storage in the program's representation
-   for register N.  */   
+   for register N.  */
 extern int d10v_register_virtual_size PARAMS ((int reg_nr));
 #define REGISTER_VIRTUAL_SIZE(N) (d10v_register_virtual_size (N))
 
@@ -119,8 +120,8 @@ extern struct type *d10v_register_virtual_type PARAMS ((int reg_nr));
 
 /* convert $pc and $sp to/from virtual addresses */
 extern int d10v_register_convertible PARAMS ((int nr));
-extern void d10v_register_convert_to_virtual PARAMS ((int regnum, struct type *type, char *from, char *to));
-extern void d10v_register_convert_to_raw PARAMS ((struct type *type, int regnum, char *from, char *to));
+extern void d10v_register_convert_to_virtual PARAMS ((int regnum, struct type * type, char *from, char *to));
+extern void d10v_register_convert_to_raw PARAMS ((struct type * type, int regnum, char *from, char *to));
 #define REGISTER_CONVERTIBLE(N) (d10v_register_convertible ((N)))
 #define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO) \
   d10v_register_convert_to_virtual ((REGNUM), (TYPE), (FROM), (TO))
@@ -157,7 +158,7 @@ extern void d10v_store_struct_return PARAMS ((CORE_ADDR addr, CORE_ADDR sp));
 
    Things always get returned in RET1_REGNUM, RET2_REGNUM, ... */
 
-extern void d10v_store_return_value PARAMS ((struct type *type, char *valbuf));
+extern void d10v_store_return_value PARAMS ((struct type * type, char *valbuf));
 #define STORE_RETURN_VALUE(TYPE,VALBUF) d10v_store_return_value ((TYPE), (VALBUF))
 
 
@@ -177,15 +178,15 @@ extern CORE_ADDR d10v_extract_struct_value_address PARAMS ((char *regbuf));
 
 extern use_struct_convention_fn d10v_use_struct_convention;
 #define USE_STRUCT_CONVENTION(gcc_p, type) d10v_use_struct_convention (gcc_p, type)
-
 
+
 /* Define other aspects of the stack frame. 
    we keep a copy of the worked out return pc lying around, since it
    is a useful bit of info */
 
-extern void d10v_init_extra_frame_info PARAMS ((int fromleaf, struct frame_info *fi));
+extern void d10v_init_extra_frame_info PARAMS ((int fromleaf, struct frame_info * fi));
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) \
-    d10v_init_extra_frame_info(fromleaf, fi) 
+    d10v_init_extra_frame_info(fromleaf, fi)
 
 /* A macro that tells us whether the function invocation represented
    by FI does not have a frame on the stack associated with it.  If it
@@ -194,24 +195,24 @@ extern void d10v_init_extra_frame_info PARAMS ((int fromleaf, struct frame_info
 #define FRAMELESS_FUNCTION_INVOCATION(FI) \
   (frameless_look_for_prologue (FI))
 
-extern CORE_ADDR d10v_frame_chain PARAMS ((struct frame_info *frame));
+extern CORE_ADDR d10v_frame_chain PARAMS ((struct frame_info * frame));
 #define FRAME_CHAIN(FRAME)       d10v_frame_chain(FRAME)
 extern int d10v_frame_chain_valid PARAMS ((CORE_ADDR, struct frame_info *));
 #define FRAME_CHAIN_VALID(chain, thisframe) d10v_frame_chain_valid (chain, thisframe)
-extern CORE_ADDR d10v_frame_saved_pc PARAMS ((struct frame_info *fi));
+extern CORE_ADDR d10v_frame_saved_pc PARAMS ((struct frame_info * fi));
 #define FRAME_SAVED_PC(fi) (d10v_frame_saved_pc ((fi)))
-extern CORE_ADDR d10v_frame_args_address PARAMS ((struct frame_info *fi));
+extern CORE_ADDR d10v_frame_args_address PARAMS ((struct frame_info * fi));
 #define FRAME_ARGS_ADDRESS(fi) (d10v_frame_args_address ((fi)))
-extern CORE_ADDR d10v_frame_locals_address PARAMS ((struct frame_info *fi));
+extern CORE_ADDR d10v_frame_locals_address PARAMS ((struct frame_info * fi));
 #define FRAME_LOCALS_ADDRESS(fi) (d10v_frame_locals_address ((fi)))
 
 /* Immediately after a function call, return the saved pc.  We can't */
 /* use frame->return_pc beause that is determined by reading R13 off the */
 /*stack and that may not be written yet. */
 
-extern CORE_ADDR d10v_saved_pc_after_call PARAMS ((struct frame_info *frame));
+extern CORE_ADDR d10v_saved_pc_after_call PARAMS ((struct frame_info * frame));
 #define SAVED_PC_AFTER_CALL(frame) (d10v_saved_pc_after_call ((frame)))
-    
+
 /* Set VAL to the number of args passed to frame described by FI.
    Can set VAL to -1, meaning no way to tell.  */
 /* We can't tell how many args there are */
@@ -297,13 +298,13 @@ CORE_ADDR d10v_read_fp PARAMS ((void));
 #define TARGET_PTR_BIT (4 * TARGET_CHAR_BIT)
 #define TARGET_DOUBLE_BIT (4 * TARGET_CHAR_BIT)
 #define TARGET_LONG_DOUBLE_BIT (8 * TARGET_CHAR_BIT)
-
 
+
 /* For the d10v when talking to the remote d10v board, GDB addresses
    need to be translated into a format that the d10v rom monitor
    understands. */
 
-extern void remote_d10v_translate_xfer_address PARAMS ((CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len));
+extern void remote_d10v_translate_xfer_address PARAMS ((CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR * rem_addr, int *rem_len));
 #define REMOTE_TRANSLATE_XFER_ADDRESS(GDB_ADDR, GDB_LEN, REM_ADDR, REM_LEN) \
  remote_d10v_translate_xfer_address ((GDB_ADDR), (GDB_LEN), (REM_ADDR), (REM_LEN))
 
diff --git a/gdb/config/d30v/tm-d30v.h b/gdb/config/d30v/tm-d30v.h
index 124b8b4e673..f823f946855 100644
--- a/gdb/config/d30v/tm-d30v.h
+++ b/gdb/config/d30v/tm-d30v.h
@@ -1,21 +1,22 @@
 /* Target-specific definition for the Mitsubishi D30V
    Copyright (C) 1997 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_D30V_H
 #define TM_D30V_H
@@ -33,12 +34,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* and instruction memory to. */
 
 #define DMEM_START	0x20000000
-#define IMEM_START	0x00000000 /* was 0x10000000 */
+#define IMEM_START	0x00000000	/* was 0x10000000 */
 #define STACK_START	0x20007ffe
 
-#ifdef __STDC__		/* Forward decls for prototypes */
+#ifdef __STDC__			/* Forward decls for prototypes */
 struct frame_info;
-struct frame_saved_regs; 
+struct frame_saved_regs;
 struct type;
 struct value;
 #endif
@@ -93,9 +94,9 @@ extern CORE_ADDR d30v_skip_prologue PARAMS ((CORE_ADDR));
 #define SPU_REGNUM	65	/* User stack pointer */
 #define CREGS_START	66
 
-#define PSW_REGNUM 	(CREGS_START + 0) /* psw, bpsw, or dpsw??? */
+#define PSW_REGNUM 	(CREGS_START + 0)	/* psw, bpsw, or dpsw??? */
 #define     PSW_SM (((unsigned long)0x80000000) >> 0)	/* Stack mode: 0/SPI */
-							/*	       1/SPU */
+							/*             1/SPU */
 #define     PSW_EA (((unsigned long)0x80000000) >> 2)	/* Execution status */
 #define     PSW_DB (((unsigned long)0x80000000) >> 3)	/* Debug mode */
 #define     PSW_DS (((unsigned long)0x80000000) >> 4)	/* Debug EIT status */
@@ -111,25 +112,25 @@ extern CORE_ADDR d30v_skip_prologue PARAMS ((CORE_ADDR));
 #define     PSW_VA (((unsigned long)0x80000000) >> 29)	/* Accum. overflow */
 #define     PSW_C  (((unsigned long)0x80000000) >> 31)	/* Carry/Borrow flag */
 
-#define BPSW_REGNUM	(CREGS_START + 1) /* Backup PSW (on interrupt) */
-#define PC_REGNUM 	(CREGS_START + 2) /* pc, bpc, or dpc??? */
-#define BPC_REGNUM 	(CREGS_START + 3) /* Backup PC (on interrupt) */
-#define DPSW_REGNUM	(CREGS_START + 4) /* Backup PSW (on debug trap) */
-#define DPC_REGNUM 	(CREGS_START + 5) /* Backup PC (on debug trap) */
-#define RPT_C_REGNUM	(CREGS_START + 7) /* Loop count */
-#define RPT_S_REGNUM	(CREGS_START + 8) /* Loop start address*/
-#define RPT_E_REGNUM	(CREGS_START + 9) /* Loop end address */
+#define BPSW_REGNUM	(CREGS_START + 1)	/* Backup PSW (on interrupt) */
+#define PC_REGNUM 	(CREGS_START + 2)	/* pc, bpc, or dpc??? */
+#define BPC_REGNUM 	(CREGS_START + 3)	/* Backup PC (on interrupt) */
+#define DPSW_REGNUM	(CREGS_START + 4)	/* Backup PSW (on debug trap) */
+#define DPC_REGNUM 	(CREGS_START + 5)	/* Backup PC (on debug trap) */
+#define RPT_C_REGNUM	(CREGS_START + 7)	/* Loop count */
+#define RPT_S_REGNUM	(CREGS_START + 8)	/* Loop start address */
+#define RPT_E_REGNUM	(CREGS_START + 9)	/* Loop end address */
 #define MOD_S_REGNUM	(CREGS_START + 10)
 #define MOD_E_REGNUM	(CREGS_START + 11)
-#define IBA_REGNUM	(CREGS_START + 14) /* Instruction break address */
-#define EIT_VB_REGNUM	(CREGS_START + 15) /* Vector base address */
-#define INT_S_REGNUM	(CREGS_START + 16) /* Interrupt status */
-#define INT_M_REGNUM	(CREGS_START + 17) /* Interrupt mask */
+#define IBA_REGNUM	(CREGS_START + 14)	/* Instruction break address */
+#define EIT_VB_REGNUM	(CREGS_START + 15)	/* Vector base address */
+#define INT_S_REGNUM	(CREGS_START + 16)	/* Interrupt status */
+#define INT_M_REGNUM	(CREGS_START + 17)	/* Interrupt mask */
 #define A0_REGNUM 	84
 #define A1_REGNUM 	85
 
 /* Say how much memory is needed to store a copy of the register set */
-#define REGISTER_BYTES    ((NUM_REGS - 2) * 4 + 2 * 8) 
+#define REGISTER_BYTES    ((NUM_REGS - 2) * 4 + 2 * 8)
 
 /* Index within `registers' of the first byte of the space for
    register N.  */
@@ -143,7 +144,7 @@ extern CORE_ADDR d30v_skip_prologue PARAMS ((CORE_ADDR));
 #define REGISTER_RAW_SIZE(N) ( ((N) >= A0_REGNUM) ? 8 : 4 )
 
 /* Number of bytes of storage in the program's representation
-   for register N.  */   
+   for register N.  */
 #define REGISTER_VIRTUAL_SIZE(N) REGISTER_RAW_SIZE(N)
 
 /* Largest value REGISTER_RAW_SIZE can have.  */
@@ -204,9 +205,9 @@ void d30v_do_registers_info PARAMS ((int regnum, int fpregs));
     int size;
 
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) \
-    d30v_init_extra_frame_info(fromleaf, fi) 
+    d30v_init_extra_frame_info(fromleaf, fi)
 
-extern void d30v_init_extra_frame_info PARAMS (( int fromleaf, struct frame_info *fi ));
+extern void d30v_init_extra_frame_info PARAMS ((int fromleaf, struct frame_info * fi));
 
 /* A macro that tells us whether the function invocation represented
    by FI does not have a frame on the stack associated with it.  If it
@@ -218,7 +219,7 @@ extern void d30v_init_extra_frame_info PARAMS (( int fromleaf, struct frame_info
 #define FRAME_CHAIN(FRAME)       d30v_frame_chain(FRAME)
 extern int d30v_frame_chain_valid PARAMS ((CORE_ADDR, struct frame_info *));
 #define FRAME_CHAIN_VALID(chain, thisframe) d30v_frame_chain_valid (chain, thisframe)
-#define FRAME_SAVED_PC(FRAME)    ((FRAME)->return_pc)   
+#define FRAME_SAVED_PC(FRAME)    ((FRAME)->return_pc)
 #define FRAME_ARGS_ADDRESS(fi)   (fi)->frame
 #define FRAME_LOCALS_ADDRESS(fi) (fi)->frame
 
@@ -230,7 +231,7 @@ extern int d30v_frame_chain_valid PARAMS ((CORE_ADDR, struct frame_info *));
 /* stack and that may not be written yet. */
 
 #define SAVED_PC_AFTER_CALL(frame) (read_register(LR_REGNUM))
-    
+
 /* Set VAL to the number of args passed to frame described by FI.
    Can set VAL to -1, meaning no way to tell.  */
 /* We can't tell how many args there are */
@@ -263,9 +264,9 @@ extern void d30v_frame_find_saved_regs PARAMS ((struct frame_info *, struct fram
    When it hits the breakpoint, clear the break point and pop the old
    register contents off the stack. */
 
-#define CALL_DUMMY		{ 0 }  
+#define CALL_DUMMY		{ 0 }
 #define PUSH_DUMMY_FRAME
-#define CALL_DUMMY_START_OFFSET	0	
+#define CALL_DUMMY_START_OFFSET	0
 #define CALL_DUMMY_LOCATION	AT_ENTRY_POINT
 #define CALL_DUMMY_BREAKPOINT_OFFSET (0)
 
@@ -278,8 +279,8 @@ sp = d30v_fix_call_dummy (dummyname, pc, fun, nargs, args, type, gcc_p)
 #define PC_IN_CALL_DUMMY(pc, sp, frame_address)	( pc == IMEM_START + 4 )
 
 extern CORE_ADDR d30v_fix_call_dummy PARAMS ((char *, CORE_ADDR, CORE_ADDR,
-					   int, struct value **,
-					   struct type *, int));
+					      int, struct value **,
+					      struct type *, int));
 #define PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) \
   (d30v_push_arguments((nargs), (args), (sp), (struct_return), (struct_addr)))
 extern CORE_ADDR d30v_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int, CORE_ADDR));
@@ -291,14 +292,14 @@ extern CORE_ADDR d30v_push_arguments PARAMS ((int, struct value **, CORE_ADDR, i
 
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
 d30v_extract_return_value(TYPE, REGBUF, VALBUF)
-  extern void
+extern void
 d30v_extract_return_value PARAMS ((struct type *, char *, char *));
 
 
 /* Discard from the stack the innermost frame,
    restoring all saved registers.  */
 #define POP_FRAME d30v_pop_frame();
-extern void d30v_pop_frame PARAMS((void));
+extern void d30v_pop_frame PARAMS ((void));
 
 #define REGISTER_SIZE 4
 
diff --git a/gdb/config/fr30/tm-fr30.h b/gdb/config/fr30/tm-fr30.h
index 93aa9cb8f7f..2dd8a8ee7e0 100644
--- a/gdb/config/fr30/tm-fr30.h
+++ b/gdb/config/fr30/tm-fr30.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Fujitsu FR30 processor.
    Copyright 1999, Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define FR30_GENREGS		16
 #define FR30_DEDICATEDREGS	8
@@ -84,7 +85,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define REGISTER_RAW_SIZE(N) FR30_REGSIZE
 
 /* Largest value REGISTER_RAW_SIZE can have.  */
-#define MAX_REGISTER_RAW_SIZE FR30_REGSIZE 
+#define MAX_REGISTER_RAW_SIZE FR30_REGSIZE
 
 /* Number of bytes of storage in the program's representation
    for register N.  */
@@ -137,7 +138,7 @@ extern void fr30_pop_frame PARAMS ((void));
    Can return -1, meaning no way to tell.  */
 #define FRAME_NUM_ARGS(fi) (-1)
 
-#ifdef __STDC__		/* Forward decls for prototypes */
+#ifdef __STDC__			/* Forward decls for prototypes */
 struct frame_info;
 struct frame_saved_regs;
 struct type;
@@ -150,10 +151,10 @@ struct value;
   int frameoffset;		\
   int framereg;
 
-extern CORE_ADDR fr30_frame_chain PARAMS ((struct frame_info *fi));
+extern CORE_ADDR fr30_frame_chain PARAMS ((struct frame_info * fi));
 #define FRAME_CHAIN(fi) fr30_frame_chain (fi)
 
-extern CORE_ADDR fr30_frame_saved_pc   PARAMS ((struct frame_info *));
+extern CORE_ADDR fr30_frame_saved_pc PARAMS ((struct frame_info *));
 #define FRAME_SAVED_PC(fi) (fr30_frame_saved_pc (fi))
 
 #define SAVED_PC_AFTER_CALL(fi) read_register (RP_REGNUM)
@@ -165,7 +166,7 @@ extern CORE_ADDR fr30_skip_prologue PARAMS ((CORE_ADDR pc));
    TYPE, given in virtual format.  VALBUF is in the target byte order;
    it's typically the VALUE_CONTENTS of some struct value, and those
    are in the target's byte order.  */
-extern void fr30_store_return_value PARAMS ((struct type *type, char *valbuf));
+extern void fr30_store_return_value PARAMS ((struct type * type, char *valbuf));
 
 #define STORE_RETURN_VALUE(TYPE,VALBUF) \
   (fr30_store_return_value ((TYPE), (VALBUF)))
@@ -192,18 +193,18 @@ extern void fr30_store_return_value PARAMS ((struct type *type, char *valbuf));
 
 /* An expression that tells us whether the function invocation represented
    by FI does not have a frame on the stack associated with it.  */
-extern int fr30_frameless_function_invocation PARAMS ((struct frame_info *frame));
+extern int fr30_frameless_function_invocation PARAMS ((struct frame_info * frame));
 #define FRAMELESS_FUNCTION_INVOCATION(FI) (fr30_frameless_function_invocation (FI));
 
-extern void fr30_init_extra_frame_info PARAMS ((struct frame_info *fi));
+extern void fr30_init_extra_frame_info PARAMS ((struct frame_info * fi));
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) fr30_init_extra_frame_info (fi)
 
 #define FRAME_CHAIN_VALID(FP, FI)	generic_frame_chain_valid (FP, FI)
 
 extern CORE_ADDR
-fr30_push_arguments PARAMS ((int nargs, struct value **args, CORE_ADDR sp,
-			     int struct_return,
-			     CORE_ADDR struct_addr));
+  fr30_push_arguments PARAMS ((int nargs, struct value ** args, CORE_ADDR sp,
+			       int struct_return,
+			       CORE_ADDR struct_addr));
 #define PUSH_ARGUMENTS(NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR) \
   (fr30_push_arguments (NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR))
 
diff --git a/gdb/config/gould/tm-np1.h b/gdb/config/gould/tm-np1.h
index cbd05b1bb97..9971c891ca2 100644
--- a/gdb/config/gould/tm-np1.h
+++ b/gdb/config/gould/tm-np1.h
@@ -31,48 +31,48 @@
 /* OBSOLETE #define NO_GNU_STABS */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro for text-offset and data info (in NPL a.out format).  *x/ */
-/* OBSOLETE #define	TEXTINFO						\ */
-/* OBSOLETE         text_offset = N_TXTOFF (exec_coffhdr, exec_aouthdr);	\ */
+/* OBSOLETE #define     TEXTINFO                                                \ */
+/* OBSOLETE         text_offset = N_TXTOFF (exec_coffhdr, exec_aouthdr);        \ */
 /* OBSOLETE         exec_data_offset = N_TXTOFF (exec_coffhdr, exec_aouthdr)\ */
 /* OBSOLETE                 + exec_aouthdr.a_text */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro for number of symbol table entries *x/ */
-/* OBSOLETE #define NUMBER_OF_SYMBOLS					\ */
-/* OBSOLETE 	(coffhdr.f_nsyms) */
+/* OBSOLETE #define NUMBER_OF_SYMBOLS                                   \ */
+/* OBSOLETE     (coffhdr.f_nsyms) */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro for file-offset of symbol table (in NPL a.out format).  *x/ */
-/* OBSOLETE #define SYMBOL_TABLE_OFFSET					\ */
-/* OBSOLETE 	N_SYMOFF (coffhdr) */
+/* OBSOLETE #define SYMBOL_TABLE_OFFSET                                 \ */
+/* OBSOLETE     N_SYMOFF (coffhdr) */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro for file-offset of string table (in NPL a.out format).  *x/ */
-/* OBSOLETE #define STRING_TABLE_OFFSET					\ */
-/* OBSOLETE 	(N_STROFF (coffhdr)) */
+/* OBSOLETE #define STRING_TABLE_OFFSET                                 \ */
+/* OBSOLETE     (N_STROFF (coffhdr)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro to store the length of the string table data in INTO.  *x/ */
-/* OBSOLETE #define READ_STRING_TABLE_SIZE(INTO)				\ */
-/* OBSOLETE 	{ INTO = hdr.a_stsize; } */
+/* OBSOLETE #define READ_STRING_TABLE_SIZE(INTO)                                \ */
+/* OBSOLETE     { INTO = hdr.a_stsize; } */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro to declare variables to hold the file's header data.  *x/ */
-/* OBSOLETE #define DECLARE_FILE_HEADERS  struct exec hdr;			\ */
-/* OBSOLETE 			      FILHDR coffhdr */
+/* OBSOLETE #define DECLARE_FILE_HEADERS  struct exec hdr;                      \ */
+/* OBSOLETE                           FILHDR coffhdr */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro to read the header data from descriptor DESC and validate it. */
 /* OBSOLETE    NAME is the file name, for error messages.  *x/ */
-/* OBSOLETE #define READ_FILE_HEADERS(DESC, NAME)				\ */
-/* OBSOLETE { val = myread (DESC, &coffhdr, sizeof coffhdr);		\ */
-/* OBSOLETE   if (val < 0)							\ */
-/* OBSOLETE     perror_with_name (NAME);					\ */
-/* OBSOLETE   val = myread (DESC, &hdr, sizeof hdr);			\ */
-/* OBSOLETE   if (val < 0)							\ */
-/* OBSOLETE     perror_with_name (NAME);					\ */
-/* OBSOLETE   if (coffhdr.f_magic != GNP1MAGIC)				\ */
-/* OBSOLETE     error ("File \"%s\" not in coff executable format.", NAME);	\ */
-/* OBSOLETE   if (N_BADMAG (hdr))						\ */
+/* OBSOLETE #define READ_FILE_HEADERS(DESC, NAME)                               \ */
+/* OBSOLETE { val = myread (DESC, &coffhdr, sizeof coffhdr);            \ */
+/* OBSOLETE   if (val < 0)                                                      \ */
+/* OBSOLETE     perror_with_name (NAME);                                        \ */
+/* OBSOLETE   val = myread (DESC, &hdr, sizeof hdr);                    \ */
+/* OBSOLETE   if (val < 0)                                                      \ */
+/* OBSOLETE     perror_with_name (NAME);                                        \ */
+/* OBSOLETE   if (coffhdr.f_magic != GNP1MAGIC)                         \ */
+/* OBSOLETE     error ("File \"%s\" not in coff executable format.", NAME);     \ */
+/* OBSOLETE   if (N_BADMAG (hdr))                                               \ */
 /* OBSOLETE     error ("File \"%s\" not in executable format.", NAME); } */
 /* OBSOLETE  */
 /* OBSOLETE /* Define COFF and other symbolic names needed on NP1 *x/ */
-/* OBSOLETE #define	NS32GMAGIC	GNP1MAGIC */
-/* OBSOLETE #define	NS32SMAGIC	GPNMAGIC */
+/* OBSOLETE #define     NS32GMAGIC      GNP1MAGIC */
+/* OBSOLETE #define     NS32SMAGIC      GPNMAGIC */
 /* OBSOLETE  */
 /* OBSOLETE /* Address of blocks in N_LBRAC and N_RBRAC symbols are absolute addresses, */
 /* OBSOLETE    not relative to start of source address.  *x/ */
@@ -80,7 +80,7 @@
 /* OBSOLETE  */
 /* OBSOLETE /* Offset from address of function to start of its code. */
 /* OBSOLETE    Zero on most machines.  *x/ */
-/* OBSOLETE #define FUNCTION_START_OFFSET	8 */
+/* OBSOLETE #define FUNCTION_START_OFFSET       8 */
 /* OBSOLETE  */
 /* OBSOLETE /* Advance PC across any function entry prologue instructions */
 /* OBSOLETE    to reach some "real" code.  One NPL we can have one two startup */
@@ -97,70 +97,70 @@
 /* OBSOLETE      or */
 /* OBSOLETE    Optional "stw r2,8(b3)"   (Gould first argument register passing) */
 /* OBSOLETE  *x/ */
-/* OBSOLETE #define SKIP_PROLOGUE(pc) { 						\ */
-/* OBSOLETE 	register int op = read_memory_integer ((pc), 4);		\ */
-/* OBSOLETE 	if ((op & 0xffff0000) == 0xFA0B0000) { 				\ */
-/* OBSOLETE 	    pc += 4;							\ */
-/* OBSOLETE 	    op = read_memory_integer ((pc), 4);				\ */
-/* OBSOLETE 	    if ((op & 0xffff0000) == 0x59400000) {			\ */
-/* OBSOLETE 		pc += 4;						\ */
-/* OBSOLETE 	        op = read_memory_integer ((pc), 4);			\ */
-/* OBSOLETE 		if ((op & 0xffff0000) == 0x5F000000) {			\ */
-/* OBSOLETE 		    pc += 4;						\ */
-/* OBSOLETE 	            op = read_memory_integer ((pc), 4);			\ */
-/* OBSOLETE 		    if (op == 0xD4820008) {				\ */
-/* OBSOLETE 		    	pc += 4;					\ */
-/* OBSOLETE 	            	op = read_memory_integer ((pc), 4);		\ */
-/* OBSOLETE 		    	if (op == 0x5582000C) {				\ */
-/* OBSOLETE 		    	    pc += 4;					\ */
-/* OBSOLETE 	                    op = read_memory_integer ((pc), 2);		\ */
-/* OBSOLETE 		            if (op == 0x2fa0) {				\ */
-/* OBSOLETE 		    	        pc += 2;				\ */
-/* OBSOLETE 		            } else {					\ */
-/* OBSOLETE 	                        op = read_memory_integer ((pc), 4);	\ */
-/* OBSOLETE 		                if (op == 0xd5030008) {			\ */
-/* OBSOLETE 		    	            pc += 4;				\ */
-/* OBSOLETE 		                }					\ */
-/* OBSOLETE 		            }						\ */
-/* OBSOLETE 		        } else {					\ */
-/* OBSOLETE 	                    op = read_memory_integer ((pc), 2);		\ */
-/* OBSOLETE 		            if (op == 0x2fa0) {				\ */
-/* OBSOLETE 		    	        pc += 2;				\ */
-/* OBSOLETE 		            }						\ */
-/* OBSOLETE 		        }						\ */
-/* OBSOLETE 		    }							\ */
-/* OBSOLETE 		}							\ */
-/* OBSOLETE 	    }								\ */
-/* OBSOLETE 	} 								\ */
-/* OBSOLETE 	if ((op & 0xffff0000) == 0x59000000) { 				\ */
-/* OBSOLETE 	    pc += 4;							\ */
-/* OBSOLETE 	    op = read_memory_integer ((pc), 4);				\ */
-/* OBSOLETE 	    if ((op & 0xffff0000) == 0x5F000000) {			\ */
-/* OBSOLETE 		pc += 4;						\ */
-/* OBSOLETE 	        op = read_memory_integer ((pc), 4);			\ */
-/* OBSOLETE 		if (op == 0xD4820008) {					\ */
-/* OBSOLETE 		    pc += 4;						\ */
-/* OBSOLETE 	            op = read_memory_integer ((pc), 4);			\ */
-/* OBSOLETE 		    if (op == 0x5582000C) {				\ */
-/* OBSOLETE 		    	pc += 4;					\ */
-/* OBSOLETE 	                op = read_memory_integer ((pc), 2);		\ */
-/* OBSOLETE 		        if (op == 0x2fa0) {				\ */
-/* OBSOLETE 		    	    pc += 2;					\ */
-/* OBSOLETE 		        } else {					\ */
-/* OBSOLETE 	                    op = read_memory_integer ((pc), 4);		\ */
-/* OBSOLETE 		            if (op == 0xd5030008) {			\ */
-/* OBSOLETE 		    	        pc += 4;				\ */
-/* OBSOLETE 		            }						\ */
-/* OBSOLETE 		        }						\ */
-/* OBSOLETE 		    } else {						\ */
-/* OBSOLETE 	                op = read_memory_integer ((pc), 2);		\ */
-/* OBSOLETE 		        if (op == 0x2fa0) {				\ */
-/* OBSOLETE 		    	    pc += 2;					\ */
-/* OBSOLETE 		        }						\ */
-/* OBSOLETE 		    }							\ */
-/* OBSOLETE 		}							\ */
-/* OBSOLETE 	    }								\ */
-/* OBSOLETE 	} 								\ */
+/* OBSOLETE #define SKIP_PROLOGUE(pc) {                                                 \ */
+/* OBSOLETE     register int op = read_memory_integer ((pc), 4);                \ */
+/* OBSOLETE     if ((op & 0xffff0000) == 0xFA0B0000) {                          \ */
+/* OBSOLETE         pc += 4;                                                    \ */
+/* OBSOLETE         op = read_memory_integer ((pc), 4);                         \ */
+/* OBSOLETE         if ((op & 0xffff0000) == 0x59400000) {                      \ */
+/* OBSOLETE             pc += 4;                                                \ */
+/* OBSOLETE             op = read_memory_integer ((pc), 4);                     \ */
+/* OBSOLETE             if ((op & 0xffff0000) == 0x5F000000) {                  \ */
+/* OBSOLETE                 pc += 4;                                            \ */
+/* OBSOLETE                 op = read_memory_integer ((pc), 4);                 \ */
+/* OBSOLETE                 if (op == 0xD4820008) {                             \ */
+/* OBSOLETE                     pc += 4;                                        \ */
+/* OBSOLETE                     op = read_memory_integer ((pc), 4);             \ */
+/* OBSOLETE                     if (op == 0x5582000C) {                         \ */
+/* OBSOLETE                         pc += 4;                                    \ */
+/* OBSOLETE                         op = read_memory_integer ((pc), 2);         \ */
+/* OBSOLETE                         if (op == 0x2fa0) {                         \ */
+/* OBSOLETE                             pc += 2;                                \ */
+/* OBSOLETE                         } else {                                    \ */
+/* OBSOLETE                             op = read_memory_integer ((pc), 4);     \ */
+/* OBSOLETE                             if (op == 0xd5030008) {                 \ */
+/* OBSOLETE                                 pc += 4;                            \ */
+/* OBSOLETE                             }                                       \ */
+/* OBSOLETE                         }                                           \ */
+/* OBSOLETE                     } else {                                        \ */
+/* OBSOLETE                         op = read_memory_integer ((pc), 2);         \ */
+/* OBSOLETE                         if (op == 0x2fa0) {                         \ */
+/* OBSOLETE                             pc += 2;                                \ */
+/* OBSOLETE                         }                                           \ */
+/* OBSOLETE                     }                                               \ */
+/* OBSOLETE                 }                                                   \ */
+/* OBSOLETE             }                                                       \ */
+/* OBSOLETE         }                                                           \ */
+/* OBSOLETE     }                                                               \ */
+/* OBSOLETE     if ((op & 0xffff0000) == 0x59000000) {                          \ */
+/* OBSOLETE         pc += 4;                                                    \ */
+/* OBSOLETE         op = read_memory_integer ((pc), 4);                         \ */
+/* OBSOLETE         if ((op & 0xffff0000) == 0x5F000000) {                      \ */
+/* OBSOLETE             pc += 4;                                                \ */
+/* OBSOLETE             op = read_memory_integer ((pc), 4);                     \ */
+/* OBSOLETE             if (op == 0xD4820008) {                                 \ */
+/* OBSOLETE                 pc += 4;                                            \ */
+/* OBSOLETE                 op = read_memory_integer ((pc), 4);                 \ */
+/* OBSOLETE                 if (op == 0x5582000C) {                             \ */
+/* OBSOLETE                     pc += 4;                                        \ */
+/* OBSOLETE                     op = read_memory_integer ((pc), 2);             \ */
+/* OBSOLETE                     if (op == 0x2fa0) {                             \ */
+/* OBSOLETE                         pc += 2;                                    \ */
+/* OBSOLETE                     } else {                                        \ */
+/* OBSOLETE                         op = read_memory_integer ((pc), 4);         \ */
+/* OBSOLETE                         if (op == 0xd5030008) {                     \ */
+/* OBSOLETE                             pc += 4;                                \ */
+/* OBSOLETE                         }                                           \ */
+/* OBSOLETE                     }                                               \ */
+/* OBSOLETE                 } else {                                            \ */
+/* OBSOLETE                     op = read_memory_integer ((pc), 2);             \ */
+/* OBSOLETE                     if (op == 0x2fa0) {                             \ */
+/* OBSOLETE                         pc += 2;                                    \ */
+/* OBSOLETE                     }                                               \ */
+/* OBSOLETE                 }                                                   \ */
+/* OBSOLETE             }                                                       \ */
+/* OBSOLETE         }                                                           \ */
+/* OBSOLETE     }                                                               \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* Immediately after a function call, return the saved pc. */
@@ -169,10 +169,10 @@
 /* OBSOLETE    some instructions.  True on NPL! Return address is in R1. */
 /* OBSOLETE    The true return address is REALLY 4 past that location! *x/ */
 /* OBSOLETE #define SAVED_PC_AFTER_CALL(frame) \ */
-/* OBSOLETE 	(read_register(R1_REGNUM) + 4) */
+/* OBSOLETE     (read_register(R1_REGNUM) + 4) */
 /* OBSOLETE  */
 /* OBSOLETE /* Address of end of stack space.  *x/ */
-/* OBSOLETE #define STACK_END_ADDR 		0x7fffc000 */
+/* OBSOLETE #define STACK_END_ADDR              0x7fffc000 */
 /* OBSOLETE  */
 /* OBSOLETE /* Stack grows downward.  *x/ */
 /* OBSOLETE #define INNER_THAN(lhs,rhs) ((lhs) < (rhs)) */
@@ -181,15 +181,15 @@
 /* OBSOLETE    This is padded out to the size of a machine word.  When it was just */
 /* OBSOLETE    {0x28, 0x09} it gave problems if hit breakpoint on returning from a */
 /* OBSOLETE    function call.  *x/ */
-/* OBSOLETE #define BREAKPOINT 		{0x28, 0x09, 0x0, 0x0} */
+/* OBSOLETE #define BREAKPOINT          {0x28, 0x09, 0x0, 0x0} */
 /* OBSOLETE  */
 /* OBSOLETE /* Amount PC must be decremented by after a breakpoint. */
 /* OBSOLETE    This is often the number of bytes in BREAKPOINT */
 /* OBSOLETE    but not always.  *x/ */
-/* OBSOLETE #define DECR_PC_AFTER_BREAK	2 */
+/* OBSOLETE #define DECR_PC_AFTER_BREAK 2 */
 /* OBSOLETE  */
 /* OBSOLETE /* Return 1 if P points to an invalid floating point value.  *x/ */
-/* OBSOLETE #define INVALID_FLOAT(p, len) 	((*(short *)p & 0xff80) == 0x8000) */
+/* OBSOLETE #define INVALID_FLOAT(p, len)       ((*(short *)p & 0xff80) == 0x8000) */
 /* OBSOLETE  */
 /* OBSOLETE /* Say how long (ordinary) registers are.  This is a piece of bogosity */
 /* OBSOLETE    used in push_word and a few other places; REGISTER_RAW_SIZE is the */
@@ -198,13 +198,13 @@
 /* OBSOLETE #define REGISTER_SIZE 4 */
 /* OBSOLETE  */
 /* OBSOLETE /* Size of bytes of vector register (NP1 only), 32 elements * sizeof(int) *x/ */
-/* OBSOLETE #define VR_SIZE			128 */
+/* OBSOLETE #define VR_SIZE                     128 */
 /* OBSOLETE  */
 /* OBSOLETE /* Number of machine registers *x/ */
-/* OBSOLETE #define NUM_REGS 		27 */
-/* OBSOLETE #define NUM_GEN_REGS		16 */
-/* OBSOLETE #define NUM_CPU_REGS		4 */
-/* OBSOLETE #define NUM_VECTOR_REGS		7 */
+/* OBSOLETE #define NUM_REGS            27 */
+/* OBSOLETE #define NUM_GEN_REGS                16 */
+/* OBSOLETE #define NUM_CPU_REGS                4 */
+/* OBSOLETE #define NUM_VECTOR_REGS             7 */
 /* OBSOLETE  */
 /* OBSOLETE /* Initializer for an array of names of registers. */
 /* OBSOLETE    There should be NUM_REGS strings in this initializer.  *x/ */
@@ -221,52 +221,52 @@
 /* OBSOLETE    and some are "phony" register numbers which are too large */
 /* OBSOLETE    to be actual register numbers as far as the user is concerned */
 /* OBSOLETE    but do serve to get the desired values when passed to read_register.  *x/ */
-/* OBSOLETE #define R1_REGNUM	1	/* Gr1 => return address of caller *x/ */
-/* OBSOLETE #define R2_REGNUM	2	/* Gr2 => return value from function *x/ */
-/* OBSOLETE #define R4_REGNUM	4	/* Gr4 => register save area *x/ */
-/* OBSOLETE #define R5_REGNUM	5	/* Gr5 => register save area *x/ */
-/* OBSOLETE #define R6_REGNUM	6	/* Gr6 => register save area *x/ */
-/* OBSOLETE #define R7_REGNUM	7	/* Gr7 => register save area *x/ */
-/* OBSOLETE #define B1_REGNUM	9	/* Br1 => start of this code routine *x/ */
-/* OBSOLETE #define SP_REGNUM	10	/* Br2 == (sp) *x/ */
-/* OBSOLETE #define AP_REGNUM	11	/* Br3 == (ap) *x/ */
-/* OBSOLETE #define FP_REGNUM 	16	/* A copy of Br2 saved in trap *x/ */
-/* OBSOLETE #define PS_REGNUM 	17	/* Contains processor status *x/ */
-/* OBSOLETE #define PC_REGNUM 	18	/* Contains program counter *x/ */
-/* OBSOLETE #define VE_REGNUM 	19	/* Vector end (user setup) register *x/ */
-/* OBSOLETE #define V1_REGNUM 	20	/* First vector register *x/ */
-/* OBSOLETE #define V7_REGNUM 	26	/* First vector register *x/ */
+/* OBSOLETE #define R1_REGNUM   1       /* Gr1 => return address of caller *x/ */
+/* OBSOLETE #define R2_REGNUM   2       /* Gr2 => return value from function *x/ */
+/* OBSOLETE #define R4_REGNUM   4       /* Gr4 => register save area *x/ */
+/* OBSOLETE #define R5_REGNUM   5       /* Gr5 => register save area *x/ */
+/* OBSOLETE #define R6_REGNUM   6       /* Gr6 => register save area *x/ */
+/* OBSOLETE #define R7_REGNUM   7       /* Gr7 => register save area *x/ */
+/* OBSOLETE #define B1_REGNUM   9       /* Br1 => start of this code routine *x/ */
+/* OBSOLETE #define SP_REGNUM   10      /* Br2 == (sp) *x/ */
+/* OBSOLETE #define AP_REGNUM   11      /* Br3 == (ap) *x/ */
+/* OBSOLETE #define FP_REGNUM   16      /* A copy of Br2 saved in trap *x/ */
+/* OBSOLETE #define PS_REGNUM   17      /* Contains processor status *x/ */
+/* OBSOLETE #define PC_REGNUM   18      /* Contains program counter *x/ */
+/* OBSOLETE #define VE_REGNUM   19      /* Vector end (user setup) register *x/ */
+/* OBSOLETE #define V1_REGNUM   20      /* First vector register *x/ */
+/* OBSOLETE #define V7_REGNUM   26      /* First vector register *x/ */
 /* OBSOLETE  */
 /* OBSOLETE /* Total amount of space needed to store our copies of the machine's */
 /* OBSOLETE    register state, the array `registers'.  *x/ */
 /* OBSOLETE #define REGISTER_BYTES \ */
-/* OBSOLETE 	(NUM_GEN_REGS*4 + NUM_VECTOR_REGS*VR_SIZE + NUM_CPU_REGS*4) */
+/* OBSOLETE     (NUM_GEN_REGS*4 + NUM_VECTOR_REGS*VR_SIZE + NUM_CPU_REGS*4) */
 /* OBSOLETE  */
 /* OBSOLETE /* Index within `registers' of the first byte of the space for */
 /* OBSOLETE    register N.  *x/ */
 /* OBSOLETE #define REGISTER_BYTE(N)  \ */
-/* OBSOLETE 	(((N) < V1_REGNUM) ? ((N) * 4) : (((N) - V1_REGNUM) * VR_SIZE) + 80) */
+/* OBSOLETE     (((N) < V1_REGNUM) ? ((N) * 4) : (((N) - V1_REGNUM) * VR_SIZE) + 80) */
 /* OBSOLETE  */
 /* OBSOLETE /* Number of bytes of storage in the actual machine representation */
 /* OBSOLETE    for register N.  On the NP1, all normal regs are 4 bytes, but */
 /* OBSOLETE    the vector registers are VR_SIZE*4 bytes long. *x/ */
 /* OBSOLETE #define REGISTER_RAW_SIZE(N) \ */
-/* OBSOLETE 	(((N) < V1_REGNUM) ? 4 : VR_SIZE) */
+/* OBSOLETE     (((N) < V1_REGNUM) ? 4 : VR_SIZE) */
 /* OBSOLETE  */
 /* OBSOLETE /* Number of bytes of storage in the program's representation */
 /* OBSOLETE    for register N.  On the NP1, all regs are 4 bytes. *x/ */
 /* OBSOLETE #define REGISTER_VIRTUAL_SIZE(N) \ */
-/* OBSOLETE 	(((N) < V1_REGNUM) ? 4 : VR_SIZE) */
+/* OBSOLETE     (((N) < V1_REGNUM) ? 4 : VR_SIZE) */
 /* OBSOLETE  */
 /* OBSOLETE /* Largest value REGISTER_RAW_SIZE can have.  *x/ */
-/* OBSOLETE #define MAX_REGISTER_RAW_SIZE		VR_SIZE */
+/* OBSOLETE #define MAX_REGISTER_RAW_SIZE               VR_SIZE */
 /* OBSOLETE  */
 /* OBSOLETE /* Largest value REGISTER_VIRTUAL_SIZE can have.  *x/ */
-/* OBSOLETE #define MAX_REGISTER_VIRTUAL_SIZE	VR_SIZE */
+/* OBSOLETE #define MAX_REGISTER_VIRTUAL_SIZE   VR_SIZE */
 /* OBSOLETE  */
 /* OBSOLETE /* Return the GDB type object for the "standard" data type */
 /* OBSOLETE    of data in register N.  *x/ */
-/* OBSOLETE #define REGISTER_VIRTUAL_TYPE(N)	\ */
+/* OBSOLETE #define REGISTER_VIRTUAL_TYPE(N)    \ */
 /* OBSOLETE   ((N) > VE_REGNUM ? builtin_type_np1_vector : builtin_type_int) */
 /* OBSOLETE extern struct type *builtin_type_np1_vector; */
 /* OBSOLETE  */
@@ -283,14 +283,14 @@
 /* OBSOLETE    into VALBUF. *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \ */
-/* OBSOLETE 	memcpy (VALBUF, ((int *)(REGBUF)) + 2, TYPE_LENGTH (TYPE)) */
+/* OBSOLETE     memcpy (VALBUF, ((int *)(REGBUF)) + 2, TYPE_LENGTH (TYPE)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Write into appropriate registers a function return value */
 /* OBSOLETE    of type TYPE, given in virtual format.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define STORE_RETURN_VALUE(TYPE,VALBUF) \ */
-/* OBSOLETE 	write_register_bytes (REGISTER_BYTE (R2_REGNUM), VALBUF,      \ */
-/* OBSOLETE 			      TYPE_LENGTH (TYPE)) */
+/* OBSOLETE     write_register_bytes (REGISTER_BYTE (R2_REGNUM), VALBUF,      \ */
+/* OBSOLETE                           TYPE_LENGTH (TYPE)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Extract from an array REGBUF containing the (raw) register state */
 /* OBSOLETE    the address in which a function should return its structure value, */
@@ -315,31 +315,31 @@
 /* OBSOLETE /* In the case of the NPL, the frame's norminal address is Br2 and the  */
 /* OBSOLETE    previous routines frame is up the stack X bytes, where X is the */
 /* OBSOLETE    value stored in the code function header xA(Br1). *x/ */
-/* OBSOLETE #define FRAME_CHAIN(thisframe)		(findframe(thisframe)) */
+/* OBSOLETE #define FRAME_CHAIN(thisframe)              (findframe(thisframe)) */
 /* OBSOLETE  */
 /* OBSOLETE extern int gould_frame_chain_valid PARAMS ((CORE_ADDR, struct frame_info *)); */
 /* OBSOLETE #define FRAME_CHAIN_VALID(chain, thisframe) gould_frame_chain_valid (chain, thisframe) */
 /* OBSOLETE  */
 /* OBSOLETE /* Define other aspects of the stack frame on NPL.  *x/ */
 /* OBSOLETE #define FRAME_SAVED_PC(FRAME) \ */
-/* OBSOLETE 	(read_memory_integer ((FRAME)->frame + 8, 4)) */
+/* OBSOLETE     (read_memory_integer ((FRAME)->frame + 8, 4)) */
 /* OBSOLETE  */
 /* OBSOLETE #define FRAME_ARGS_ADDRESS(fi) \ */
-/* OBSOLETE 	((fi)->next ? \ */
-/* OBSOLETE 	 read_memory_integer ((fi)->frame + 12, 4) : \ */
-/* OBSOLETE 	 read_register (AP_REGNUM)) */
+/* OBSOLETE     ((fi)->next ? \ */
+/* OBSOLETE      read_memory_integer ((fi)->frame + 12, 4) : \ */
+/* OBSOLETE      read_register (AP_REGNUM)) */
 /* OBSOLETE  */
-/* OBSOLETE #define FRAME_LOCALS_ADDRESS(fi)	((fi)->frame) */
+/* OBSOLETE #define FRAME_LOCALS_ADDRESS(fi)    ((fi)->frame) */
 /* OBSOLETE  */
 /* OBSOLETE /* Set VAL to the number of args passed to frame described by FI. */
 /* OBSOLETE    Can set VAL to -1, meaning no way to tell.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE /* We can check the stab info to see how */
 /* OBSOLETE    many arg we have.  No info in stack will tell us *x/ */
-/* OBSOLETE #define FRAME_NUM_ARGS(fi)		(findarg(fi)) */
+/* OBSOLETE #define FRAME_NUM_ARGS(fi)          (findarg(fi)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Return number of bytes at start of arglist that are not really args.  *x/ */
-/* OBSOLETE #define FRAME_ARGS_SKIP			8 */
+/* OBSOLETE #define FRAME_ARGS_SKIP                     8 */
 /* OBSOLETE  */
 /* OBSOLETE /* Put here the code to store, into a struct frame_saved_regs, */
 /* OBSOLETE    the addresses of the saved registers of frame described by FRAME_INFO. */
@@ -347,21 +347,21 @@
 /* OBSOLETE    ways in the stack frame.  sp is even more special: */
 /* OBSOLETE    the address we return for it IS the sp for the next frame.  *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)		\ */
+/* OBSOLETE #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)         \ */
 /* OBSOLETE {                                                                       \ */
-/* OBSOLETE   memset (&frame_saved_regs, '\0', sizeof frame_saved_regs);			\ */
+/* OBSOLETE   memset (&frame_saved_regs, '\0', sizeof frame_saved_regs);                        \ */
 /* OBSOLETE   (frame_saved_regs).regs[SP_REGNUM] = framechain (frame_info);         \ */
-/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 8;		\ */
-/* OBSOLETE   (frame_saved_regs).regs[R4_REGNUM] = (frame_info)->frame + 0x30;	\ */
-/* OBSOLETE   (frame_saved_regs).regs[R5_REGNUM] = (frame_info)->frame + 0x34;	\ */
-/* OBSOLETE   (frame_saved_regs).regs[R6_REGNUM] = (frame_info)->frame + 0x38;	\ */
-/* OBSOLETE   (frame_saved_regs).regs[R7_REGNUM] = (frame_info)->frame + 0x3C;	\ */
+/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 8;             \ */
+/* OBSOLETE   (frame_saved_regs).regs[R4_REGNUM] = (frame_info)->frame + 0x30;  \ */
+/* OBSOLETE   (frame_saved_regs).regs[R5_REGNUM] = (frame_info)->frame + 0x34;  \ */
+/* OBSOLETE   (frame_saved_regs).regs[R6_REGNUM] = (frame_info)->frame + 0x38;  \ */
+/* OBSOLETE   (frame_saved_regs).regs[R7_REGNUM] = (frame_info)->frame + 0x3C;  \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* Things needed for making the inferior call functions.  *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define CALL_DUMMY_LOCATION	BEFORE_TEXT_END */
-/* OBSOLETE #define	NEED_TEXT_START_END 1 */
+/* OBSOLETE #define CALL_DUMMY_LOCATION BEFORE_TEXT_END */
+/* OBSOLETE #define     NEED_TEXT_START_END 1 */
 /* OBSOLETE  */
 /* OBSOLETE /* Push an empty stack frame, to record the current PC, etc.  *x/ */
 /* OBSOLETE  */
@@ -414,15 +414,15 @@
 /* OBSOLETE    *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define CALL_DUMMY {0x00000000,  \ */
-/* OBSOLETE 		    0x00000000,  \ */
-/* OBSOLETE 		    0x59000000,  \ */
-/* OBSOLETE 		    0x598a0000,  \ */
-/* OBSOLETE 		    0xb5030008,  \ */
-/* OBSOLETE 		    0x5c820000,  \ */
-/* OBSOLETE 		    0x44810008,  \ */
-/* OBSOLETE 		    0x00000000,  \ */
-/* OBSOLETE 		    0x590a0000,  \ */
-/* OBSOLETE 		    0x28090000 } */
+/* OBSOLETE                 0x00000000,  \ */
+/* OBSOLETE                 0x59000000,  \ */
+/* OBSOLETE                 0x598a0000,  \ */
+/* OBSOLETE                 0xb5030008,  \ */
+/* OBSOLETE                 0x5c820000,  \ */
+/* OBSOLETE                 0x44810008,  \ */
+/* OBSOLETE                 0x00000000,  \ */
+/* OBSOLETE                 0x590a0000,  \ */
+/* OBSOLETE                 0x28090000 } */
 /* OBSOLETE  */
 /* OBSOLETE #define CALL_DUMMY_LENGTH 40 */
 /* OBSOLETE  */
@@ -450,9 +450,9 @@
 /* OBSOLETE       int arg_len = 0, total_len;\ */
 /* OBSOLETE       old_sp = push_word(old_sp,fun);\ */
 /* OBSOLETE       for(i = nargs - 1;i >= 0;i--)\ */
-/* OBSOLETE 	arg_len += TYPE_LENGTH (VALUE_TYPE (value_arg_coerce (args[i])));\ */
+/* OBSOLETE     arg_len += TYPE_LENGTH (VALUE_TYPE (value_arg_coerce (args[i])));\ */
 /* OBSOLETE       if(struct_return)\ */
-/* OBSOLETE 	arg_len += TYPE_LENGTH(value_type);\ */
+/* OBSOLETE     arg_len += TYPE_LENGTH(value_type);\ */
 /* OBSOLETE       total_len = DUMMY_FRAME_SIZE+CALL_DUMMY_STACK_ADJUST+4+arg_len;\ */
 /* OBSOLETE       dummyname[0] += total_len;\ */
 /* OBSOLETE       dummyname[2] += total_len;\ */
diff --git a/gdb/config/gould/tm-pn.h b/gdb/config/gould/tm-pn.h
index 6d685d6e400..3c6d174882b 100644
--- a/gdb/config/gould/tm-pn.h
+++ b/gdb/config/gould/tm-pn.h
@@ -29,58 +29,58 @@
 /* OBSOLETE #define NO_GNU_STABS */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro for text-offset and data info (in PN a.out format).  *x/ */
-/* OBSOLETE #define	TEXTINFO						\ */
-/* OBSOLETE 	text_offset = N_TXTOFF (exec_coffhdr);			\ */
-/* OBSOLETE 	exec_data_offset = N_TXTOFF (exec_coffhdr)		\ */
-/* OBSOLETE 		+ exec_aouthdr.a_text */
+/* OBSOLETE #define     TEXTINFO                                                \ */
+/* OBSOLETE     text_offset = N_TXTOFF (exec_coffhdr);                  \ */
+/* OBSOLETE     exec_data_offset = N_TXTOFF (exec_coffhdr)              \ */
+/* OBSOLETE             + exec_aouthdr.a_text */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro for number of symbol table entries (this used to be checked */
 /* OBSOLETE    in dbxread.c and caused the last psymtab to use this as the end of */
 /* OBSOLETE    text.  I'm not sure whether it would still be necessary).  *x/ */
-/* OBSOLETE #define END_OF_TEXT_DEFAULT					\ */
-/* OBSOLETE 	(0xffffff) */
+/* OBSOLETE #define END_OF_TEXT_DEFAULT                                 \ */
+/* OBSOLETE     (0xffffff) */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro for number of symbol table entries *x/ */
-/* OBSOLETE #define NUMBER_OF_SYMBOLS					\ */
-/* OBSOLETE 	(coffhdr.f_nsyms) */
+/* OBSOLETE #define NUMBER_OF_SYMBOLS                                   \ */
+/* OBSOLETE     (coffhdr.f_nsyms) */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro for file-offset of symbol table (in usual a.out format).  *x/ */
-/* OBSOLETE #define SYMBOL_TABLE_OFFSET					\ */
-/* OBSOLETE 	N_SYMOFF (coffhdr) */
+/* OBSOLETE #define SYMBOL_TABLE_OFFSET                                 \ */
+/* OBSOLETE     N_SYMOFF (coffhdr) */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro for file-offset of string table (in usual a.out format).  *x/ */
-/* OBSOLETE #define STRING_TABLE_OFFSET					\ */
-/* OBSOLETE 	(N_STROFF (coffhdr) + sizeof(int)) */
+/* OBSOLETE #define STRING_TABLE_OFFSET                                 \ */
+/* OBSOLETE     (N_STROFF (coffhdr) + sizeof(int)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro to store the length of the string table data in INTO.  *x/ */
-/* OBSOLETE #define READ_STRING_TABLE_SIZE(INTO)				\ */
-/* OBSOLETE 	{ INTO = hdr.a_stsize; } */
+/* OBSOLETE #define READ_STRING_TABLE_SIZE(INTO)                                \ */
+/* OBSOLETE     { INTO = hdr.a_stsize; } */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro to declare variables to hold the file's header data.  *x/ */
-/* OBSOLETE #define DECLARE_FILE_HEADERS  struct old_exec hdr;		\ */
-/* OBSOLETE 			      FILHDR coffhdr */
+/* OBSOLETE #define DECLARE_FILE_HEADERS  struct old_exec hdr;          \ */
+/* OBSOLETE                           FILHDR coffhdr */
 /* OBSOLETE  */
 /* OBSOLETE /* Macro to read the header data from descriptor DESC and validate it. */
 /* OBSOLETE    NAME is the file name, for error messages.  *x/ */
-/* OBSOLETE #define READ_FILE_HEADERS(DESC, NAME)				\ */
-/* OBSOLETE { val = myread (DESC, &coffhdr, sizeof coffhdr);		\ */
-/* OBSOLETE   if (val < 0)							\ */
-/* OBSOLETE     perror_with_name (NAME);					\ */
-/* OBSOLETE   val = myread (DESC, &hdr, sizeof hdr);			\ */
-/* OBSOLETE   if (val < 0)							\ */
-/* OBSOLETE     perror_with_name (NAME);					\ */
-/* OBSOLETE   if (coffhdr.f_magic != GNP1MAGIC)				\ */
-/* OBSOLETE     error ("File \"%s\" not in coff executable format.", NAME);	\ */
-/* OBSOLETE   if (N_BADMAG (hdr))						\ */
+/* OBSOLETE #define READ_FILE_HEADERS(DESC, NAME)                               \ */
+/* OBSOLETE { val = myread (DESC, &coffhdr, sizeof coffhdr);            \ */
+/* OBSOLETE   if (val < 0)                                                      \ */
+/* OBSOLETE     perror_with_name (NAME);                                        \ */
+/* OBSOLETE   val = myread (DESC, &hdr, sizeof hdr);                    \ */
+/* OBSOLETE   if (val < 0)                                                      \ */
+/* OBSOLETE     perror_with_name (NAME);                                        \ */
+/* OBSOLETE   if (coffhdr.f_magic != GNP1MAGIC)                         \ */
+/* OBSOLETE     error ("File \"%s\" not in coff executable format.", NAME);     \ */
+/* OBSOLETE   if (N_BADMAG (hdr))                                               \ */
 /* OBSOLETE     error ("File \"%s\" not in executable format.", NAME); } */
 /* OBSOLETE  */
 /* OBSOLETE /* Define COFF and other symbolic names needed on NP1 *x/ */
-/* OBSOLETE #define	NS32GMAGIC	GDPMAGIC */
-/* OBSOLETE #define	NS32SMAGIC	PN_MAGIC */
+/* OBSOLETE #define     NS32GMAGIC      GDPMAGIC */
+/* OBSOLETE #define     NS32SMAGIC      PN_MAGIC */
 /* OBSOLETE  */
 /* OBSOLETE /* Offset from address of function to start of its code. */
 /* OBSOLETE    Zero on most machines.  *x/ */
-/* OBSOLETE #define FUNCTION_START_OFFSET	4 */
+/* OBSOLETE #define FUNCTION_START_OFFSET       4 */
 /* OBSOLETE  */
 /* OBSOLETE /* Advance PC across any function entry prologue instructions */
 /* OBSOLETE    to reach some "real" code.  One PN we can have one or two startup */
@@ -97,70 +97,70 @@
 /* OBSOLETE      or */
 /* OBSOLETE    Optional "stw r2,8(b3)"   (Gould first argument register passing) */
 /* OBSOLETE  *x/ */
-/* OBSOLETE #define SKIP_PROLOGUE(pc) { 						\ */
-/* OBSOLETE 	register int op = read_memory_integer ((pc), 4);		\ */
-/* OBSOLETE 	if ((op & 0xffff0000) == 0x580B0000) { 				\ */
-/* OBSOLETE 	    pc += 4;							\ */
-/* OBSOLETE 	    op = read_memory_integer ((pc), 4);				\ */
-/* OBSOLETE 	    if ((op & 0xffff0000) == 0x59400000) {			\ */
-/* OBSOLETE 		pc += 4;						\ */
-/* OBSOLETE 	        op = read_memory_integer ((pc), 4);			\ */
-/* OBSOLETE 		if ((op & 0xffff0000) == 0x5F000000) {			\ */
-/* OBSOLETE 		    pc += 4;						\ */
-/* OBSOLETE 	            op = read_memory_integer ((pc), 4);			\ */
-/* OBSOLETE 		    if (op == 0xD4820008) {				\ */
-/* OBSOLETE 		    	pc += 4;					\ */
-/* OBSOLETE 	            	op = read_memory_integer ((pc), 4);		\ */
-/* OBSOLETE 		    	if (op == 0x5582000C) {				\ */
-/* OBSOLETE 		    	    pc += 4;					\ */
-/* OBSOLETE 	                    op = read_memory_integer ((pc), 2);		\ */
-/* OBSOLETE 		            if (op == 0x2fa0) {				\ */
-/* OBSOLETE 		    	        pc += 2;				\ */
-/* OBSOLETE 		            } else {					\ */
-/* OBSOLETE 	                        op = read_memory_integer ((pc), 4);	\ */
-/* OBSOLETE 		                if (op == 0xd5030008) {			\ */
-/* OBSOLETE 		    	            pc += 4;				\ */
-/* OBSOLETE 		                }					\ */
-/* OBSOLETE 		            }						\ */
-/* OBSOLETE 		        } else {					\ */
-/* OBSOLETE 	                    op = read_memory_integer ((pc), 2);		\ */
-/* OBSOLETE 		            if (op == 0x2fa0) {				\ */
-/* OBSOLETE 		    	        pc += 2;				\ */
-/* OBSOLETE 		            }						\ */
-/* OBSOLETE 		        }						\ */
-/* OBSOLETE 		    }							\ */
-/* OBSOLETE 		}							\ */
-/* OBSOLETE 	    }								\ */
-/* OBSOLETE 	} 								\ */
-/* OBSOLETE 	if ((op & 0xffff0000) == 0x59000000) { 				\ */
-/* OBSOLETE 	    pc += 4;							\ */
-/* OBSOLETE 	    op = read_memory_integer ((pc), 4);				\ */
-/* OBSOLETE 	    if ((op & 0xffff0000) == 0x5F000000) {			\ */
-/* OBSOLETE 		pc += 4;						\ */
-/* OBSOLETE 	        op = read_memory_integer ((pc), 4);			\ */
-/* OBSOLETE 		if (op == 0xD4820008) {					\ */
-/* OBSOLETE 		    pc += 4;						\ */
-/* OBSOLETE 	            op = read_memory_integer ((pc), 4);			\ */
-/* OBSOLETE 		    if (op == 0x5582000C) {				\ */
-/* OBSOLETE 		    	pc += 4;					\ */
-/* OBSOLETE 	                op = read_memory_integer ((pc), 2);		\ */
-/* OBSOLETE 		        if (op == 0x2fa0) {				\ */
-/* OBSOLETE 		    	    pc += 2;					\ */
-/* OBSOLETE 		        } else {					\ */
-/* OBSOLETE 	                    op = read_memory_integer ((pc), 4);		\ */
-/* OBSOLETE 		            if (op == 0xd5030008) {			\ */
-/* OBSOLETE 		    	        pc += 4;				\ */
-/* OBSOLETE 		            }						\ */
-/* OBSOLETE 		        }						\ */
-/* OBSOLETE 		    } else {						\ */
-/* OBSOLETE 	                op = read_memory_integer ((pc), 2);		\ */
-/* OBSOLETE 		        if (op == 0x2fa0) {				\ */
-/* OBSOLETE 		    	    pc += 2;					\ */
-/* OBSOLETE 		        }						\ */
-/* OBSOLETE 		    }							\ */
-/* OBSOLETE 		}							\ */
-/* OBSOLETE 	    }								\ */
-/* OBSOLETE 	} 								\ */
+/* OBSOLETE #define SKIP_PROLOGUE(pc) {                                                 \ */
+/* OBSOLETE     register int op = read_memory_integer ((pc), 4);                \ */
+/* OBSOLETE     if ((op & 0xffff0000) == 0x580B0000) {                          \ */
+/* OBSOLETE         pc += 4;                                                    \ */
+/* OBSOLETE         op = read_memory_integer ((pc), 4);                         \ */
+/* OBSOLETE         if ((op & 0xffff0000) == 0x59400000) {                      \ */
+/* OBSOLETE             pc += 4;                                                \ */
+/* OBSOLETE             op = read_memory_integer ((pc), 4);                     \ */
+/* OBSOLETE             if ((op & 0xffff0000) == 0x5F000000) {                  \ */
+/* OBSOLETE                 pc += 4;                                            \ */
+/* OBSOLETE                 op = read_memory_integer ((pc), 4);                 \ */
+/* OBSOLETE                 if (op == 0xD4820008) {                             \ */
+/* OBSOLETE                     pc += 4;                                        \ */
+/* OBSOLETE                     op = read_memory_integer ((pc), 4);             \ */
+/* OBSOLETE                     if (op == 0x5582000C) {                         \ */
+/* OBSOLETE                         pc += 4;                                    \ */
+/* OBSOLETE                         op = read_memory_integer ((pc), 2);         \ */
+/* OBSOLETE                         if (op == 0x2fa0) {                         \ */
+/* OBSOLETE                             pc += 2;                                \ */
+/* OBSOLETE                         } else {                                    \ */
+/* OBSOLETE                             op = read_memory_integer ((pc), 4);     \ */
+/* OBSOLETE                             if (op == 0xd5030008) {                 \ */
+/* OBSOLETE                                 pc += 4;                            \ */
+/* OBSOLETE                             }                                       \ */
+/* OBSOLETE                         }                                           \ */
+/* OBSOLETE                     } else {                                        \ */
+/* OBSOLETE                         op = read_memory_integer ((pc), 2);         \ */
+/* OBSOLETE                         if (op == 0x2fa0) {                         \ */
+/* OBSOLETE                             pc += 2;                                \ */
+/* OBSOLETE                         }                                           \ */
+/* OBSOLETE                     }                                               \ */
+/* OBSOLETE                 }                                                   \ */
+/* OBSOLETE             }                                                       \ */
+/* OBSOLETE         }                                                           \ */
+/* OBSOLETE     }                                                               \ */
+/* OBSOLETE     if ((op & 0xffff0000) == 0x59000000) {                          \ */
+/* OBSOLETE         pc += 4;                                                    \ */
+/* OBSOLETE         op = read_memory_integer ((pc), 4);                         \ */
+/* OBSOLETE         if ((op & 0xffff0000) == 0x5F000000) {                      \ */
+/* OBSOLETE             pc += 4;                                                \ */
+/* OBSOLETE             op = read_memory_integer ((pc), 4);                     \ */
+/* OBSOLETE             if (op == 0xD4820008) {                                 \ */
+/* OBSOLETE                 pc += 4;                                            \ */
+/* OBSOLETE                 op = read_memory_integer ((pc), 4);                 \ */
+/* OBSOLETE                 if (op == 0x5582000C) {                             \ */
+/* OBSOLETE                     pc += 4;                                        \ */
+/* OBSOLETE                     op = read_memory_integer ((pc), 2);             \ */
+/* OBSOLETE                     if (op == 0x2fa0) {                             \ */
+/* OBSOLETE                         pc += 2;                                    \ */
+/* OBSOLETE                     } else {                                        \ */
+/* OBSOLETE                         op = read_memory_integer ((pc), 4);         \ */
+/* OBSOLETE                         if (op == 0xd5030008) {                     \ */
+/* OBSOLETE                             pc += 4;                                \ */
+/* OBSOLETE                         }                                           \ */
+/* OBSOLETE                     }                                               \ */
+/* OBSOLETE                 } else {                                            \ */
+/* OBSOLETE                     op = read_memory_integer ((pc), 2);             \ */
+/* OBSOLETE                     if (op == 0x2fa0) {                             \ */
+/* OBSOLETE                         pc += 2;                                    \ */
+/* OBSOLETE                     }                                               \ */
+/* OBSOLETE                 }                                                   \ */
+/* OBSOLETE             }                                                       \ */
+/* OBSOLETE         }                                                           \ */
+/* OBSOLETE     }                                                               \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* Immediately after a function call, return the saved pc. */
@@ -169,24 +169,24 @@
 /* OBSOLETE    some instructions.  True on PN!  Return address is in R1. */
 /* OBSOLETE    Note: true return location is 4 bytes past R1! *x/ */
 /* OBSOLETE #define SAVED_PC_AFTER_CALL(frame) \ */
-/* OBSOLETE 	(read_register(R1_REGNUM) + 4) */
+/* OBSOLETE     (read_register(R1_REGNUM) + 4) */
 /* OBSOLETE  */
 /* OBSOLETE /* Address of end of stack space.  *x/ */
-/* OBSOLETE #define STACK_END_ADDR 		0x480000 */
+/* OBSOLETE #define STACK_END_ADDR              0x480000 */
 /* OBSOLETE  */
 /* OBSOLETE /* Stack grows downward.  *x/ */
 /* OBSOLETE #define INNER_THAN(lhs,rhs) ((lhs) < (rhs)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Sequence of bytes for breakpoint instruction.  *x/ */
-/* OBSOLETE #define BREAKPOINT 		{0x28, 0x09} */
+/* OBSOLETE #define BREAKPOINT          {0x28, 0x09} */
 /* OBSOLETE  */
 /* OBSOLETE /* Amount PC must be decremented by after a breakpoint. */
 /* OBSOLETE    This is often the number of bytes in BREAKPOINT */
 /* OBSOLETE    but not always.  *x/ */
-/* OBSOLETE #define DECR_PC_AFTER_BREAK	2 */
+/* OBSOLETE #define DECR_PC_AFTER_BREAK 2 */
 /* OBSOLETE  */
 /* OBSOLETE /* Return 1 if P points to an invalid floating point value.  *x/ */
-/* OBSOLETE #define INVALID_FLOAT(p, len) 	((*(short *)p & 0xff80) == 0x8000) */
+/* OBSOLETE #define INVALID_FLOAT(p, len)       ((*(short *)p & 0xff80) == 0x8000) */
 /* OBSOLETE  */
 /* OBSOLETE /* Say how long (ordinary) registers are.  This is a piece of bogosity */
 /* OBSOLETE    used in push_word and a few other places; REGISTER_RAW_SIZE is the */
@@ -195,9 +195,9 @@
 /* OBSOLETE #define REGISTER_SIZE 4 */
 /* OBSOLETE  */
 /* OBSOLETE /* Number of machine registers *x/ */
-/* OBSOLETE #define NUM_REGS 		19 */
-/* OBSOLETE #define NUM_GEN_REGS		16 */
-/* OBSOLETE #define NUM_CPU_REGS		3 */
+/* OBSOLETE #define NUM_REGS            19 */
+/* OBSOLETE #define NUM_GEN_REGS                16 */
+/* OBSOLETE #define NUM_CPU_REGS                3 */
 /* OBSOLETE  */
 /* OBSOLETE /* Initializer for an array of names of registers. */
 /* OBSOLETE    There should be NUM_REGS strings in this initializer.  *x/ */
@@ -213,43 +213,43 @@
 /* OBSOLETE    and some are "phony" register numbers which are too large */
 /* OBSOLETE    to be actual register numbers as far as the user is concerned */
 /* OBSOLETE    but do serve to get the desired values when passed to read_register.  *x/ */
-/* OBSOLETE #define R1_REGNUM	1	/* Gr1 => return address of caller *x/ */
-/* OBSOLETE #define R4_REGNUM	4	/* Gr4 => register save area *x/ */
-/* OBSOLETE #define R5_REGNUM	5	/* Gr5 => register save area *x/ */
-/* OBSOLETE #define R6_REGNUM	6	/* Gr6 => register save area *x/ */
-/* OBSOLETE #define R7_REGNUM	7	/* Gr7 => register save area *x/ */
-/* OBSOLETE #define B1_REGNUM	9	/* Br1 => start of this code routine *x/ */
-/* OBSOLETE #define FP_REGNUM	10	/* Br2 == (sp) *x/ */
-/* OBSOLETE #define AP_REGNUM	11	/* Br3 == (ap) *x/ */
-/* OBSOLETE #define SP_REGNUM 	16	/* A copy of Br2 saved in trap *x/ */
-/* OBSOLETE #define PS_REGNUM 	17	/* Contains processor status *x/ */
-/* OBSOLETE #define PC_REGNUM 	18	/* Contains program counter *x/ */
+/* OBSOLETE #define R1_REGNUM   1       /* Gr1 => return address of caller *x/ */
+/* OBSOLETE #define R4_REGNUM   4       /* Gr4 => register save area *x/ */
+/* OBSOLETE #define R5_REGNUM   5       /* Gr5 => register save area *x/ */
+/* OBSOLETE #define R6_REGNUM   6       /* Gr6 => register save area *x/ */
+/* OBSOLETE #define R7_REGNUM   7       /* Gr7 => register save area *x/ */
+/* OBSOLETE #define B1_REGNUM   9       /* Br1 => start of this code routine *x/ */
+/* OBSOLETE #define FP_REGNUM   10      /* Br2 == (sp) *x/ */
+/* OBSOLETE #define AP_REGNUM   11      /* Br3 == (ap) *x/ */
+/* OBSOLETE #define SP_REGNUM   16      /* A copy of Br2 saved in trap *x/ */
+/* OBSOLETE #define PS_REGNUM   17      /* Contains processor status *x/ */
+/* OBSOLETE #define PC_REGNUM   18      /* Contains program counter *x/ */
 /* OBSOLETE  */
 /* OBSOLETE /* Total amount of space needed to store our copies of the machine's */
 /* OBSOLETE    register state, the array `registers'.  *x/ */
-/* OBSOLETE #define REGISTER_BYTES			(NUM_GEN_REGS*4 + NUM_CPU_REGS*4) */
+/* OBSOLETE #define REGISTER_BYTES                      (NUM_GEN_REGS*4 + NUM_CPU_REGS*4) */
 /* OBSOLETE  */
 /* OBSOLETE /* Index within `registers' of the first byte of the space for */
 /* OBSOLETE    register N.  *x/ */
-/* OBSOLETE #define REGISTER_BYTE(N)  		((N) * 4) */
+/* OBSOLETE #define REGISTER_BYTE(N)            ((N) * 4) */
 /* OBSOLETE  */
 /* OBSOLETE /* Number of bytes of storage in the actual machine representation */
 /* OBSOLETE    for register N.  On the PN, all normal regs are 4 bytes. *x/ */
-/* OBSOLETE #define REGISTER_RAW_SIZE(N) 		(4) */
+/* OBSOLETE #define REGISTER_RAW_SIZE(N)                (4) */
 /* OBSOLETE  */
 /* OBSOLETE /* Number of bytes of storage in the program's representation */
 /* OBSOLETE    for register N.  On the PN, all regs are 4 bytes. *x/ */
-/* OBSOLETE #define REGISTER_VIRTUAL_SIZE(N)	(4) */
+/* OBSOLETE #define REGISTER_VIRTUAL_SIZE(N)    (4) */
 /* OBSOLETE  */
 /* OBSOLETE /* Largest value REGISTER_RAW_SIZE can have.  *x/ */
-/* OBSOLETE #define MAX_REGISTER_RAW_SIZE		(4) */
+/* OBSOLETE #define MAX_REGISTER_RAW_SIZE               (4) */
 /* OBSOLETE  */
 /* OBSOLETE /* Largest value REGISTER_VIRTUAL_SIZE can have.  *x/ */
-/* OBSOLETE #define MAX_REGISTER_VIRTUAL_SIZE	(4) */
+/* OBSOLETE #define MAX_REGISTER_VIRTUAL_SIZE   (4) */
 /* OBSOLETE  */
 /* OBSOLETE /* Return the GDB type object for the "standard" data type */
 /* OBSOLETE    of data in register N.  *x/ */
-/* OBSOLETE #define REGISTER_VIRTUAL_TYPE(N)	(builtin_type_int) */
+/* OBSOLETE #define REGISTER_VIRTUAL_TYPE(N)    (builtin_type_int) */
 /* OBSOLETE  */
 /* OBSOLETE /* Store the address of the place in which to copy the structure the */
 /* OBSOLETE    subroutine will return.  This is called from call_function. */
@@ -264,13 +264,13 @@
 /* OBSOLETE    into VALBUF. *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \ */
-/* OBSOLETE 	memcpy (VALBUF, REGBUF, TYPE_LENGTH (TYPE)) */
+/* OBSOLETE     memcpy (VALBUF, REGBUF, TYPE_LENGTH (TYPE)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Write into appropriate registers a function return value */
 /* OBSOLETE    of type TYPE, given in virtual format.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define STORE_RETURN_VALUE(TYPE,VALBUF) \ */
-/* OBSOLETE 	write_register_bytes (0, VALBUF, TYPE_LENGTH (TYPE)) */
+/* OBSOLETE     write_register_bytes (0, VALBUF, TYPE_LENGTH (TYPE)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Extract from an array REGBUF containing the (raw) register state */
 /* OBSOLETE    the address in which a function should return its structure value, */
@@ -291,31 +291,31 @@
 /* OBSOLETE /* In the case of the NPL, the frame's norminal address is Br2 and the  */
 /* OBSOLETE    previous routines frame is up the stack X bytes, where X is the */
 /* OBSOLETE    value stored in the code function header xA(Br1). *x/ */
-/* OBSOLETE #define FRAME_CHAIN(thisframe)		(findframe(thisframe)) */
+/* OBSOLETE #define FRAME_CHAIN(thisframe)              (findframe(thisframe)) */
 /* OBSOLETE  */
 /* OBSOLETE extern int gould_frame_chain_valid PARAMS ((CORE_ADDR, struct frame_info *)); */
 /* OBSOLETE #define FRAME_CHAIN_VALID(chain, thisframe) gould_frame_chain_valid (chain, thisframe) */
 /* OBSOLETE  */
 /* OBSOLETE /* Define other aspects of the stack frame on NPL.  *x/ */
 /* OBSOLETE #define FRAME_SAVED_PC(frame) \ */
-/* OBSOLETE 	(read_memory_integer ((frame)->frame + 8, 4)) */
+/* OBSOLETE     (read_memory_integer ((frame)->frame + 8, 4)) */
 /* OBSOLETE  */
 /* OBSOLETE #define FRAME_ARGS_ADDRESS(fi) \ */
-/* OBSOLETE 	((fi)->next ? \ */
-/* OBSOLETE 	 read_memory_integer ((fi)->frame + 12, 4) : \ */
-/* OBSOLETE 	 read_register (AP_REGNUM)) */
+/* OBSOLETE     ((fi)->next ? \ */
+/* OBSOLETE      read_memory_integer ((fi)->frame + 12, 4) : \ */
+/* OBSOLETE      read_register (AP_REGNUM)) */
 /* OBSOLETE  */
-/* OBSOLETE #define FRAME_LOCALS_ADDRESS(fi)	((fi)->frame + 80) */
+/* OBSOLETE #define FRAME_LOCALS_ADDRESS(fi)    ((fi)->frame + 80) */
 /* OBSOLETE  */
 /* OBSOLETE /* Set VAL to the number of args passed to frame described by FI. */
 /* OBSOLETE    Can set VAL to -1, meaning no way to tell.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE /* We can check the stab info to see how */
 /* OBSOLETE    many arg we have.  No info in stack will tell us *x/ */
-/* OBSOLETE #define FRAME_NUM_ARGS(fi)		(findarg(fi)) */
+/* OBSOLETE #define FRAME_NUM_ARGS(fi)          (findarg(fi)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Return number of bytes at start of arglist that are not really args.  *x/ */
-/* OBSOLETE #define FRAME_ARGS_SKIP			8 */
+/* OBSOLETE #define FRAME_ARGS_SKIP                     8 */
 /* OBSOLETE  */
 /* OBSOLETE /* Put here the code to store, into a struct frame_saved_regs, */
 /* OBSOLETE    the addresses of the saved registers of frame described by FRAME_INFO. */
@@ -323,14 +323,14 @@
 /* OBSOLETE    ways in the stack frame.  sp is even more special: */
 /* OBSOLETE    the address we return for it IS the sp for the next frame.  *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)		\ */
+/* OBSOLETE #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)         \ */
 /* OBSOLETE {                                                                       \ */
-/* OBSOLETE   memset (&frame_saved_regs, '\0', sizeof frame_saved_regs);			\ */
-/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 8;		\ */
-/* OBSOLETE   (frame_saved_regs).regs[R4_REGNUM] = (frame_info)->frame + 0x30;	\ */
-/* OBSOLETE   (frame_saved_regs).regs[R5_REGNUM] = (frame_info)->frame + 0x34;	\ */
-/* OBSOLETE   (frame_saved_regs).regs[R6_REGNUM] = (frame_info)->frame + 0x38;	\ */
-/* OBSOLETE   (frame_saved_regs).regs[R7_REGNUM] = (frame_info)->frame + 0x3C;	\ */
+/* OBSOLETE   memset (&frame_saved_regs, '\0', sizeof frame_saved_regs);                        \ */
+/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 8;             \ */
+/* OBSOLETE   (frame_saved_regs).regs[R4_REGNUM] = (frame_info)->frame + 0x30;  \ */
+/* OBSOLETE   (frame_saved_regs).regs[R5_REGNUM] = (frame_info)->frame + 0x34;  \ */
+/* OBSOLETE   (frame_saved_regs).regs[R6_REGNUM] = (frame_info)->frame + 0x38;  \ */
+/* OBSOLETE   (frame_saved_regs).regs[R7_REGNUM] = (frame_info)->frame + 0x3C;  \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* Things needed for making the inferior call functions.  *x/ */
@@ -338,36 +338,36 @@
 /* OBSOLETE /* Push an empty stack frame, to record the current PC, etc.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define PUSH_DUMMY_FRAME \ */
-/* OBSOLETE { register CORE_ADDR sp = read_register (SP_REGNUM);			\ */
-/* OBSOLETE   register int regnum;							\ */
-/* OBSOLETE   sp = push_word (sp, read_register (PC_REGNUM));			\ */
-/* OBSOLETE   sp = push_word (sp, read_register (FP_REGNUM));			\ */
-/* OBSOLETE   write_register (FP_REGNUM, sp);					\ */
-/* OBSOLETE   for (regnum = FP_REGNUM - 1; regnum >= 0; regnum--)			\ */
-/* OBSOLETE     sp = push_word (sp, read_register (regnum));			\ */
-/* OBSOLETE   sp = push_word (sp, read_register (PS_REGNUM));			\ */
+/* OBSOLETE { register CORE_ADDR sp = read_register (SP_REGNUM);                        \ */
+/* OBSOLETE   register int regnum;                                                      \ */
+/* OBSOLETE   sp = push_word (sp, read_register (PC_REGNUM));                   \ */
+/* OBSOLETE   sp = push_word (sp, read_register (FP_REGNUM));                   \ */
+/* OBSOLETE   write_register (FP_REGNUM, sp);                                   \ */
+/* OBSOLETE   for (regnum = FP_REGNUM - 1; regnum >= 0; regnum--)                       \ */
+/* OBSOLETE     sp = push_word (sp, read_register (regnum));                    \ */
+/* OBSOLETE   sp = push_word (sp, read_register (PS_REGNUM));                   \ */
 /* OBSOLETE   write_register (SP_REGNUM, sp);  } */
 /* OBSOLETE  */
 /* OBSOLETE /* Discard from the stack the innermost frame,  */
 /* OBSOLETE    restoring all saved registers.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define POP_FRAME  \ */
-/* OBSOLETE { register struct frame_info *frame = get_current_frame ();	 \ */
-/* OBSOLETE   register CORE_ADDR fp;					 \ */
-/* OBSOLETE   register int regnum;						 \ */
-/* OBSOLETE   struct frame_saved_regs fsr;					 \ */
-/* OBSOLETE   struct frame_info *fi;					 \ */
-/* OBSOLETE   fp = frame->frame;						 \ */
-/* OBSOLETE   get_frame_saved_regs (frame, &fsr);				 \ */
-/* OBSOLETE   for (regnum = FP_REGNUM - 1; regnum >= 0; regnum--)		 \ */
-/* OBSOLETE     if (fsr.regs[regnum])					 \ */
+/* OBSOLETE { register struct frame_info *frame = get_current_frame ();  \ */
+/* OBSOLETE   register CORE_ADDR fp;                                     \ */
+/* OBSOLETE   register int regnum;                                               \ */
+/* OBSOLETE   struct frame_saved_regs fsr;                                       \ */
+/* OBSOLETE   struct frame_info *fi;                                     \ */
+/* OBSOLETE   fp = frame->frame;                                                 \ */
+/* OBSOLETE   get_frame_saved_regs (frame, &fsr);                                \ */
+/* OBSOLETE   for (regnum = FP_REGNUM - 1; regnum >= 0; regnum--)                \ */
+/* OBSOLETE     if (fsr.regs[regnum])                                    \ */
 /* OBSOLETE       write_register (regnum, read_memory_integer (fsr.regs[regnum], 4)); \ */
-/* OBSOLETE   if (fsr.regs[PS_REGNUM])					 \ */
+/* OBSOLETE   if (fsr.regs[PS_REGNUM])                                   \ */
 /* OBSOLETE     write_register (PS_REGNUM, read_memory_integer (fsr.regs[PS_REGNUM], 4)); \ */
-/* OBSOLETE   write_register (FP_REGNUM, read_memory_integer (fp, 4));	 \ */
+/* OBSOLETE   write_register (FP_REGNUM, read_memory_integer (fp, 4));   \ */
 /* OBSOLETE   write_register (PC_REGNUM, read_memory_integer (fp + 4, 4));   \ */
-/* OBSOLETE   write_register (SP_REGNUM, fp + 8);				 \ */
-/* OBSOLETE   flush_cached_frames ();					 \ */
+/* OBSOLETE   write_register (SP_REGNUM, fp + 8);                                \ */
+/* OBSOLETE   flush_cached_frames ();                                    \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* This sequence of words is the instructions: */
@@ -375,19 +375,19 @@
 /* OBSOLETE      halt */
 /* OBSOLETE      halt */
 /* OBSOLETE      halt */
-/* OBSOLETE      suabr	b2, #<stacksize> */
-/* OBSOLETE      lwbr	b6, #con */
-/* OBSOLETE      stw	r1, 8(b2)	- save caller address, do we care? */
-/* OBSOLETE      lw		r2, 60(b2)	- arg1 */
-/* OBSOLETE      labr	b3, 50(b2) */
-/* OBSOLETE      std	r4, 30(b2)	- save r4-r7 */
-/* OBSOLETE      std	r6, 38(b2) */
-/* OBSOLETE      lwbr	b1, #<func>	- load function call address */
-/* OBSOLETE      brlnk	r1, 8(b1)	- call function */
+/* OBSOLETE      suabr  b2, #<stacksize> */
+/* OBSOLETE      lwbr   b6, #con */
+/* OBSOLETE      stw    r1, 8(b2)       - save caller address, do we care? */
+/* OBSOLETE      lw             r2, 60(b2)      - arg1 */
+/* OBSOLETE      labr   b3, 50(b2) */
+/* OBSOLETE      std    r4, 30(b2)      - save r4-r7 */
+/* OBSOLETE      std    r6, 38(b2) */
+/* OBSOLETE      lwbr   b1, #<func>     - load function call address */
+/* OBSOLETE      brlnk  r1, 8(b1)       - call function */
 /* OBSOLETE      halt */
 /* OBSOLETE      halt */
-/* OBSOLETE      ld		r4, 30(b2)	- restore r4-r7 */
-/* OBSOLETE      ld		r6, 38(b2) */
+/* OBSOLETE      ld             r4, 30(b2)      - restore r4-r7 */
+/* OBSOLETE      ld             r6, 38(b2) */
 /* OBSOLETE  */
 /* OBSOLETE    Setup our stack frame, load argumemts, call and then restore registers. */
 /* OBSOLETE *x/ */
diff --git a/gdb/config/gould/xm-np1.h b/gdb/config/gould/xm-np1.h
index 63bc4501d9f..b7af92c8b1e 100644
--- a/gdb/config/gould/xm-np1.h
+++ b/gdb/config/gould/xm-np1.h
@@ -20,20 +20,20 @@
 /* OBSOLETE #define HOST_BYTE_ORDER BIG_ENDIAN */
 /* OBSOLETE  */
 /* OBSOLETE /* Address of U in kernel space *x/ */
-/* OBSOLETE #define	KERNEL_U_ADDR		0x7fffc000 */
+/* OBSOLETE #define     KERNEL_U_ADDR           0x7fffc000 */
 /* OBSOLETE  */
 /* OBSOLETE /* This is a piece of magic that is given a register number REGNO */
 /* OBSOLETE    and as BLOCKEND the address in the system of the end of the user structure */
 /* OBSOLETE    and stores in ADDR the address in the kernel or core dump */
 /* OBSOLETE    of that register. *x/ */
-/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno) {			\ */
-/* OBSOLETE 	addr = blockend + regno * 4;					\ */
-/* OBSOLETE 	if (regno == VE_REGNUM) addr = blockend - 9 * 4;		\ */
-/* OBSOLETE 	if (regno == PC_REGNUM) addr = blockend - 8 * 4;		\ */
-/* OBSOLETE 	if (regno == PS_REGNUM) addr = blockend - 7 * 4;		\ */
-/* OBSOLETE 	if (regno == FP_REGNUM) addr = blockend - 6 * 4;		\ */
-/* OBSOLETE 	if (regno >= V1_REGNUM) 					\ */
-/* OBSOLETE 	    addr = blockend + 16 * 4 + (regno - V1_REGNUM) * VR_SIZE;	\ */
+/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno) {                    \ */
+/* OBSOLETE     addr = blockend + regno * 4;                                    \ */
+/* OBSOLETE     if (regno == VE_REGNUM) addr = blockend - 9 * 4;                \ */
+/* OBSOLETE     if (regno == PC_REGNUM) addr = blockend - 8 * 4;                \ */
+/* OBSOLETE     if (regno == PS_REGNUM) addr = blockend - 7 * 4;                \ */
+/* OBSOLETE     if (regno == FP_REGNUM) addr = blockend - 6 * 4;                \ */
+/* OBSOLETE     if (regno >= V1_REGNUM)                                         \ */
+/* OBSOLETE         addr = blockend + 16 * 4 + (regno - V1_REGNUM) * VR_SIZE;   \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* Don't try to write the frame pointer.  *x/ */
@@ -80,8 +80,8 @@
 /* OBSOLETE    The fault code will be on the stack beyond the last register.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define PUSH_REGISTERS        \ */
-/* OBSOLETE { asm ("clrw -(sp)");	      \ */
-/* OBSOLETE   asm ("pea 10(sp)");	      \ */
+/* OBSOLETE { asm ("clrw -(sp)");             \ */
+/* OBSOLETE   asm ("pea 10(sp)");             \ */
 /* OBSOLETE   asm ("movem $ 0xfffe,-(sp)"); } */
 /* OBSOLETE  */
 /* OBSOLETE /* Assuming the registers (including processor status) have been */
diff --git a/gdb/config/gould/xm-pn.h b/gdb/config/gould/xm-pn.h
index 2540cfc1203..a59588b7958 100644
--- a/gdb/config/gould/xm-pn.h
+++ b/gdb/config/gould/xm-pn.h
@@ -20,17 +20,17 @@
 /* OBSOLETE #define HOST_BYTE_ORDER BIG_ENDIAN */
 /* OBSOLETE  */
 /* OBSOLETE /* Address of U in kernel space *x/ */
-/* OBSOLETE #define	KERNEL_U_ADDR		0x3fc000 */
+/* OBSOLETE #define     KERNEL_U_ADDR           0x3fc000 */
 /* OBSOLETE  */
 /* OBSOLETE /* This is a piece of magic that is given a register number REGNO */
 /* OBSOLETE    and as BLOCKEND the address in the system of the end of the user structure */
 /* OBSOLETE    and stores in ADDR the address in the kernel or core dump */
 /* OBSOLETE    of that register. *x/ */
-/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno) {			\ */
-/* OBSOLETE 	addr = blockend + regno * 4;					\ */
-/* OBSOLETE 	if (regno == PC_REGNUM) addr = blockend - 8 * 4;		\ */
-/* OBSOLETE 	if (regno == PS_REGNUM) addr = blockend - 7 * 4;		\ */
-/* OBSOLETE 	if (regno == SP_REGNUM) addr = blockend - 6 * 4;		\ */
+/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno) {                    \ */
+/* OBSOLETE     addr = blockend + regno * 4;                                    \ */
+/* OBSOLETE     if (regno == PC_REGNUM) addr = blockend - 8 * 4;                \ */
+/* OBSOLETE     if (regno == PS_REGNUM) addr = blockend - 7 * 4;                \ */
+/* OBSOLETE     if (regno == SP_REGNUM) addr = blockend - 6 * 4;                \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* No KDB support, Yet! *x/ */
@@ -73,8 +73,8 @@
 /* OBSOLETE    The fault code will be on the stack beyond the last register.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define PUSH_REGISTERS        \ */
-/* OBSOLETE { asm ("clrw -(sp)");	      \ */
-/* OBSOLETE   asm ("pea 10(sp)");	      \ */
+/* OBSOLETE { asm ("clrw -(sp)");             \ */
+/* OBSOLETE   asm ("pea 10(sp)");             \ */
 /* OBSOLETE   asm ("movem $ 0xfffe,-(sp)"); } */
 /* OBSOLETE  */
 /* OBSOLETE /* Assuming the registers (including processor status) have been */
diff --git a/gdb/config/h8300/tm-h8300.h b/gdb/config/h8300/tm-h8300.h
index b402181905d..5ca6f8745df 100644
--- a/gdb/config/h8300/tm-h8300.h
+++ b/gdb/config/h8300/tm-h8300.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a H8/300 series machine.
    Copyright 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Contributed by Steve Chamberlain sac@cygnus.com */
 
@@ -84,9 +85,9 @@ extern CORE_ADDR h8300_skip_prologue ();
 
 #define INNER_THAN(lhs,rhs) ((lhs) < (rhs))
 
-/*#define BREAKPOINT {0x7A, 0xFF}*/
-#define BREAKPOINT {0x01, 0x80}  /* Sleep */
-#define REMOTE_BREAKPOINT { 0x57, 0x30}  /* trapa #3 */
+/*#define BREAKPOINT {0x7A, 0xFF} */
+#define BREAKPOINT {0x01, 0x80}	/* Sleep */
+#define REMOTE_BREAKPOINT { 0x57, 0x30}		/* trapa #3 */
 /* If your kernel resets the pc after the trap happens you may need to
    define this before including this file.    */
 
@@ -96,7 +97,7 @@ extern CORE_ADDR h8300_skip_prologue ();
 
 #define REGISTER_SIZE 4
 
-#define NUM_REGS 13  
+#define NUM_REGS 13
 
 #define REGISTER_BYTES (NUM_REGS * 4)
 
@@ -160,7 +161,7 @@ extern char **h8300_register_names;
 
 /* FIXME: Won't work with both h8/300's.  */
 
-extern void h8300_extract_return_value PARAMS((struct type *, char *, char *));
+extern void h8300_extract_return_value PARAMS ((struct type *, char *, char *));
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
     h8300_extract_return_value (TYPE, (char *)(REGBUF), (char *)(VALBUF))
 
@@ -169,7 +170,7 @@ extern void h8300_extract_return_value PARAMS((struct type *, char *, char *));
    in d0/d1.  */
 /* FIXME: Won't work with both h8/300's.  */
 
-extern void h8300_store_return_value PARAMS((struct type *, char *));
+extern void h8300_store_return_value PARAMS ((struct type *, char *));
 #define STORE_RETURN_VALUE(TYPE,VALBUF) \
     h8300_store_return_value(TYPE, (char *) (VALBUF))
 
@@ -186,7 +187,7 @@ extern void h8300_store_return_value PARAMS((struct type *, char *));
 #define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) \
      extract_address (REGBUF + REGISTER_BYTE (0), \
 		      REGISTER_RAW_SIZE (0))
-     
+
 /* Describe the pointer in each stack frame to the previous stack frame
    (its caller).  */
 
@@ -225,7 +226,7 @@ CORE_ADDR h8300_frame_chain PARAMS ((struct frame_info *));
    SAVED FP   <-FP POINTS HERE
    LOCALS0
    LOCALS1    <-SP POINTS HERE
-   */
+ */
 
 #define FRAME_SAVED_PC(FRAME) h8300_frame_saved_pc(FRAME)
 
@@ -263,7 +264,7 @@ typedef unsigned short INSN_WORD;
 #define GDB_TARGET_IS_H8300
 
 #define NUM_REALREGS 10
-#define NOP { 0x01, 0x80} /* A sleep insn */
+#define NOP { 0x01, 0x80}	/* A sleep insn */
 
 #define BELIEVE_PCC_PROMOTION 1
 
@@ -279,8 +280,8 @@ typedef unsigned short INSN_WORD;
 #define CALL_DUMMY_START_OFFSET		(0)
 #define CALL_DUMMY_BREAKPOINT_OFFSET	(0)
 
-extern CORE_ADDR h8300_push_arguments PARAMS ((int nargs, 
-					       struct value **args, 
+extern CORE_ADDR h8300_push_arguments PARAMS ((int nargs,
+					       struct value ** args,
 					       CORE_ADDR sp,
 					       unsigned char struct_return,
 					       CORE_ADDR struct_addr));
@@ -300,6 +301,3 @@ extern CORE_ADDR h8300_push_return_address PARAMS ((CORE_ADDR, CORE_ADDR));
    one that takes account of generic CALL_DUMMY frames */
 #define GET_SAVED_REGISTER(raw_buffer, optimized, addrp, frame, regnum, lval) \
      generic_get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval)
-
-
-
diff --git a/gdb/config/h8500/tm-h8500.h b/gdb/config/h8500/tm-h8500.h
index 46ce2c3be9e..eb21a5c6fb1 100644
--- a/gdb/config/h8500/tm-h8500.h
+++ b/gdb/config/h8500/tm-h8500.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a H8/500 series machine.
    Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Contributed by Steve Chamberlain sac@cygnus.com */
 
@@ -74,7 +75,7 @@ extern CORE_ADDR saved_pc_after_call PARAMS ((void));
 
 /* Say how much memory is needed to store a copy of the register set */
 
-#define REGISTER_BYTES    (NUM_REGS * 4) 
+#define REGISTER_BYTES    (NUM_REGS * 4)
 
 /* Index within `registers' of the first byte of the space for
    register N.  */
@@ -148,8 +149,8 @@ extern struct type *h8500_register_virtual_type PARAMS ((int regno));
 
 #define NUM_REGS 	22
 
-#define SP_REGNUM       PR7_REGNUM /* Contains address of top of stack */
-#define FP_REGNUM       PR6_REGNUM /* Contains address of executing stack frame */
+#define SP_REGNUM       PR7_REGNUM	/* Contains address of top of stack */
+#define FP_REGNUM       PR6_REGNUM	/* Contains address of executing stack frame */
 
 #define PTR_SIZE (minimum_mode ? 2 : 4)
 #define PTR_MASK (minimum_mode ? 0x0000ffff : 0x00ffffff)
@@ -158,7 +159,7 @@ extern struct type *h8500_register_virtual_type PARAMS ((int regno));
    subroutine will return.  This is called from call_function. */
 
 /*#define STORE_STRUCT_RETURN(ADDR, SP) \
-  { write_register (0, (ADDR)); abort(); }*/
+   { write_register (0, (ADDR)); abort(); } */
 
 /* Extract from an array REGBUF containing the (raw) register state
    a function return value of type TYPE, and copy that, in virtual format,
@@ -178,8 +179,8 @@ extern struct type *h8500_register_virtual_type PARAMS ((int regno));
    as a CORE_ADDR (or an expression that can be used as one).  */
 
 #define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) (*(CORE_ADDR *)(REGBUF))
-
 
+
 /* Define other aspects of the stack frame.  */
 
 /* A macro that tells us whether the function invocation represented
@@ -198,18 +199,18 @@ extern struct type *h8500_register_virtual_type PARAMS ((int regno));
    SAVED FP   <-FP POINTS HERE
    LOCALS0
    LOCALS1    <-SP POINTS HERE
-   
-   */
+
+ */
 
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fci)  ;
-/*       (fci)->frame |= read_register(SEG_T_REGNUM) << 16;*/
+/*       (fci)->frame |= read_register(SEG_T_REGNUM) << 16; */
 
 #define FRAME_CHAIN(FRAME) h8500_frame_chain(FRAME)
 struct frame_info;
 extern CORE_ADDR h8500_frame_chain PARAMS ((struct frame_info *));
 
 #define FRAME_SAVED_PC(FRAME) frame_saved_pc(FRAME)
-extern CORE_ADDR frame_saved_pc PARAMS ((struct frame_info *frame));
+extern CORE_ADDR frame_saved_pc PARAMS ((struct frame_info * frame));
 
 #define FRAME_ARGS_ADDRESS(fi) ((fi)->frame)
 
@@ -236,7 +237,7 @@ extern CORE_ADDR frame_saved_pc PARAMS ((struct frame_info *frame));
 #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)	    \
    frame_find_saved_regs(frame_info, &(frame_saved_regs))
 struct frame_saved_regs;
-extern void frame_find_saved_regs PARAMS ((struct frame_info *frame_info, struct frame_saved_regs *frame_saved_regs));
+extern void frame_find_saved_regs PARAMS ((struct frame_info * frame_info, struct frame_saved_regs * frame_saved_regs));
 
 
 /* Discard from the stack the innermost frame, restoring all registers.  */
@@ -267,10 +268,10 @@ extern int minimum_mode;
 extern int h8500_is_trapped_internalvar PARAMS ((char *name));
 
 #define VALUE_OF_TRAPPED_INTERNALVAR h8500_value_of_trapped_internalvar
-extern struct value * h8500_value_of_trapped_internalvar (/* struct internalvar *var */);
+extern struct value *h8500_value_of_trapped_internalvar ( /* struct internalvar *var */ );
 
 #define SET_TRAPPED_INTERNALVAR h8500_set_trapped_internalvar
-extern void h8500_set_trapped_internalvar (/* struct internalvar *var, value newval, int bitpos, int bitsize, int offset */);
+extern void h8500_set_trapped_internalvar ( /* struct internalvar *var, value newval, int bitpos, int bitsize, int offset */ );
 
 extern CORE_ADDR h8500_read_sp PARAMS ((void));
 extern void h8500_write_sp PARAMS ((CORE_ADDR));
diff --git a/gdb/config/i386/nm-fbsd.h b/gdb/config/i386/nm-fbsd.h
index 727623c0a40..a2d1e3d1da4 100644
--- a/gdb/config/i386/nm-fbsd.h
+++ b/gdb/config/i386/nm-fbsd.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Intel 386 running BSD Unix, for GDB.
    Copyright 1986, 1987, 1989, 1992, 1996 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.  */
+   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.  */
 
 #ifndef NM_FREEBSD_H
 #define NM_FREEBSD_H
diff --git a/gdb/config/i386/nm-gnu.h b/gdb/config/i386/nm-gnu.h
index 95f25a52e3d..86dc51a6de8 100644
--- a/gdb/config/i386/nm-gnu.h
+++ b/gdb/config/i386/nm-gnu.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Intel 386 running the GNU Hurd
    Copyright 1994, 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 the generic hurd definitions.  */
 
diff --git a/gdb/config/i386/nm-go32.h b/gdb/config/i386/nm-go32.h
index 183b60fa181..ba79c1b0ea9 100644
--- a/gdb/config/i386/nm-go32.h
+++ b/gdb/config/i386/nm-go32.h
@@ -1,21 +1,22 @@
 /* Native definitions for Intel x86 running DJGPP.
    Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define NO_PTRACE_H
 
@@ -44,7 +45,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define target_insert_hw_breakpoint(addr, shadow)  \
   go32_insert_hw_breakpoint(addr, shadow)
-  
+
 #define target_remove_hw_breakpoint(addr, shadow)  \
   go32_remove_hw_breakpoint(addr, shadow)
 
@@ -54,4 +55,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define FLOAT_INFO { i386_go32_float_info (); }
 
 extern void i386_go32_float_info (void);
-
diff --git a/gdb/config/i386/nm-i386aix.h b/gdb/config/i386/nm-i386aix.h
index 42403939637..4a6ffc1acfa 100644
--- a/gdb/config/i386/nm-i386aix.h
+++ b/gdb/config/i386/nm-i386aix.h
@@ -1,25 +1,26 @@
 /* Native support for i386 aix ps/2.
    Copyright 1986, 1987, 1989, 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /*
  * Changes for IBM AIX PS/2 by Minh Tran-Le (tranle@intellicorp.com)
- * Revision:	 5-May-93 00:11:35
+ * Revision:     5-May-93 00:11:35
  */
 
 #ifndef NM_I386AIX_H
diff --git a/gdb/config/i386/nm-i386bsd.h b/gdb/config/i386/nm-i386bsd.h
index 7366f2d17bf..41a414c76ba 100644
--- a/gdb/config/i386/nm-i386bsd.h
+++ b/gdb/config/i386/nm-i386bsd.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Intel 386 running BSD Unix, for GDB.
    Copyright 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_I386BSD_H
 #define NM_I386BSD_H
@@ -26,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <machine/vmparam.h>
 #define KERNEL_U_ADDR USRSTACK
 
-#undef FLOAT_INFO	/* No float info yet */
+#undef FLOAT_INFO		/* No float info yet */
 
 #define REGISTER_U_ADDR(addr, blockend, regno) \
 	(addr) = i386_register_u_addr ((blockend),(regno));
diff --git a/gdb/config/i386/nm-i386lynx.h b/gdb/config/i386/nm-i386lynx.h
index e29821f29dd..5d0d41de267 100644
--- a/gdb/config/i386/nm-i386lynx.h
+++ b/gdb/config/i386/nm-i386lynx.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Intel 386 running LynxOS.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_I386LYNX_H
 #define NM_I386LYNX_H
diff --git a/gdb/config/i386/nm-i386mach.h b/gdb/config/i386/nm-i386mach.h
index f01d2b142b1..be1152ed20b 100644
--- a/gdb/config/i386/nm-i386mach.h
+++ b/gdb/config/i386/nm-i386mach.h
@@ -1,24 +1,25 @@
 /* Native definitions for Mach on an Intel 386
    Copyright (C) 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Do implement the attach and detach commands.  */
-/* #define ATTACH_DETACH	1 */
+/* #define ATTACH_DETACH        1 */
 
 /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
 #define FETCH_INFERIOR_REGISTERS
diff --git a/gdb/config/i386/nm-i386sco.h b/gdb/config/i386/nm-i386sco.h
index 33ab6de4060..5b56ad6e21b 100644
--- a/gdb/config/i386/nm-i386sco.h
+++ b/gdb/config/i386/nm-i386sco.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
    Changes for 80386 by Pace Willisson (pace@prep.ai.mit.edu), July 1988.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #if 0
 /* code to execute to print interesting information about the
@@ -27,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    do this unless we *know* we aren't cross-debugging.  FIXME.
  */
 #define FLOAT_INFO { i386_float_info (); }
-#endif /*0*/
+#endif /*0 */
 
 #define REGISTER_U_ADDR(addr, blockend, regno) \
 	(addr) = i386_register_u_addr ((blockend),(regno));
diff --git a/gdb/config/i386/nm-i386sco4.h b/gdb/config/i386/nm-i386sco4.h
index 41daef5b926..6947f3febb1 100644
--- a/gdb/config/i386/nm-i386sco4.h
+++ b/gdb/config/i386/nm-i386sco4.h
@@ -3,21 +3,22 @@
    Contributed by Cygnus Support.  By Ian Lance Taylor
    <ian@cygnus.com> based on work by Martin Walker <maw@netcom.com>.
 
-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.  */
+   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.  */
 
 /* SCO 3.2v4 is actually just like SCO 3.2v2, except that it
    additionally supports attaching to a process.  */
diff --git a/gdb/config/i386/nm-i386sco5.h b/gdb/config/i386/nm-i386sco5.h
index 155336cb13c..db2880c01ba 100644
--- a/gdb/config/i386/nm-i386sco5.h
+++ b/gdb/config/i386/nm-i386sco5.h
@@ -5,28 +5,29 @@
    work by Ian Lance Taylor <ian@cygnus.com> and 
    Martin Walker <maw@netcom.com>.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Basically, its a lot like the older versions ... */
 #include "i386/nm-i386sco.h"
 
 /* ... but it can do a lot of SVR4 type stuff too. */
 #define SVR4_SHARED_LIBS
-#include "solib.h" /* Pick up shared library support */
+#include "solib.h"		/* Pick up shared library support */
 
 #define ATTACH_DETACH
 
@@ -35,5 +36,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define PTRACE_ATTACH 10
 #define PTRACE_DETACH 11
-
-
diff --git a/gdb/config/i386/nm-i386sol2.h b/gdb/config/i386/nm-i386sol2.h
index 2ae966ca52a..68d61fcbbd7 100644
--- a/gdb/config/i386/nm-i386sol2.h
+++ b/gdb/config/i386/nm-i386sol2.h
@@ -1,21 +1,22 @@
 /* Native support for i386 running Solaris 2.
    Copyright 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "nm-sysv4.h"
 
@@ -27,7 +28,7 @@ struct objfile;
 
 #define target_new_objfile(OBJFILE) sol_thread_new_objfile (OBJFILE)
 
-void sol_thread_new_objfile PARAMS ((struct objfile *objfile));
+void sol_thread_new_objfile PARAMS ((struct objfile * objfile));
 
 #define FIND_NEW_THREADS sol_find_new_threads
 void sol_find_new_threads PARAMS ((void));
diff --git a/gdb/config/i386/nm-i386v.h b/gdb/config/i386/nm-i386v.h
index 8e6877e7a44..76b526b5015 100644
--- a/gdb/config/i386/nm-i386v.h
+++ b/gdb/config/i386/nm-i386v.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
    Changes for 80386 by Pace Willisson (pace@prep.ai.mit.edu), July 1988.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #if 0
 /* code to execute to print interesting information about the
@@ -27,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    do this unless we *know* we aren't cross-debugging.  FIXME.
  */
 #define FLOAT_INFO { i386_float_info (); }
-#endif /*0*/
+#endif /*0 */
 
 #define REGISTER_U_ADDR(addr, blockend, regno) \
 	(addr) = i386_register_u_addr ((blockend),(regno));
diff --git a/gdb/config/i386/nm-i386v4.h b/gdb/config/i386/nm-i386v4.h
index 8722a40b131..9d9aed6ad24 100644
--- a/gdb/config/i386/nm-i386v4.h
+++ b/gdb/config/i386/nm-i386v4.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1989, 1992, 1996 Free Software Foundation, Inc.
    Changes for 80386 by Pace Willisson (pace@prep.ai.mit.edu), July 1988.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "nm-sysv4.h"
 
diff --git a/gdb/config/i386/nm-i386v42mp.h b/gdb/config/i386/nm-i386v42mp.h
index 6ffd128d4b7..7f4161e9a27 100644
--- a/gdb/config/i386/nm-i386v42mp.h
+++ b/gdb/config/i386/nm-i386v42mp.h
@@ -2,21 +2,21 @@
    Copyright 1986, 1987, 1989, 1992, 1996 Free Software Foundation, Inc.
    Changes for 80386 by Pace Willisson (pace@prep.ai.mit.edu), July 1988.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "nm-sysv4.h"
-
diff --git a/gdb/config/i386/nm-linux.h b/gdb/config/i386/nm-linux.h
index ad0b8db716c..d3238386b69 100644
--- a/gdb/config/i386/nm-linux.h
+++ b/gdb/config/i386/nm-linux.h
@@ -2,21 +2,22 @@
    Copyright (C) 1986, 1987, 1989, 1992, 1996, 1998
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_LINUX_H
 #define NM_LINUX_H
@@ -64,7 +65,7 @@ extern int kernel_u_size PARAMS ((void));
 #endif
 
 extern CORE_ADDR
-i386_stopped_by_watchpoint PARAMS ((int));
+  i386_stopped_by_watchpoint PARAMS ((int));
 extern int
 i386_insert_watchpoint PARAMS ((int pid, CORE_ADDR addr, int len, int rw));
 extern int
diff --git a/gdb/config/i386/nm-m3.h b/gdb/config/i386/nm-m3.h
index 51270917422..00128cf9ce8 100644
--- a/gdb/config/i386/nm-m3.h
+++ b/gdb/config/i386/nm-m3.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Intel 386 running Mach 3.
    Copyright 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 the generic Mach 3 definitions.  */
 
diff --git a/gdb/config/i386/nm-nbsd.h b/gdb/config/i386/nm-nbsd.h
index b59fec68214..ca9e3cccedc 100644
--- a/gdb/config/i386/nm-nbsd.h
+++ b/gdb/config/i386/nm-nbsd.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Intel 386 running NetBSD, for GDB.
    Copyright 1986, 1987, 1989, 1992, 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_NBSD_H
 #define NM_NBSD_H
@@ -23,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Get generic NetBSD native definitions. */
 #include "nm-nbsd.h"
 
-/* #define FLOAT_INFO	{ i386_float_info(); } */
+/* #define FLOAT_INFO   { i386_float_info(); } */
 
 #define REGISTER_U_ADDR(addr, blockend, regno) \
 	(addr) = i386_register_u_addr ((blockend),(regno));
diff --git a/gdb/config/i386/nm-ptx4.h b/gdb/config/i386/nm-ptx4.h
index 5e6cd569f8c..289ffe06752 100644
--- a/gdb/config/i386/nm-ptx4.h
+++ b/gdb/config/i386/nm-ptx4.h
@@ -2,21 +2,22 @@
    with Weitek 1167 and i387 support.
    Copyright 1986, 1987, 1989, 1992  Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "nm-sysv4.h"
 
@@ -49,7 +50,7 @@ extern int child_wait PARAMS ((int, struct target_waitstatus *));
  * enable attach/detach.  If you turn it on anyway, it will mostly
  * work, but has a number of bugs. -fubar, 2/94.
  */
-/*#define ATTACH_DETACH 1*/
+/*#define ATTACH_DETACH 1 */
 #undef ATTACH_DETACH
 #define PTRACE_ATTACH XPT_DEBUG
 #define PTRACE_DETACH XPT_UNDEBUG
diff --git a/gdb/config/i386/nm-sun386.h b/gdb/config/i386/nm-sun386.h
index f7a904b4f1a..0418e487b53 100644
--- a/gdb/config/i386/nm-sun386.h
+++ b/gdb/config/i386/nm-sun386.h
@@ -1,21 +1,22 @@
 /* Native support for Sun 386i, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1992 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.  */
+   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.  */
 
 /* Do implement the attach and detach commands.  */
 
diff --git a/gdb/config/i386/nm-symmetry.h b/gdb/config/i386/nm-symmetry.h
index 80cf09779df..781adf2aedd 100644
--- a/gdb/config/i386/nm-symmetry.h
+++ b/gdb/config/i386/nm-symmetry.h
@@ -2,21 +2,22 @@
    with Weitek 1167 and i387 support.
    Copyright 1986, 1987, 1989, 1992  Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
 
@@ -40,7 +41,7 @@ extern int child_wait PARAMS ((int, struct target_waitstatus *));
 #include <sys/mc_vmparam.h>
 /* VA_UAREA is defined in <sys/mc_vmparam.h>, and is dependant upon 
    sizeof(struct user) */
-#define KERNEL_U_ADDR (VA_UAREA) /* ptx */
+#define KERNEL_U_ADDR (VA_UAREA)	/* ptx */
 #else
 #define KERNEL_U_ADDR (0x80000000 - (UPAGES * NBPG))	/* dynix */
 #endif
diff --git a/gdb/config/i386/tm-cygwin.h b/gdb/config/i386/tm-cygwin.h
index acca6b96cbb..309e1ff8df9 100644
--- a/gdb/config/i386/tm-cygwin.h
+++ b/gdb/config/i386/tm-cygwin.h
@@ -15,7 +15,8 @@
 
    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.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 
 #include "i386/tm-i386v.h"
diff --git a/gdb/config/i386/tm-fbsd.h b/gdb/config/i386/tm-fbsd.h
index 419993db2fe..0e2df32c52b 100644
--- a/gdb/config/i386/tm-fbsd.h
+++ b/gdb/config/i386/tm-fbsd.h
@@ -1,21 +1,22 @@
 /* Target macro definitions for i386 running FreeBSD
    Copyright (C) 1997 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.  */
+   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 "i386/tm-i386bsd.h"
 
diff --git a/gdb/config/i386/tm-go32.h b/gdb/config/i386/tm-go32.h
index 3387ac23cc0..579355252ae 100644
--- a/gdb/config/i386/tm-go32.h
+++ b/gdb/config/i386/tm-go32.h
@@ -1,21 +1,22 @@
 /* Target-dependent definitions for Intel x86 running DJGPP.
    Copyright 1995, 1996, 1997 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.  */
+   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 "i386/tm-i386v.h"
 
diff --git a/gdb/config/i386/tm-i386.h b/gdb/config/i386/tm-i386.h
index 11a7a2023d2..ee9017b6963 100644
--- a/gdb/config/i386/tm-i386.h
+++ b/gdb/config/i386/tm-i386.h
@@ -1,26 +1,27 @@
 /* Macro definitions for GDB on an Intel i[345]86.
    Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_I386_H
 #define TM_I386_H 1
 
-#ifdef __STDC__		/* Forward decl's for prototypes */
+#ifdef __STDC__			/* Forward decl's for prototypes */
 struct frame_info;
 struct frame_saved_regs;
 struct type;
@@ -78,7 +79,7 @@ extern int i386_skip_prologue PARAMS ((int));
 
 /* Number of machine registers */
 
-#define NUM_FREGS 0 /*8*/		/* Number of FP regs */
+#define NUM_FREGS 0 /*8*/	/* Number of FP regs */
 #define NUM_REGS (16 + NUM_FREGS)	/* Basic i*86 regs + FP regs */
 
 /* Initializer for an array of names of registers.  There should be at least
@@ -102,13 +103,13 @@ extern int i386_skip_prologue PARAMS ((int));
    to be actual register numbers as far as the user is concerned
    but do serve to get the desired values when passed to read_register.  */
 
-#define FP_REGNUM 5	/* (ebp) Contains address of executing stack frame */
-#define SP_REGNUM 4	/* (usp) Contains address of top of stack */
-#define PC_REGNUM 8	/* (eip) Contains program counter */
-#define PS_REGNUM 9	/* (ps)  Contains processor status */
+#define FP_REGNUM 5		/* (ebp) Contains address of executing stack frame */
+#define SP_REGNUM 4		/* (usp) Contains address of top of stack */
+#define PC_REGNUM 8		/* (eip) Contains program counter */
+#define PS_REGNUM 9		/* (ps)  Contains processor status */
 
-#define FP0_REGNUM 16   /* (st0) 387 register */
-#define FPC_REGNUM 25	/* 80387 control register */
+#define FP0_REGNUM 16		/* (st0) 387 register */
+#define FPC_REGNUM 25		/* 80387 control register */
 
 /* Total amount of space needed to store our copies of the machine's register
    state, the array `registers'. */
@@ -119,7 +120,7 @@ extern int i386_skip_prologue PARAMS ((int));
 
 #define REGISTER_BYTE(N) \
   (((N) < FP0_REGNUM) ? ((N) * 4) : ((((N) - FP0_REGNUM) * 10) + 64))
- 
+
 /* Number of bytes of storage in the actual machine representation for
    register N.  All registers are 4 bytes, except 387 st(0) - st(7),
    which are 80 bits each. */
@@ -166,7 +167,7 @@ extern int i386_skip_prologue PARAMS ((int));
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
    i386_extract_return_value ((TYPE),(REGBUF),(VALBUF))
 
-extern void i386_extract_return_value PARAMS ((struct type *, char [], char *));
+extern void i386_extract_return_value PARAMS ((struct type *, char[], char *));
 
 /* Write into appropriate registers a function return value of type TYPE, given
    in virtual format.  */
@@ -246,8 +247,8 @@ extern int i386_frame_num_args PARAMS ((struct frame_info *));
 
 extern void i386_frame_find_saved_regs PARAMS ((struct frame_info *,
 						struct frame_saved_regs *));
-
 
+
 /* Things needed for making the inferior call functions.  */
 
 /* Push an empty stack frame, to record the current PC, etc.  */
@@ -261,8 +262,8 @@ extern void i386_push_dummy_frame PARAMS ((void));
 #define POP_FRAME  { i386_pop_frame (); }
 
 extern void i386_pop_frame PARAMS ((void));
-
 
+
 /* this is 
  *   call 11223344 (32 bit relative)
  *   int3
@@ -272,7 +273,7 @@ extern void i386_pop_frame PARAMS ((void));
 
 #define CALL_DUMMY_LENGTH 8
 
-#define CALL_DUMMY_START_OFFSET 0  /* Start execution at beginning of dummy */
+#define CALL_DUMMY_START_OFFSET 0	/* Start execution at beginning of dummy */
 
 #define CALL_DUMMY_BREAKPOINT_OFFSET 5
 
diff --git a/gdb/config/i386/tm-i386aix.h b/gdb/config/i386/tm-i386aix.h
index b0121fa92df..c309bdc2819 100644
--- a/gdb/config/i386/tm-i386aix.h
+++ b/gdb/config/i386/tm-i386aix.h
@@ -1,21 +1,22 @@
 /* Macro defintions for IBM AIX PS/2 (i386).
    Copyright 1986, 1987, 1989, 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Changes for IBM AIX PS/2 by Minh Tran-Le (tranle@intellicorp.com).  */
 
@@ -26,10 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/reg.h>
 
 #ifndef I386
-# define I386 1
+#define I386 1
 #endif
 #ifndef I386_AIX_TARGET
-# define I386_AIX_TARGET 1
+#define I386_AIX_TARGET 1
 #endif
 
 /* Nonzero if register N requires conversion
diff --git a/gdb/config/i386/tm-i386bsd.h b/gdb/config/i386/tm-i386bsd.h
index 8b8c3a9708a..967311bca9a 100644
--- a/gdb/config/i386/tm-i386bsd.h
+++ b/gdb/config/i386/tm-i386bsd.h
@@ -1,21 +1,22 @@
 /* Macro definitions for i386 running under BSD Unix.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_I386BSD_H
 #define TM_I386BSD_H 1
@@ -40,4 +41,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Offset to saved PC in sigcontext, from <sys/signal.h>.  */
 #define SIGCONTEXT_PC_OFFSET 20
 
-#endif  /* ifndef TM_I386BSD_H */
+#endif /* ifndef TM_I386BSD_H */
diff --git a/gdb/config/i386/tm-i386gnu.h b/gdb/config/i386/tm-i386gnu.h
index 3dc15a37aec..aa34094f433 100644
--- a/gdb/config/i386/tm-i386gnu.h
+++ b/gdb/config/i386/tm-i386gnu.h
@@ -1,21 +1,22 @@
 /* Macro definitions for i386, GNU Hurd
    Copyright (C) 1992, 1999 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.  */
+   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.  */
 
 #ifndef TM_I386GNU_H
 #define TM_I386GNU_H 1
diff --git a/gdb/config/i386/tm-i386lynx.h b/gdb/config/i386/tm-i386lynx.h
index 9e732b32e6b..10f37e7b719 100644
--- a/gdb/config/i386/tm-i386lynx.h
+++ b/gdb/config/i386/tm-i386lynx.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Intel 386 running under LynxOS.
    Copyright 1993 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.  */
+   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.  */
 
 #ifndef TM_I386LYNX_H
 #define TM_I386LYNX_H
diff --git a/gdb/config/i386/tm-i386m3.h b/gdb/config/i386/tm-i386m3.h
index 523dabbf947..a75cec36b5b 100644
--- a/gdb/config/i386/tm-i386m3.h
+++ b/gdb/config/i386/tm-i386m3.h
@@ -1,21 +1,22 @@
 /* Macro definitions for i386, Mach 3.0
    Copyright (C) 1992 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.  */
+   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 common definitions for Mach3 systems */
 #include "nm-m3.h"
diff --git a/gdb/config/i386/tm-i386mk.h b/gdb/config/i386/tm-i386mk.h
index 3625efbf6df..cb18e3c1875 100644
--- a/gdb/config/i386/tm-i386mk.h
+++ b/gdb/config/i386/tm-i386mk.h
@@ -1,21 +1,22 @@
 /* Macro definitions for i386, Mach 3.0, OSF 1/MK
    Copyright (C) 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Until OSF switches to a newer Mach kernel that has
  * a different get_emul_vector() interface.
diff --git a/gdb/config/i386/tm-i386nw.h b/gdb/config/i386/tm-i386nw.h
index e5cdadecb47..1000b77c2fd 100644
--- a/gdb/config/i386/tm-i386nw.h
+++ b/gdb/config/i386/tm-i386nw.h
@@ -1,21 +1,22 @@
 /* Macro definitions for i386 running NetWare.
    Copyright 1993, 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_I386NW_H
 #define TM_I386NW_H 1
@@ -45,5 +46,4 @@ get_longjmp_target PARAMS ((CORE_ADDR *));
 
 #define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR)
 
-#endif  /* ifndef TM_I386NW_H */
-
+#endif /* ifndef TM_I386NW_H */
diff --git a/gdb/config/i386/tm-i386os9k.h b/gdb/config/i386/tm-i386os9k.h
index 2b486419659..0890c2cd2c8 100644
--- a/gdb/config/i386/tm-i386os9k.h
+++ b/gdb/config/i386/tm-i386os9k.h
@@ -2,19 +2,20 @@
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
 
 
-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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_I386OS9K_H
 #define TM_I386OS9K_H 1
@@ -24,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Number of machine registers */
 
 #undef  NUM_REGS
-#define NUM_REGS (16)	/* Basic i*86 regs */
+#define NUM_REGS (16)		/* Basic i*86 regs */
 
 /* Initializer for an array of names of registers.  There should be at least
    NUM_REGS strings in this initializer.  Any excess ones are simply ignored.
@@ -39,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
                          "ds", "es", "fs", "gs", \
                          }
 
-#define DATABASE_REG 	3		/* ebx */
+#define DATABASE_REG 	3	/* ebx */
 
 /* Amount PC must be decremented by after a breakpoint.  This is often the
    number of bytes in BREAKPOINT but not always (such as now). */
@@ -60,4 +61,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define BELIEVE_PCC_PROMOTION 1
 
-#endif	/* #ifndef TM_I386OS9K_H */
+#endif /* #ifndef TM_I386OS9K_H */
diff --git a/gdb/config/i386/tm-i386sco5.h b/gdb/config/i386/tm-i386sco5.h
index ffac5b3b561..ebad936a107 100644
--- a/gdb/config/i386/tm-i386sco5.h
+++ b/gdb/config/i386/tm-i386sco5.h
@@ -2,21 +2,22 @@
    Copyright (C) 1998 Free Software Foundation, Inc.
    Written by J. Kean Johnston (jkj@sco.com).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_I386SCO5_H
 #define TM_I386SCO5_H 1
@@ -59,4 +60,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define target_remove_watchpoint(addr, len, type)  \
   i386_remove_watchpoint (inferior_pid, addr, len)
 
-#endif  /* ifndef TM_I386SCO5_H */
+#endif /* ifndef TM_I386SCO5_H */
diff --git a/gdb/config/i386/tm-i386sol2.h b/gdb/config/i386/tm-i386sol2.h
index dbd6317b65b..6fcfceff55d 100644
--- a/gdb/config/i386/tm-i386sol2.h
+++ b/gdb/config/i386/tm-i386sol2.h
@@ -1,27 +1,28 @@
 /* Macro definitions for GDB on an Intel i386 running Solaris 2.
    Copyright (C) 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_I386SOL2_H
 #define TM_I386SOL2_H 1
 
 #include "i386/tm-i386v4.h"
- 
+
 /* Signal handler frames under Solaris 2 are recognized by a return address
    of 0xFFFFFFFF, the third parameter on the signal handler stack is
    a pointer to an ucontext.  */
@@ -61,4 +62,4 @@ extern char *procfs_pid_to_str PARAMS ((int pid));
 
 #endif
 
-#endif  /* ifndef TM_I386SOL2_H */
+#endif /* ifndef TM_I386SOL2_H */
diff --git a/gdb/config/i386/tm-i386v.h b/gdb/config/i386/tm-i386v.h
index 05caf9bbe06..1e6a2b28214 100644
--- a/gdb/config/i386/tm-i386v.h
+++ b/gdb/config/i386/tm-i386v.h
@@ -1,21 +1,22 @@
 /* Macro definitions for i386, Unix System V.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_I386V_H
 #define TM_I386V_H 1
@@ -119,8 +120,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #undef  STORE_RETURN_VALUE
 #define STORE_RETURN_VALUE(TYPE,VALBUF) \
   write_register_bytes (0, VALBUF, TYPE_LENGTH (TYPE))
-
 
+
 /* Describe the pointer in each stack frame to the previous stack frame
    (its caller).  */
 
@@ -152,7 +153,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #undef  FRAME_NUM_ARGS
 #define FRAME_NUM_ARGS(fi) (-1)
 
-#ifdef __STDC__		/* Forward decl's for prototypes */
+#ifdef __STDC__			/* Forward decl's for prototypes */
 struct frame_info;
 struct frame_saved_regs;
 #endif
@@ -160,4 +161,4 @@ struct frame_saved_regs;
 extern int
 i386_frame_num_args PARAMS ((struct frame_info *));
 
-#endif	/* ifndef TM_I386V_H */
+#endif /* ifndef TM_I386V_H */
diff --git a/gdb/config/i386/tm-i386v4.h b/gdb/config/i386/tm-i386v4.h
index eafff0178c0..7680a882621 100644
--- a/gdb/config/i386/tm-i386v4.h
+++ b/gdb/config/i386/tm-i386v4.h
@@ -2,21 +2,22 @@
    Copyright (C) 1991, 1994 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygnus.com)
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_I386V4_H
 #define TM_I386V4_H 1
@@ -47,7 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define JB_ESP	4
 #define JB_EDX	5
 
-#define JB_PC	JB_EDX	/* Setjmp()'s return PC saved in EDX */
+#define JB_PC	JB_EDX		/* Setjmp()'s return PC saved in EDX */
 
 /* Figure out where the longjmp will land.  Slurp the args out of the stack.
    We expect the first arg to be a pointer to the jmp_buf structure from which
@@ -75,4 +76,4 @@ get_longjmp_target PARAMS ((CORE_ADDR *));
 #define sigtramp_saved_pc i386v4_sigtramp_saved_pc
 extern CORE_ADDR i386v4_sigtramp_saved_pc PARAMS ((struct frame_info *));
 
-#endif  /* ifndef TM_I386V4_H */
+#endif /* ifndef TM_I386V4_H */
diff --git a/gdb/config/i386/tm-i386v42mp.h b/gdb/config/i386/tm-i386v42mp.h
index 81df85bcbbe..29c4ba0495e 100644
--- a/gdb/config/i386/tm-i386v42mp.h
+++ b/gdb/config/i386/tm-i386v42mp.h
@@ -2,21 +2,22 @@
    Copyright (C) 1991, 1994 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygnus.com)
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_I386V42MP_H
 #define TM_I386V42MP_H 1
@@ -26,14 +27,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "i386/tm-i386v4.h"
 
 /* procfs on this architecture has multiple fds (ctl, as, map, status)
-	including a control fd */
+   including a control fd */
 
 #ifndef HAVE_MULTIPLE_PROC_FDS
 #define HAVE_MULTIPLE_PROC_FDS
 #endif
 
 /* procfs on this architecture communicates with read/write instead
-	of ioctl */
+   of ioctl */
 
 #define PROCFS_USE_READ_WRITE
 
@@ -41,4 +42,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define UNIXWARE
 
-#endif  /* ifndef TM_I386V42MP_H */
+#endif /* ifndef TM_I386V42MP_H */
diff --git a/gdb/config/i386/tm-linux.h b/gdb/config/i386/tm-linux.h
index 417d1514d75..e39dc047cb1 100644
--- a/gdb/config/i386/tm-linux.h
+++ b/gdb/config/i386/tm-linux.h
@@ -1,21 +1,22 @@
 /* Definitions to target GDB to GNU/Linux on 386.
    Copyright 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_LINUX_H
 #define TM_LINUX_H
@@ -35,4 +36,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* The following works around a problem with /usr/include/sys/procfs.h  */
 #define sys_quotactl 1
 
-#endif  /* #ifndef TM_LINUX_H */
+#endif /* #ifndef TM_LINUX_H */
diff --git a/gdb/config/i386/tm-nbsd.h b/gdb/config/i386/tm-nbsd.h
index cf5159f2655..c826d5b0439 100644
--- a/gdb/config/i386/tm-nbsd.h
+++ b/gdb/config/i386/tm-nbsd.h
@@ -1,21 +1,22 @@
 /* Macro definitions for i386 running under NetBSD.
    Copyright 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_NBSD_H
 #define TM_NBSD_H
@@ -27,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define NUM_REGS 16
 
 #define JB_ELEMENT_SIZE sizeof(int)	/* jmp_buf[_JBLEN] is array of ints */
-#define JB_PC	0			/* Setjmp()'s return PC saved here */
+#define JB_PC	0		/* Setjmp()'s return PC saved here */
 
 /* Figure out where the longjmp will land.  Slurp the args out of the stack.
    We expect the first arg to be a pointer to the jmp_buf structure from which
diff --git a/gdb/config/i386/tm-ptx.h b/gdb/config/i386/tm-ptx.h
index c9f67d7f6d8..14491a4dd2c 100644
--- a/gdb/config/i386/tm-ptx.h
+++ b/gdb/config/i386/tm-ptx.h
@@ -3,21 +3,22 @@
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
    Symmetry version by Jay Vosburgh (fubar@sequent.com).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_PTX_H
 #define TM_PTX_H 1
@@ -48,8 +49,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define DECR_PC_AFTER_BREAK 0
 
 #if 0
- --- this code can't be used unless we know we are running native,
-     since it uses host specific ptrace calls.
+-- -this code can 't be used unless we know we are running native,
+since it uses host specific ptrace calls.
 /* code for 80387 fpu.  Functions are from i386-dep.c, copied into
  * symm-dep.c.
  */
@@ -179,10 +180,10 @@ ptx_register_u_addr PARAMS ((int, int));
 ((N < ST0_REGNUM) ? 0 : \
  (N < FP1_REGNUM) ? 1 : \
  0)
-  
+
 /* Convert data from raw format for register REGNUM
    to virtual format for register REGNUM.  */
-extern const struct floatformat floatformat_i387_ext; /* from floatformat.h */
+extern const struct floatformat floatformat_i387_ext;	/* from floatformat.h */
 
 #undef REGISTER_CONVERT_TO_VIRTUAL
 #define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO)	\
@@ -190,7 +191,7 @@ extern const struct floatformat floatformat_i387_ext; /* from floatformat.h */
  (REGNUM < FP1_REGNUM) ? (void)floatformat_to_double(&floatformat_i387_ext, \
 						       (FROM),(TO)) : \
  (void)memcpy ((TO), (FROM), 4))
- 
+
 /* Convert data from virtual format for register REGNUM
    to raw format for register REGNUM.  */
 
@@ -224,9 +225,9 @@ extern const struct floatformat floatformat_i387_ext; /* from floatformat.h */
   symmetry_extract_return_value(TYPE, REGBUF, VALBUF)
 
 /*
-#undef  FRAME_FIND_SAVED_REGS
-#define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs) \
-{ ptx_frame_find_saved_regs((frame_info), &(frame_saved_regs)); }
-*/
+   #undef  FRAME_FIND_SAVED_REGS
+   #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs) \
+   { ptx_frame_find_saved_regs((frame_info), &(frame_saved_regs)); }
+ */
 
-#endif  /* ifndef TM_PTX_H */
+#endif /* ifndef TM_PTX_H */
diff --git a/gdb/config/i386/tm-ptx4.h b/gdb/config/i386/tm-ptx4.h
index a576accb46b..39809c4e96b 100644
--- a/gdb/config/i386/tm-ptx4.h
+++ b/gdb/config/i386/tm-ptx4.h
@@ -3,21 +3,22 @@
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
    Symmetry version by Jay Vosburgh (fubar@sequent.com).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define SEQUENT_PTX4
 
diff --git a/gdb/config/i386/tm-sun386.h b/gdb/config/i386/tm-sun386.h
index 1f60b982714..5d4c39ce73f 100644
--- a/gdb/config/i386/tm-sun386.h
+++ b/gdb/config/i386/tm-sun386.h
@@ -1,21 +1,22 @@
 /* Parameters for a Sun 386i target machine, for GDB, the GNU debugger.
    Copyright 1986, 1987, 1991, 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #if !defined (TM_SUN386_H)
 #define TM_SUN386_H 1
@@ -75,17 +76,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    but do serve to get the desired values when passed to read_register.  */
 
 #undef  FP_REGNUM
-#define FP_REGNUM   6	/* (ebp) Contains address of executing stack frame */
+#define FP_REGNUM   6		/* (ebp) Contains address of executing stack frame */
 #undef  SP_REGNUM
-#define SP_REGNUM  18	/* (usp) Contains address of top of stack */
+#define SP_REGNUM  18		/* (usp) Contains address of top of stack */
 #undef  PS_REGNUM
-#define PS_REGNUM  17	/* (ps)  Contains processor status */
+#define PS_REGNUM  17		/* (ps)  Contains processor status */
 #undef  PC_REGNUM
-#define PC_REGNUM  15	/* (eip) Contains program counter */
+#define PC_REGNUM  15		/* (eip) Contains program counter */
 #undef  FP0_REGNUM
-#define FP0_REGNUM 20	/* Floating point register 0 */
+#define FP0_REGNUM 20		/* Floating point register 0 */
 #undef  FPC_REGNUM
-#define FPC_REGNUM 28	/* 80387 control register */
+#define FPC_REGNUM 28		/* 80387 control register */
 
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.  */
@@ -202,4 +203,3 @@ double_to_i387 PARAMS ((char *, char *));
 }
 
 #endif /* !defined (TM_SUN386_H) */
-
diff --git a/gdb/config/i386/tm-symmetry.h b/gdb/config/i386/tm-symmetry.h
index 11931d41724..4cd99875096 100644
--- a/gdb/config/i386/tm-symmetry.h
+++ b/gdb/config/i386/tm-symmetry.h
@@ -4,21 +4,22 @@
    Free Software Foundation, Inc.
    Symmetry version by Jay Vosburgh (fubar@sequent.com).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_SYMMETRY_H
 #define TM_SYMMETRY_H 1
@@ -40,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #if 0
 /* --- this code can't be used unless we know we are running native,
-       since it uses host specific ptrace calls. */
+   since it uses host specific ptrace calls. */
 /* code for 80387 fpu.  Functions are from i386-dep.c, copied into
  * symm-dep.c.
  */
@@ -101,16 +102,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Get %fp2 - %fp31 by addition, since they are contiguous */
 
 #undef  SP_REGNUM
-#define SP_REGNUM 14	/* (usp) Contains address of top of stack */
+#define SP_REGNUM 14		/* (usp) Contains address of top of stack */
 #define ESP_REGNUM 14
 #undef  FP_REGNUM
-#define FP_REGNUM 15	/* (ebp) Contains address of executing stack frame */
+#define FP_REGNUM 15		/* (ebp) Contains address of executing stack frame */
 #define EBP_REGNUM 15
 #undef  PC_REGNUM
-#define PC_REGNUM 16	/* (eip) Contains program counter */
+#define PC_REGNUM 16		/* (eip) Contains program counter */
 #define EIP_REGNUM 16
 #undef  PS_REGNUM
-#define PS_REGNUM 17	/* (ps)  Contains processor status */
+#define PS_REGNUM 17		/* (ps)  Contains processor status */
 #define EFLAGS_REGNUM 17
 
 /*
@@ -317,5 +318,4 @@ switch (regno) { \
 /* Offset to saved PC in sigcontext, from <signal.h>.  */
 #define SIGCONTEXT_PC_OFFSET 16
 
-#endif	/* ifndef TM_SYMMETRY_H */
-
+#endif /* ifndef TM_SYMMETRY_H */
diff --git a/gdb/config/i386/xm-cygwin.h b/gdb/config/i386/xm-cygwin.h
index f0b8227d2d3..863992c22af 100644
--- a/gdb/config/i386/xm-cygwin.h
+++ b/gdb/config/i386/xm-cygwin.h
@@ -1,21 +1,22 @@
 /* Definitions for hosting on WIN32, for GDB.
    Copyright 1995, 1996, 1997, 1998 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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
diff --git a/gdb/config/i386/xm-go32.h b/gdb/config/i386/xm-go32.h
index 562d457924a..cb8fc780c17 100644
--- a/gdb/config/i386/xm-go32.h
+++ b/gdb/config/i386/xm-go32.h
@@ -1,21 +1,22 @@
 /* Host-dependent definitions for Intel x86 running DJGPP.
    Copyright 1993-1996 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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
diff --git a/gdb/config/i386/xm-i386aix.h b/gdb/config/i386/xm-i386aix.h
index 652a149d6cb..83d6d593335 100644
--- a/gdb/config/i386/xm-i386aix.h
+++ b/gdb/config/i386/xm-i386aix.h
@@ -1,25 +1,26 @@
 /* Macro defintions for AIX PS/2 (i386)
    Copyright 1986, 1987, 1989, 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /*
  * Changed for IBM AIX ps/2 by Minh Tran Le (tranle@intellicorp.com)
- * Revision:	23-Oct-92 17:42:49
+ * Revision:    23-Oct-92 17:42:49
  */
 
 #include "i386/xm-i386v.h"
diff --git a/gdb/config/i386/xm-i386bsd.h b/gdb/config/i386/xm-i386bsd.h
index e5c4c89f07f..da6ed924314 100644
--- a/gdb/config/i386/xm-i386bsd.h
+++ b/gdb/config/i386/xm-i386bsd.h
@@ -1,22 +1,23 @@
 /* Host-dependent definitions for Intel 386 running BSD Unix, for GDB.
    Copyright 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
-#include <machine/limits.h>		/* for INT_MIN */
+#include <machine/limits.h>	/* for INT_MIN */
diff --git a/gdb/config/i386/xm-i386gnu.h b/gdb/config/i386/xm-i386gnu.h
index 60307b21183..19abdaa6c70 100644
--- a/gdb/config/i386/xm-i386gnu.h
+++ b/gdb/config/i386/xm-i386gnu.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on the GNU Hurd on an Intel 386
    Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
diff --git a/gdb/config/i386/xm-i386lynx.h b/gdb/config/i386/xm-i386lynx.h
index 6078cb6f2cb..c9cc69d7844 100644
--- a/gdb/config/i386/xm-i386lynx.h
+++ b/gdb/config/i386/xm-i386lynx.h
@@ -1,21 +1,22 @@
 /* Host-dependent definitions for Intel 386 running LynxOS.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
diff --git a/gdb/config/i386/xm-i386m3.h b/gdb/config/i386/xm-i386m3.h
index b667409f0da..888501cd29c 100644
--- a/gdb/config/i386/xm-i386m3.h
+++ b/gdb/config/i386/xm-i386m3.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on Mach 3 on an Intel 386
    Copyright (C) 1986, 1987, 1989, 1991 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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
diff --git a/gdb/config/i386/xm-i386mach.h b/gdb/config/i386/xm-i386mach.h
index eb47bfb06f4..094660a17d3 100644
--- a/gdb/config/i386/xm-i386mach.h
+++ b/gdb/config/i386/xm-i386mach.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on Mach on an Intel 386
    Copyright (C) 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
@@ -27,4 +28,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* <errno.h> only defines this if __STDC__!!! */
 extern int errno;
 
-extern char *strdup();
+extern char *strdup ();
diff --git a/gdb/config/i386/xm-i386mk.h b/gdb/config/i386/xm-i386mk.h
index 661c9cbd36c..5c005d52389 100644
--- a/gdb/config/i386/xm-i386mk.h
+++ b/gdb/config/i386/xm-i386mk.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on Mach 3 OSF 1/MK on an Intel 386
    Copyright (C) 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HAVE_TERMIO	1
 
diff --git a/gdb/config/i386/xm-i386sco.h b/gdb/config/i386/xm-i386sco.h
index 31fa7e6b980..d245f9dc95e 100644
--- a/gdb/config/i386/xm-i386sco.h
+++ b/gdb/config/i386/xm-i386sco.h
@@ -1,21 +1,22 @@
 /* Macro defintions for i386, running SCO Unix System V/386 3.2.
    Copyright (C) 1989 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.  */
+   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.  */
 
 /* In 3.2v4 <sys/user.h> requires on <sys/dir.h>.  */
 #include <sys/types.h>
diff --git a/gdb/config/i386/xm-i386v.h b/gdb/config/i386/xm-i386v.h
index 480dfd671a0..4476b6970ba 100644
--- a/gdb/config/i386/xm-i386v.h
+++ b/gdb/config/i386/xm-i386v.h
@@ -2,35 +2,36 @@
    Copyright 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
    Changes for 80386 by Pace Willisson (pace@prep.ai.mit.edu), July 1988.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
 /* I'm running gdb 3.4 under 386/ix 2.0.2, which is a derivative of AT&T's
-Sys V/386 3.2.
-
-On some machines, gdb crashes when it's starting up while calling the
-vendor's termio tgetent() routine.  It always works when run under
-itself (actually, under 3.2, it's not an infinitely recursive bug.)
-After some poking around, it appears that depending on the environment
-size, or whether you're running YP, or the phase of the moon or something,
-the stack is not always long-aligned when main() is called, and tgetent()
-takes strong offense at that.  On some machines this bug never appears, but
-on those where it does, it occurs quite reliably.  */
+   Sys V/386 3.2.
+
+   On some machines, gdb crashes when it's starting up while calling the
+   vendor's termio tgetent() routine.  It always works when run under
+   itself (actually, under 3.2, it's not an infinitely recursive bug.)
+   After some poking around, it appears that depending on the environment
+   size, or whether you're running YP, or the phase of the moon or something,
+   the stack is not always long-aligned when main() is called, and tgetent()
+   takes strong offense at that.  On some machines this bug never appears, but
+   on those where it does, it occurs quite reliably.  */
 #define ALIGN_STACK_ON_STARTUP
 
 /* define USG if you are using sys5 /usr/include's */
@@ -42,4 +43,3 @@ on those where it does, it occurs quite reliably.  */
    to get the offset in the core file of the register values.  */
 
 #define KERNEL_U_ADDR 0xe0000000
-
diff --git a/gdb/config/i386/xm-i386v32.h b/gdb/config/i386/xm-i386v32.h
index daaac8047c5..706822f30dd 100644
--- a/gdb/config/i386/xm-i386v32.h
+++ b/gdb/config/i386/xm-i386v32.h
@@ -1,21 +1,22 @@
 /* Macro defintions for i386, running System V 3.2.
    Copyright (C) 1989 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "i386/xm-i386v.h"
 
diff --git a/gdb/config/i386/xm-i386v4.h b/gdb/config/i386/xm-i386v4.h
index 7f782db2496..720b218c1ee 100644
--- a/gdb/config/i386/xm-i386v4.h
+++ b/gdb/config/i386/xm-i386v4.h
@@ -2,21 +2,22 @@
    Copyright 1991, 1992 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygnus.com).
 
-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.  */
+   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.  */
 
 /* Pick up most of what we need from the generic i386 host include file. */
 
diff --git a/gdb/config/i386/xm-linux.h b/gdb/config/i386/xm-linux.h
index 217c6d4d094..b788b677948 100644
--- a/gdb/config/i386/xm-linux.h
+++ b/gdb/config/i386/xm-linux.h
@@ -1,21 +1,22 @@
 /* Native support for GNU/Linux, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef XM_LINUX_H
 #define XM_LINUX_H
@@ -33,4 +34,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Need R_OK etc, but USG isn't defined.  */
 #include <unistd.h>
 
-#endif	/* #ifndef XM_LINUX_H */
+#endif /* #ifndef XM_LINUX_H */
diff --git a/gdb/config/i386/xm-nbsd.h b/gdb/config/i386/xm-nbsd.h
index b5624acc60f..9d746289f71 100644
--- a/gdb/config/i386/xm-nbsd.h
+++ b/gdb/config/i386/xm-nbsd.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a i386 running NetBSD, for GDB.
    Copyright 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Get generic NetBSD host definitions. */
 #include "xm-nbsd.h"
diff --git a/gdb/config/i386/xm-ptx.h b/gdb/config/i386/xm-ptx.h
index 99b46ccd149..425b72cc1a7 100644
--- a/gdb/config/i386/xm-ptx.h
+++ b/gdb/config/i386/xm-ptx.h
@@ -3,21 +3,22 @@
    Copyright 1986, 1987, 1989, 1992, 1993, 1996
    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.  */
+   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.  */
 
 /* Symmetry version by Jay Vosburgh (fubar@sequent.com) */
 
diff --git a/gdb/config/i386/xm-ptx4.h b/gdb/config/i386/xm-ptx4.h
index bdbdefd6ec8..3f8a84e5f08 100644
--- a/gdb/config/i386/xm-ptx4.h
+++ b/gdb/config/i386/xm-ptx4.h
@@ -2,21 +2,22 @@
    Weitek 1167 and i387 support.  Copyright 1986, 1987, 1989, 1992,
    1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Symmetry version by Jay Vosburgh (fubar@sequent.com) */
 
diff --git a/gdb/config/i386/xm-sun386.h b/gdb/config/i386/xm-sun386.h
index 51c3b58c11b..e2196ae97de 100644
--- a/gdb/config/i386/xm-sun386.h
+++ b/gdb/config/i386/xm-sun386.h
@@ -1,20 +1,21 @@
 /* Host support for Sun 386i, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1992, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
diff --git a/gdb/config/i386/xm-symmetry.h b/gdb/config/i386/xm-symmetry.h
index 52e9a9a2341..5f07fa5bd25 100644
--- a/gdb/config/i386/xm-symmetry.h
+++ b/gdb/config/i386/xm-symmetry.h
@@ -2,21 +2,22 @@
    dynix 3.1, with Weitek 1167 and i387 support.
    Copyright 1986, 1987, 1989, 1992, 1993, 1994  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.  */
+   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.  */
 
 /* Symmetry version by Jay Vosburgh (fubar@sequent.com) */
 
diff --git a/gdb/config/i386/xm-windows.h b/gdb/config/i386/xm-windows.h
index e083010067c..65680f05385 100644
--- a/gdb/config/i386/xm-windows.h
+++ b/gdb/config/i386/xm-windows.h
@@ -1,21 +1,22 @@
 /* Definitions for hosting on WIN32, built with Microsoft Visual C/C++, for GDB.
    Copyright 1996, 1998 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.  */
+   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 "i386/xm-cygwin.h"
 
diff --git a/gdb/config/i960/tm-i960.h b/gdb/config/i960/tm-i960.h
index d5b78f264b4..3a6e2342ee1 100644
--- a/gdb/config/i960/tm-i960.h
+++ b/gdb/config/i960/tm-i960.h
@@ -1,21 +1,22 @@
 /* Parameters for target machine Intel 960, for GDB, the GNU debugger.
    Copyright (C) 1990, 1991, 1993 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Definitions to target GDB to any i960.  */
 
@@ -87,24 +88,24 @@ extern CORE_ADDR saved_pc_after_call ();
 /* Register numbers of various important registers (used to index
    into arrays of register names and register values).  */
 
-#define R0_REGNUM   0	/* First local register		*/
-#define SP_REGNUM   1	/* Contains address of top of stack */
-#define RIP_REGNUM  2	/* Return instruction pointer (local r2) */
-#define R15_REGNUM 15	/* Last local register		*/
-#define G0_REGNUM  16	/* First global register	*/
-#define G13_REGNUM 29	/* g13 - holds struct return address */
-#define G14_REGNUM 30	/* g14 - ptr to arg block / leafproc return address */
-#define FP_REGNUM  31	/* Contains address of executing stack frame */
-#define	PCW_REGNUM 32	/* process control word */
-#define	ACW_REGNUM 33	/* arithmetic control word */
-#define	TCW_REGNUM 34	/* trace control word */
-#define IP_REGNUM  35	/* instruction pointer */
-#define FP0_REGNUM 36	/* First floating point register */
+#define R0_REGNUM   0		/* First local register           */
+#define SP_REGNUM   1		/* Contains address of top of stack */
+#define RIP_REGNUM  2		/* Return instruction pointer (local r2) */
+#define R15_REGNUM 15		/* Last local register            */
+#define G0_REGNUM  16		/* First global register  */
+#define G13_REGNUM 29		/* g13 - holds struct return address */
+#define G14_REGNUM 30		/* g14 - ptr to arg block / leafproc return address */
+#define FP_REGNUM  31		/* Contains address of executing stack frame */
+#define	PCW_REGNUM 32		/* process control word */
+#define	ACW_REGNUM 33		/* arithmetic control word */
+#define	TCW_REGNUM 34		/* trace control word */
+#define IP_REGNUM  35		/* instruction pointer */
+#define FP0_REGNUM 36		/* First floating point register */
 
 /* Some registers have more than one name */
 
 #define PC_REGNUM  IP_REGNUM	/* GDB refers to ip as the Program Counter */
-#define PFP_REGNUM R0_REGNUM	/* Previous frame pointer	*/
+#define PFP_REGNUM R0_REGNUM	/* Previous frame pointer */
 
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.  */
@@ -124,7 +125,7 @@ extern CORE_ADDR saved_pc_after_call ();
    other frames, and 2) This register is automatically "saved" upon
    subroutine calls and thus there is no need to search more than one
    stack frame for it.
-   
+
    On the i960, in fact, the name of this register in another frame is
    "mud" -- there is no overlap between the windows.  Each window is
    simply saved into the stack (true for our purposes, after having been
@@ -230,7 +231,7 @@ extern use_struct_convention_fn i960_use_struct_convention;
 
 /* Write into appropriate registers a function return value
    of type TYPE, given in virtual format, for "value returning" functions.
-  
+
    For 'return' command:  not (yet) implemented for i960.  */
 
 #define STORE_RETURN_VALUE(TYPE,VALBUF) \
@@ -291,7 +292,7 @@ extern use_struct_convention_fn i960_use_struct_convention;
 
 /* Note that in the i960 architecture the return pointer is saved in the
    *caller's* stack frame.
-  
+
    Make sure to zero low-order bits because of bug in 960CA A-step part
    (instruction addresses should always be word-aligned anyway).  */
 
@@ -327,12 +328,12 @@ extern CORE_ADDR frame_args_address ();		/* i960-tdep.c */
 
 #define FRAME_FIND_SAVED_REGS(frame_info_addr, sr) \
 	frame_find_saved_regs (frame_info_addr, &sr)
-extern void frame_find_saved_regs();		/* See i960-tdep.c */
+extern void frame_find_saved_regs ();	/* See i960-tdep.c */
 
 /* Things needed for making calls to functions in the inferior process */
 
 /* Push an empty stack frame, to record the current ip, etc.
-  
+
    Not (yet?) implemented for i960.  */
 
 #define PUSH_DUMMY_FRAME	\
@@ -345,14 +346,14 @@ error("Function calls into the inferior process are not supported on the i960")
 
 
 /* This sequence of words is the instructions
-  
-  	callx 0x00000000
-  	fmark
+
+   callx 0x00000000
+   fmark
  */
 
 /* #define CALL_DUMMY { 0x86003000, 0x00000000, 0x66003e00 } */
 
-/* #define CALL_DUMMY_START_OFFSET 0 *//* Start execution at beginning of dummy */
+																			    /* #define CALL_DUMMY_START_OFFSET 0 *//* Start execution at beginning of dummy */
 
 /* Indicate that we don't support calling inferior child functions.  */
 
@@ -360,7 +361,7 @@ error("Function calls into the inferior process are not supported on the i960")
 
 /* Insert the specified number of args and function address
    into a call sequence of the above form stored at 'dummyname'.
-  
+
    Ignore arg count on i960.  */
 
 /* #define FIX_CALL_DUMMY(dummyname, fun, nargs) *(((int *)dummyname)+1) = fun */
diff --git a/gdb/config/i960/tm-mon960.h b/gdb/config/i960/tm-mon960.h
index e441e052b5a..21c4812c8c4 100644
--- a/gdb/config/i960/tm-mon960.h
+++ b/gdb/config/i960/tm-mon960.h
@@ -2,21 +2,22 @@
    Copyright (C) 1990-1991 Free Software Foundation, Inc.
    Contributed by Intel Corporation and Cygnus Support.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /*****************************************************************************
  * Definitions to target GDB to an i960 debugged over a serial line.
@@ -31,12 +32,12 @@ struct frame_info;
 
 /* redefined from tm-i960.h */
 /* Number of machine registers */
-#undef NUM_REGS 
+#undef NUM_REGS
 #define NUM_REGS 40
 
 /* Initializer for an array of names of registers.
    There should be NUM_REGS strings in this initializer.  */
-#undef REGISTER_NAMES 
+#undef REGISTER_NAMES
 #define REGISTER_NAMES { \
 	/*  0 */ "pfp", "sp",  "rip", "r3",  "r4",  "r5",  "r6",  "r7", \
 	/*  8 */ "r8",  "r9",  "r10", "r11", "r12", "r13", "r14", "r15",\
diff --git a/gdb/config/i960/tm-nindy960.h b/gdb/config/i960/tm-nindy960.h
index d0c46c0a39f..1a0b5624e76 100644
--- a/gdb/config/i960/tm-nindy960.h
+++ b/gdb/config/i960/tm-nindy960.h
@@ -2,21 +2,22 @@
    Copyright (C) 1990-1991 Free Software Foundation, Inc.
    Contributed by Intel Corporation and Cygnus Support.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /*****************************************************************************
  * Definitions to target GDB to an i960 debugged over a serial line.
@@ -44,7 +45,7 @@ extern char *nindy_ttyname;	/* Name of serial port to talk to nindy */
 #define	ADDITIONAL_OPTIONS \
 	{"O", no_argument, &nindy_old_protocol, 1},	\
 	{"brk", no_argument, &nindy_initial_brk, 1},	\
-	{"ser", required_argument, 0, 1004},  /* 1004 is magic cookie for ADDL_CASES */
+	{"ser", required_argument, 0, 1004},	/* 1004 is magic cookie for ADDL_CASES */
 
 #define	ADDITIONAL_OPTION_CASES	\
 	case 1004:	/* -ser option:  remote nindy auto-start */	\
@@ -76,7 +77,7 @@ extern char *nindy_ttyname;	/* Name of serial port to talk to nindy */
   nindy_before_main_loop();
 
 extern void
-nindy_before_main_loop();		/* In remote-nindy.c */
+  nindy_before_main_loop ();	/* In remote-nindy.c */
 
 /* FRAME_CHAIN_VALID returns zero if the given frame is the outermost one
    and has no caller.
@@ -89,7 +90,7 @@ extern int nindy_frame_chain_valid PARAMS ((CORE_ADDR, struct frame_info *));
 #define	FRAME_CHAIN_VALID(chain, thisframe) nindy_frame_chain_valid (chain, thisframe)
 
 extern int
-nindy_frame_chain_valid();		/* See nindy-tdep.c */
+  nindy_frame_chain_valid ();	/* See nindy-tdep.c */
 
 /* Sequence of bytes for breakpoint instruction */
 
diff --git a/gdb/config/i960/tm-vx960.h b/gdb/config/i960/tm-vx960.h
index e6cade073de..a62bab60c77 100644
--- a/gdb/config/i960/tm-vx960.h
+++ b/gdb/config/i960/tm-vx960.h
@@ -2,21 +2,22 @@
    Copyright (C) 1986-1991, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
-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.  */
+   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 "i960/tm-i960.h"
 #include "tm-vxworks.h"
diff --git a/gdb/config/m32r/tm-m32r.h b/gdb/config/m32r/tm-m32r.h
index 5c8fb237ee4..e0c8c230f89 100644
--- a/gdb/config/m32r/tm-m32r.h
+++ b/gdb/config/m32r/tm-m32r.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Mitsubishi m32r processor.
    Copyright 1996, 1997 Free Software Foundation, Inc. 
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Used by mswin.  */
 #define TARGET_M32R 1
@@ -108,15 +109,15 @@ struct value;
   int using_frame_pointer;
 
 
-extern void m32r_init_extra_frame_info PARAMS ((struct frame_info *fi));
+extern void m32r_init_extra_frame_info PARAMS ((struct frame_info * fi));
 /* mvs_check  INIT_EXTRA_FRAME_INFO */
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) m32r_init_extra_frame_info (fi)
 /* mvs_no_check  INIT_FRAME_PC */
 #define INIT_FRAME_PC		/* Not necessary */
 
-extern void 
-m32r_frame_find_saved_regs PARAMS ((struct frame_info *fi, 
-				    struct frame_saved_regs *regaddr));
+extern void
+m32r_frame_find_saved_regs PARAMS ((struct frame_info * fi,
+				    struct frame_saved_regs * regaddr));
 
 /* Put here the code to store, into a struct frame_saved_regs,
    the addresses of the saved registers of frame described by FRAME_INFO.
@@ -128,15 +129,15 @@ m32r_frame_find_saved_regs PARAMS ((struct frame_info *fi,
 #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)	    \
    m32r_frame_find_saved_regs(frame_info, &(frame_saved_regs))
 
-extern CORE_ADDR m32r_frame_chain PARAMS ((struct frame_info *fi));
+extern CORE_ADDR m32r_frame_chain PARAMS ((struct frame_info * fi));
 /* mvs_check  FRAME_CHAIN */
 #define FRAME_CHAIN(fi) 		m32r_frame_chain (fi)
 
 #define FRAME_CHAIN_VALID(fp, frame)	generic_frame_chain_valid (fp, frame)
 
-extern CORE_ADDR m32r_find_callers_reg PARAMS ((struct frame_info *fi, 
+extern CORE_ADDR m32r_find_callers_reg PARAMS ((struct frame_info * fi,
 						int regnum));
-extern CORE_ADDR m32r_frame_saved_pc PARAMS((struct frame_info *));
+extern CORE_ADDR m32r_frame_saved_pc PARAMS ((struct frame_info *));
 /* mvs_check  FRAME_SAVED_PC */
 #define FRAME_SAVED_PC(fi)		m32r_frame_saved_pc (fi)
 
@@ -198,7 +199,7 @@ extern use_struct_convention_fn m32r_use_struct_convention;
 
 /* target-specific dummy_frame stuff */
 
-extern struct frame_info *m32r_pop_frame PARAMS ((struct frame_info *frame));
+extern struct frame_info *m32r_pop_frame PARAMS ((struct frame_info * frame));
 /* mvs_check  POP_FRAME */
 #define POP_FRAME m32r_pop_frame (get_current_frame ())
 
@@ -206,8 +207,8 @@ extern struct frame_info *m32r_pop_frame PARAMS ((struct frame_info *frame));
 /* #define STACK_ALIGN(x) ((x + 3) & ~3) */
 
 extern CORE_ADDR m32r_push_return_address PARAMS ((CORE_ADDR, CORE_ADDR));
-extern CORE_ADDR m32r_push_arguments PARAMS ((int nargs, 
-					      struct value **args, 
+extern CORE_ADDR m32r_push_arguments PARAMS ((int nargs,
+					      struct value ** args,
 					      CORE_ADDR sp,
 					      unsigned char struct_return,
 					      CORE_ADDR struct_addr));
diff --git a/gdb/config/m68k/nm-apollo68b.h b/gdb/config/m68k/nm-apollo68b.h
index 4048a8b4ad3..27a4a3421d0 100644
--- a/gdb/config/m68k/nm-apollo68b.h
+++ b/gdb/config/m68k/nm-apollo68b.h
@@ -1,21 +1,22 @@
 /* Macro defintions for an Apollo m68k in BSD mode
    Copyright (C) 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define	FETCH_INFERIOR_REGISTERS
 
@@ -29,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define KERNEL_U_ADDR 0
 
-#undef FLOAT_INFO	/* No float info yet */
+#undef FLOAT_INFO		/* No float info yet */
 
 #define REGISTER_U_ADDR(addr, blockend, regno) \
 	(addr) = (6 + 4 * (regno))
diff --git a/gdb/config/m68k/nm-apollo68v.h b/gdb/config/m68k/nm-apollo68v.h
index 3a56f4a0192..496e105d303 100644
--- a/gdb/config/m68k/nm-apollo68v.h
+++ b/gdb/config/m68k/nm-apollo68v.h
@@ -1,20 +1,21 @@
 /* Macro defintions for an Apollo.
    Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define	FETCH_INFERIOR_REGISTERS
diff --git a/gdb/config/m68k/nm-delta68.h b/gdb/config/m68k/nm-delta68.h
index cb7ffbf2be8..c55be1e203a 100644
--- a/gdb/config/m68k/nm-delta68.h
+++ b/gdb/config/m68k/nm-delta68.h
@@ -1,21 +1,22 @@
 /* Macro definitions for a Motorola Delta Series sysV68 R3V7.1.
    Copyright (C) 1993, 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 
 #define KERNEL_U_SIZE kernel_u_size()
diff --git a/gdb/config/m68k/nm-dpx2.h b/gdb/config/m68k/nm-dpx2.h
index 50da268f4ae..b24e7c282bc 100644
--- a/gdb/config/m68k/nm-dpx2.h
+++ b/gdb/config/m68k/nm-dpx2.h
@@ -1,21 +1,22 @@
 /* Native support for a Bull DPX2.
    Copyright (C) 1986, 1987, 1989 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.  */
+   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.  */
 
 /* KERNEL_U_ADDR is determined upon startup in dpx2-xdep.c. */
 
diff --git a/gdb/config/m68k/nm-hp300bsd.h b/gdb/config/m68k/nm-hp300bsd.h
index 7aacbb18b35..552dede5dfd 100644
--- a/gdb/config/m68k/nm-hp300bsd.h
+++ b/gdb/config/m68k/nm-hp300bsd.h
@@ -1,21 +1,22 @@
 /* Parameters for Hewlett-Packard 9000/300 native support under bsd.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993  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.  */
+   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.  */
 
 /* Detect whether this is 4.3 or 4.4.  */
 
diff --git a/gdb/config/m68k/nm-hp300hpux.h b/gdb/config/m68k/nm-hp300hpux.h
index 83e7b2bfba8..0aad97661a0 100644
--- a/gdb/config/m68k/nm-hp300hpux.h
+++ b/gdb/config/m68k/nm-hp300hpux.h
@@ -1,21 +1,22 @@
 /* Parameters for native support on HP 9000 model 320, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1992 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.  */
+   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.  */
 
 /* Do implement the attach and detach commands.  */
 
diff --git a/gdb/config/m68k/nm-linux.h b/gdb/config/m68k/nm-linux.h
index d7a44ec3bb4..197076e5403 100644
--- a/gdb/config/m68k/nm-linux.h
+++ b/gdb/config/m68k/nm-linux.h
@@ -1,21 +1,22 @@
 /* Native support for linux, for GDB, the GNU debugger.
    Copyright (C) 1996,1998 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.  */
+   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.  */
 
 #ifndef NM_LINUX_H
 #define NM_LINUX_H
diff --git a/gdb/config/m68k/nm-m68klynx.h b/gdb/config/m68k/nm-m68klynx.h
index 62b8d243ec8..49114fc4df9 100644
--- a/gdb/config/m68k/nm-m68klynx.h
+++ b/gdb/config/m68k/nm-m68klynx.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Motorola 680x0 running LynxOS.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_M68KLYNX_H
 #define NM_M68KLYNX_H
diff --git a/gdb/config/m68k/nm-nbsd.h b/gdb/config/m68k/nm-nbsd.h
index ce22c4d5e28..b73b0ef71e5 100644
--- a/gdb/config/m68k/nm-nbsd.h
+++ b/gdb/config/m68k/nm-nbsd.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Motorola m68k running NetBSD, for GDB.
    Copyright 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Get generic NetBSD native definitions. */
 #include "nm-nbsd.h"
diff --git a/gdb/config/m68k/nm-news.h b/gdb/config/m68k/nm-news.h
index 643d217c349..3591ddb41ae 100644
--- a/gdb/config/m68k/nm-news.h
+++ b/gdb/config/m68k/nm-news.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Sony/NEWS, for GDB, the GNU debugger.
    Copyright 1987, 1989, 1992, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_HEWS_H
 #define NM_NEWS_H 1
@@ -23,4 +24,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Supply missing typedef needed in inftarg.c */
 typedef int pid_t;
 
-#endif	/* NM_NEWS_H */
+#endif /* NM_NEWS_H */
diff --git a/gdb/config/m68k/nm-sun2.h b/gdb/config/m68k/nm-sun2.h
index 90352504ebf..5d55caf2165 100644
--- a/gdb/config/m68k/nm-sun2.h
+++ b/gdb/config/m68k/nm-sun2.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Sun2, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1992 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.  */
+   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.  */
 
 /* Do implement the attach and detach commands.  */
 
diff --git a/gdb/config/m68k/nm-sun3.h b/gdb/config/m68k/nm-sun3.h
index e4ef8f4a56c..ca73c499840 100644
--- a/gdb/config/m68k/nm-sun3.h
+++ b/gdb/config/m68k/nm-sun3.h
@@ -2,21 +2,22 @@
    Copyright (C) 1986, 1987, 1989, 1991, 1992, 1996
    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.  */
+   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.  */
 
 /* Do implement the attach and detach commands.  */
 
diff --git a/gdb/config/m68k/nm-sysv4.h b/gdb/config/m68k/nm-sysv4.h
index 67731313d28..a7d0bdd3bda 100644
--- a/gdb/config/m68k/nm-sysv4.h
+++ b/gdb/config/m68k/nm-sysv4.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Motorola 680x0 running SVR4.
    Copyright 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 the generic SVR4 definitions.  */
 
diff --git a/gdb/config/m68k/tm-3b1.h b/gdb/config/m68k/tm-3b1.h
index f917760755b..90888c66655 100644
--- a/gdb/config/m68k/tm-3b1.h
+++ b/gdb/config/m68k/tm-3b1.h
@@ -1,21 +1,22 @@
 /* Parameters for targeting GDB to a 3b1.
    Copyright 1986, 1987, 1989, 1991, 1993 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.  */
+   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.  */
 
 /* The child target can't deal with floating registers.  */
 #define CANNOT_STORE_REGISTER(regno) ((regno) >= FP0_REGNUM)
diff --git a/gdb/config/m68k/tm-apollo68b.h b/gdb/config/m68k/tm-apollo68b.h
index ee10410d329..7fe0785cb92 100644
--- a/gdb/config/m68k/tm-apollo68b.h
+++ b/gdb/config/m68k/tm-apollo68b.h
@@ -2,21 +2,22 @@
    Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
-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.  */
+   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.  */
 
 /* Apollos use vector 0xb for the breakpoint vector */
 
diff --git a/gdb/config/m68k/tm-cisco.h b/gdb/config/m68k/tm-cisco.h
index c3628d00fe4..ae8de6602e5 100644
--- a/gdb/config/m68k/tm-cisco.h
+++ b/gdb/config/m68k/tm-cisco.h
@@ -1,21 +1,22 @@
 /* Parameters for CISCO m68k.
    Copyright (C) 1994 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.  */
+   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.  */
 
 #define GDBINIT_FILENAME	".cisco-gdbinit"	/* Init file */
 
diff --git a/gdb/config/m68k/tm-delta68.h b/gdb/config/m68k/tm-delta68.h
index 8e7723439e5..260f7332225 100644
--- a/gdb/config/m68k/tm-delta68.h
+++ b/gdb/config/m68k/tm-delta68.h
@@ -1,21 +1,22 @@
 /* Target definitions for delta68.
    Copyright 1993, 1994, 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Define BPT_VECTOR if it is different than the default.
    This is the vector number used by traps to indicate a breakpoint. */
@@ -75,7 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Return number of args passed to a frame.
    Can return -1, meaning no way to tell.  */
 
-extern int delta68_frame_num_args PARAMS ((struct frame_info *fi));
+extern int delta68_frame_num_args PARAMS ((struct frame_info * fi));
 #define FRAME_NUM_ARGS(fi) (delta68_frame_num_args ((fi)))
 
 /* On M68040 versions of sysV68 R3V7.1, ptrace(PT_WRITE_I) does not clear
diff --git a/gdb/config/m68k/tm-dpx2.h b/gdb/config/m68k/tm-dpx2.h
index 8b1bfdad9aa..763a0583256 100644
--- a/gdb/config/m68k/tm-dpx2.h
+++ b/gdb/config/m68k/tm-dpx2.h
@@ -1,21 +1,22 @@
 /* Parameters for targeting to a Bull DPX2.
    Copyright (C) 1986, 1987, 1989, 1991, 1994 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.  */
+   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.  */
 
 /* Define BPT_VECTOR if it is different than the default.
    This is the vector number used by traps to indicate a breakpoint. */
diff --git a/gdb/config/m68k/tm-es1800.h b/gdb/config/m68k/tm-es1800.h
index ce2af1d627d..ad1f2352ee3 100644
--- a/gdb/config/m68k/tm-es1800.h
+++ b/gdb/config/m68k/tm-es1800.h
@@ -4,21 +4,22 @@
    by Jan Norden TX/DK.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
-
-GDB 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 1, or (at your option)
-any later version.
-
-GDB 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.  */
+   This file is part of GDB.
+
+   GDB 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 1, or (at your option)
+   any later version.
+
+   GDB 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.  */
 
 #define	GDBINIT_FILENAME	".esgdbinit"
 
diff --git a/gdb/config/m68k/tm-hp300bsd.h b/gdb/config/m68k/tm-hp300bsd.h
index cdd75dc881a..07992a56435 100644
--- a/gdb/config/m68k/tm-hp300bsd.h
+++ b/gdb/config/m68k/tm-hp300bsd.h
@@ -1,21 +1,22 @@
 /* Parameters for target machine Hewlett-Packard 9000/300, running bsd.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 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.  */
+   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.  */
 
 /* Configuration file for HP9000/300 series machine running BSD,
    including Utah, Mt. Xinu or Berkeley variants.  This is NOT for HP-UX.
diff --git a/gdb/config/m68k/tm-hp300hpux.h b/gdb/config/m68k/tm-hp300hpux.h
index fce0d99df72..5ebdb7ca788 100644
--- a/gdb/config/m68k/tm-hp300hpux.h
+++ b/gdb/config/m68k/tm-hp300hpux.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on an HP 9000 model 320, for GDB, the GNU debugger.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 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.  */
+   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.  */
 
 /* GCC is the only compiler used for stabs on this OS.  So get this
    right even if the code which detects gcc2_compiled. is still
diff --git a/gdb/config/m68k/tm-isi.h b/gdb/config/m68k/tm-isi.h
index 5653fe657dd..1442d178f5b 100644
--- a/gdb/config/m68k/tm-isi.h
+++ b/gdb/config/m68k/tm-isi.h
@@ -1,21 +1,22 @@
 /* Definitions to target GDB on an ISI Optimum V (3.05) under 4.3bsd.
    Copyright (C) 1987, 1989, 1991, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This has not been tested on ISI's running BSD 4.2, but it will probably
    work.  */
@@ -36,12 +37,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    On the ISI, the kernel resets the pc to the trap instr */
 
 #define DECR_PC_AFTER_BREAK 0
-
 
+
 /* Return number of args passed to a frame.
    Can return -1, meaning no way to tell.  */
 
-extern int isi_frame_num_args PARAMS ((struct frame_info *fi));
+extern int isi_frame_num_args PARAMS ((struct frame_info * fi));
 #define FRAME_NUM_ARGS(fi) (isi_frame_num_args ((fi)))
 
 /* Put here the code to store, into a struct frame_saved_regs,
diff --git a/gdb/config/m68k/tm-linux.h b/gdb/config/m68k/tm-linux.h
index 6c119982ff5..9f597348143 100644
--- a/gdb/config/m68k/tm-linux.h
+++ b/gdb/config/m68k/tm-linux.h
@@ -1,21 +1,22 @@
 /* Definitions to target GDB to Linux on m680x0
    Copyright (C) 1996,1998 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.  */
+   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.  */
 
 /* Number of traps that happen between exec'ing the shell to run an
    inferior, and when we finally get to the inferior code.  This is 2
diff --git a/gdb/config/m68k/tm-m68k.h b/gdb/config/m68k/tm-m68k.h
index 4835b39872e..da80f107569 100644
--- a/gdb/config/m68k/tm-m68k.h
+++ b/gdb/config/m68k/tm-m68k.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a 68000 series machine.
    Copyright 1986, 1987, 1989, 1990, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Generic 68000 stuff, to be included by other tm-*.h files.  */
 
@@ -322,8 +323,8 @@ do									\
 #if !defined (FRAME_FIND_SAVED_REGS)
 #define FRAME_FIND_SAVED_REGS(fi,fsr) m68k_find_saved_regs ((fi), &(fsr))
 #endif /* no FIND_FRAME_SAVED_REGS.  */
-
 
+
 /* Things needed for making the inferior call functions.  */
 
 /* The CALL_DUMMY macro is the sequence of instructions, as disassembled
@@ -332,20 +333,20 @@ do									\
    These instructions exist only so that m68k_find_saved_regs can parse
    them as a "prologue"; they are never executed.
 
-	fmovemx fp0-fp7,sp@-			0xf227 0xe0ff
-	moveml d0-a5,sp@-			0x48e7 0xfffc
-	clrw sp@-				0x4267
-	movew ccr,sp@-				0x42e7
+   fmovemx fp0-fp7,sp@-                 0xf227 0xe0ff
+   moveml d0-a5,sp@-                    0x48e7 0xfffc
+   clrw sp@-                            0x4267
+   movew ccr,sp@-                               0x42e7
 
    The arguments are pushed at this point by GDB; no code is needed in
    the dummy for this.  The CALL_DUMMY_START_OFFSET gives the position
    of the following jsr instruction.  That is where we start
    executing.
 
-	jsr @#0x32323232			0x4eb9 0x3232 0x3232
-	addal #0x69696969,sp			0xdffc 0x6969 0x6969
-	trap #<your BPT_VECTOR number here>	0x4e4?
-	nop					0x4e71
+   jsr @#0x32323232                     0x4eb9 0x3232 0x3232
+   addal #0x69696969,sp                 0xdffc 0x6969 0x6969
+   trap #<your BPT_VECTOR number here>  0x4e4?
+   nop                                  0x4e71
 
    Note this is CALL_DUMMY_LENGTH bytes (28 for the above example).
 
@@ -357,8 +358,8 @@ do									\
    CALL_DUMMY_BREAKPOINT_OFFSET.  */
 
 #define CALL_DUMMY {0xf227e0ff, 0x48e7fffc, 0x426742e7, 0x4eb93232, 0x3232dffc, 0x69696969, (0x4e404e71 | (BPT_VECTOR << 16))}
-#define CALL_DUMMY_LENGTH 28		/* Size of CALL_DUMMY */
-#define CALL_DUMMY_START_OFFSET 12	/* Offset to jsr instruction*/
+#define CALL_DUMMY_LENGTH 28	/* Size of CALL_DUMMY */
+#define CALL_DUMMY_START_OFFSET 12	/* Offset to jsr instruction */
 #define CALL_DUMMY_BREAKPOINT_OFFSET (CALL_DUMMY_START_OFFSET + 12)
 
 /* Insert the specified number of args and function address
diff --git a/gdb/config/m68k/tm-m68klynx.h b/gdb/config/m68k/tm-m68klynx.h
index fbe57076f3c..cfc462f54a4 100644
--- a/gdb/config/m68k/tm-m68klynx.h
+++ b/gdb/config/m68k/tm-m68klynx.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Motorola 680x0 running under LynxOS.
    Copyright 1993 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.  */
+   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.  */
 
 #ifndef TM_M68KLYNX_H
 #define TM_M68KLYNX_H
diff --git a/gdb/config/m68k/tm-m68kv4.h b/gdb/config/m68k/tm-m68kv4.h
index 67306073c80..9fd246075c5 100644
--- a/gdb/config/m68k/tm-m68kv4.h
+++ b/gdb/config/m68k/tm-m68kv4.h
@@ -3,21 +3,22 @@
    Copyright (C) 1991, 1995 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygint)
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Define BPT_VECTOR if it is different than the default.
    This is the vector number used by traps to indicate a breakpoint. */
@@ -26,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* How much to decrement the PC after a trap.  Depends on kernel. */
 
-#define DECR_PC_AFTER_BREAK 0		/* No decrement required */
+#define DECR_PC_AFTER_BREAK 0	/* No decrement required */
 
 /* Use the alternate method of determining valid frame chains. */
 
@@ -56,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define JB_A6	11
 #define JB_A7	12
 
-#define JB_PC	JB_A1	/* Setjmp()'s return PC saved in A1 */
+#define JB_PC	JB_A1		/* Setjmp()'s return PC saved in A1 */
 
 /* Figure out where the longjmp will land.  Slurp the args out of the stack.
    We expect the first arg to be a pointer to the jmp_buf structure from which
diff --git a/gdb/config/m68k/tm-mac.h b/gdb/config/m68k/tm-mac.h
index 90b4fabf5cb..3d8b9ec8529 100644
--- a/gdb/config/m68k/tm-mac.h
+++ b/gdb/config/m68k/tm-mac.h
@@ -1,20 +1,21 @@
 /* Target-dependent definitions for Mac running MacOS.
    Copyright (C) 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-monitor.h b/gdb/config/m68k/tm-monitor.h
index 7a48d9c9a49..24c044d119b 100644
--- a/gdb/config/m68k/tm-monitor.h
+++ b/gdb/config/m68k/tm-monitor.h
@@ -1,21 +1,22 @@
 /* Target machine definitions for a generic m68k monitor/emulator.
    Copyright (C) 1986, 1987, 1989, 1993, 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* The definitions here are appropriate for several embedded m68k-based
    targets, including IDP (rom68k), BCC (cpu32bug), and EST's emulator.  */
@@ -32,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* No float registers.  */
 
-/*#define NUM_REGS 18*/
+/*#define NUM_REGS 18 */
 
 #include "m68k/tm-m68k.h"
 
diff --git a/gdb/config/m68k/tm-nbsd.h b/gdb/config/m68k/tm-nbsd.h
index cc86cc8d4d2..fa8941755dc 100644
--- a/gdb/config/m68k/tm-nbsd.h
+++ b/gdb/config/m68k/tm-nbsd.h
@@ -1,21 +1,22 @@
 /* Macro definitions for i386 running under NetBSD.
    Copyright 1994 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.  */
+   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.  */
 
 #ifndef TM_NBSD_H
 #define TM_NBSD_H
diff --git a/gdb/config/m68k/tm-news.h b/gdb/config/m68k/tm-news.h
index d844682b871..ff9230b50f1 100644
--- a/gdb/config/m68k/tm-news.h
+++ b/gdb/config/m68k/tm-news.h
@@ -1,30 +1,31 @@
 /* Parameters for execution on a Sony/NEWS, for GDB, the GNU debugger.
    Copyright 1987, 1989, 1991, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* See following cpu type determination macro to get the machine type.
 
-Here is an m-news.h file for gdb.  It supports the 68881 registers.
-                                           by hikichi@srava.sra.junet
+   Here is an m-news.h file for gdb.  It supports the 68881 registers.
+   by hikichi@srava.sra.junet
 
-* Ptrace for handling floating register has a bug(before NEWS OS version 2.2),
-* After NEWS OS version 3.2, some of ptrace's bug is fixed.
-  But we cannot change the floating register(see adb(1) in OS 3.2) yet.  */
+   * Ptrace for handling floating register has a bug(before NEWS OS version 2.2),
+   * After NEWS OS version 3.2, some of ptrace's bug is fixed.
+   But we cannot change the floating register(see adb(1) in OS 3.2) yet.  */
 
 /* Extract from an array REGBUF containing the (raw) register state
    a function return value of type TYPE, and copy that, in virtual format,
@@ -59,7 +60,7 @@ Here is an m-news.h file for gdb.  It supports the 68881 registers.
 /* Return number of args passed to a frame.
    Can return -1, meaning no way to tell.  */
 
-extern int news_frame_num_args PARAMS ((struct frame_info *fi));
+extern int news_frame_num_args PARAMS ((struct frame_info * fi));
 #define FRAME_NUM_ARGS(fi) (news_frame_num_args ((fi)))
 
 #include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-os68k.h b/gdb/config/m68k/tm-os68k.h
index a69573f761b..5a9bfe88210 100644
--- a/gdb/config/m68k/tm-os68k.h
+++ b/gdb/config/m68k/tm-os68k.h
@@ -2,21 +2,22 @@
    Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
-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.  */
+   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.  */
 
 #define	GDBINIT_FILENAME	".os68gdbinit"
 
diff --git a/gdb/config/m68k/tm-st2000.h b/gdb/config/m68k/tm-st2000.h
index 8ddf0e9aead..4d7a2b19bf9 100644
--- a/gdb/config/m68k/tm-st2000.h
+++ b/gdb/config/m68k/tm-st2000.h
@@ -1,20 +1,21 @@
 /* Parameters for a Tandem ST2000 phone switch.
    Copyright (C) 1986, 1987, 1989, 199 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-sun2.h b/gdb/config/m68k/tm-sun2.h
index 9970f1ef5c2..e839bea7f5a 100644
--- a/gdb/config/m68k/tm-sun2.h
+++ b/gdb/config/m68k/tm-sun2.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Sun, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* The child target can't deal with floating registers.  */
 #define CANNOT_STORE_REGISTER(regno) ((regno) >= FP0_REGNUM)
diff --git a/gdb/config/m68k/tm-sun2os4.h b/gdb/config/m68k/tm-sun2os4.h
index 76c7f99f217..496c32955b3 100644
--- a/gdb/config/m68k/tm-sun2os4.h
+++ b/gdb/config/m68k/tm-sun2os4.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1990, Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m68k/tm-sun2.h"
 #include "tm-sunos.h"
diff --git a/gdb/config/m68k/tm-sun3.h b/gdb/config/m68k/tm-sun3.h
index be45db4cf8c..ce88045c7d7 100644
--- a/gdb/config/m68k/tm-sun3.h
+++ b/gdb/config/m68k/tm-sun3.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Sun, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1992 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.  */
+   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.  */
 
 #ifndef TM_SUN3_H
 #define TM_SUN3_H
diff --git a/gdb/config/m68k/tm-sun3os4.h b/gdb/config/m68k/tm-sun3os4.h
index 927587b7819..d4bc74fd8e7 100644
--- a/gdb/config/m68k/tm-sun3os4.h
+++ b/gdb/config/m68k/tm-sun3os4.h
@@ -1,21 +1,22 @@
 /* Target machine parameters for Sun-3 under SunOS 4.x, for GDB.
    Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m68k/tm-sun3.h"
 #include "tm-sunos.h"
diff --git a/gdb/config/m68k/tm-vx68.h b/gdb/config/m68k/tm-vx68.h
index fbec915b463..743220ed63e 100644
--- a/gdb/config/m68k/tm-vx68.h
+++ b/gdb/config/m68k/tm-vx68.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
-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.  */
+   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.  */
 
 /* GCC is probably the only compiler used on this configuration.  So
    get this right even if the code which detects gcc2_compiled. is
diff --git a/gdb/config/m68k/xm-3b1.h b/gdb/config/m68k/xm-3b1.h
index ad4b5b7c57a..a07fcd28c9d 100644
--- a/gdb/config/m68k/xm-3b1.h
+++ b/gdb/config/m68k/xm-3b1.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a 3b1.
    Copyright (C) 1986, 1987, 1989 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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
diff --git a/gdb/config/m68k/xm-altos.h b/gdb/config/m68k/xm-altos.h
index 008f769eaa0..084c7b01a85 100644
--- a/gdb/config/m68k/xm-altos.h
+++ b/gdb/config/m68k/xm-altos.h
@@ -31,7 +31,7 @@
 /* OBSOLETE  */
 /* OBSOLETE #define HAVE_TERMIO */
 /* OBSOLETE  */
-/* OBSOLETE #define CBREAK XTABS	/* It takes all kinds... *x/ */
+/* OBSOLETE #define CBREAK XTABS        /* It takes all kinds... *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #ifndef R_OK */
 /* OBSOLETE #define R_OK 4 */
@@ -51,27 +51,27 @@
 /* OBSOLETE  */
 /* OBSOLETE #define KERNEL_U_ADDR 0x1fbf000 */
 /* OBSOLETE  */
-/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno)		\ */
-/* OBSOLETE {	if (regno <= SP_REGNUM) \ */
-/* OBSOLETE 	  addr = blockend + regno * 4; \ */
-/* OBSOLETE 	else if (regno == PS_REGNUM) \ */
-/* OBSOLETE 	  addr = blockend + regno * 4 + 4; \ */
-/* OBSOLETE 	else if (regno == PC_REGNUM) \ */
-/* OBSOLETE 	  addr = blockend + regno * 4 + 2; \ */
+/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno)              \ */
+/* OBSOLETE {   if (regno <= SP_REGNUM) \ */
+/* OBSOLETE       addr = blockend + regno * 4; \ */
+/* OBSOLETE     else if (regno == PS_REGNUM) \ */
+/* OBSOLETE       addr = blockend + regno * 4 + 4; \ */
+/* OBSOLETE     else if (regno == PC_REGNUM) \ */
+/* OBSOLETE       addr = blockend + regno * 4 + 2; \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
-/* OBSOLETE #define REGISTER_ADDR(u_ar0, regno)					\ */
-/* OBSOLETE   (((regno) < PS_REGNUM)						\ */
-/* OBSOLETE    ? (&((struct exception_stack *) (u_ar0))->e_regs[(regno + R0)])	\ */
-/* OBSOLETE    : (((regno) == PS_REGNUM)						\ */
-/* OBSOLETE       ? ((int *) (&((struct exception_stack *) (u_ar0))->e_PS))		\ */
+/* OBSOLETE #define REGISTER_ADDR(u_ar0, regno)                                 \ */
+/* OBSOLETE   (((regno) < PS_REGNUM)                                            \ */
+/* OBSOLETE    ? (&((struct exception_stack *) (u_ar0))->e_regs[(regno + R0)])  \ */
+/* OBSOLETE    : (((regno) == PS_REGNUM)                                                \ */
+/* OBSOLETE       ? ((int *) (&((struct exception_stack *) (u_ar0))->e_PS))             \ */
 /* OBSOLETE       : (&((struct exception_stack *) (u_ar0))->e_PC))) */
 /* OBSOLETE  */
-/* OBSOLETE #define FP_REGISTER_ADDR(u, regno)					\ */
-/* OBSOLETE   (((char *)								\ */
-/* OBSOLETE     (((regno) < FPC_REGNUM)						\ */
+/* OBSOLETE #define FP_REGISTER_ADDR(u, regno)                                  \ */
+/* OBSOLETE   (((char *)                                                                \ */
+/* OBSOLETE     (((regno) < FPC_REGNUM)                                         \ */
 /* OBSOLETE      ? (&u.u_pcb.pcb_mc68881[FMC68881_R0 + (((regno) - FP0_REGNUM) * 3)]) \ */
-/* OBSOLETE      : (&u.u_pcb.pcb_mc68881[FMC68881_C + ((regno) - FPC_REGNUM)])))	\ */
+/* OBSOLETE      : (&u.u_pcb.pcb_mc68881[FMC68881_C + ((regno) - FPC_REGNUM)])))        \ */
 /* OBSOLETE    - ((char *) (& u))) */
 /* OBSOLETE  */
 /* OBSOLETE  */
@@ -161,19 +161,19 @@
 /* OBSOLETE  */
 /* OBSOLETE #ifdef MOTOROLA */
 /* OBSOLETE #define PUSH_REGISTERS        \ */
-/* OBSOLETE { asm ("clr.w -(sp)");	      \ */
-/* OBSOLETE   asm ("pea (10,sp)");	      \ */
+/* OBSOLETE { asm ("clr.w -(sp)");            \ */
+/* OBSOLETE   asm ("pea (10,sp)");            \ */
 /* OBSOLETE   asm ("movem $ 0xfffe,-(sp)"); } */
 /* OBSOLETE #else */
 /* OBSOLETE #ifdef ALTOS_AS */
 /* OBSOLETE #define PUSH_REGISTERS        \ */
-/* OBSOLETE { asm ("clr.w -(%sp)");	      \ */
-/* OBSOLETE   asm ("pea (10,%sp)");	      \ */
+/* OBSOLETE { asm ("clr.w -(%sp)");           \ */
+/* OBSOLETE   asm ("pea (10,%sp)");           \ */
 /* OBSOLETE   asm ("movm.l &0xfffe,-(%sp)"); } */
 /* OBSOLETE #else */
 /* OBSOLETE #define PUSH_REGISTERS        \ */
-/* OBSOLETE { asm ("clrw -(sp)");	      \ */
-/* OBSOLETE   asm ("pea 10(sp)");	      \ */
+/* OBSOLETE { asm ("clrw -(sp)");             \ */
+/* OBSOLETE   asm ("pea 10(sp)");             \ */
 /* OBSOLETE   asm ("movem $ 0xfffe,-(sp)"); } */
 /* OBSOLETE #endif */
 /* OBSOLETE #endif */
diff --git a/gdb/config/m68k/xm-apollo68b.h b/gdb/config/m68k/xm-apollo68b.h
index f0defdaa91d..8509c3259bf 100644
--- a/gdb/config/m68k/xm-apollo68b.h
+++ b/gdb/config/m68k/xm-apollo68b.h
@@ -1,24 +1,25 @@
 /* Macro definitions for an Apollo m68k in BSD mode
    Copyright (C) 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
 #define ALIGN_STACK_ON_STARTUP
 
-extern char *strdup();
+extern char *strdup ();
diff --git a/gdb/config/m68k/xm-apollo68v.h b/gdb/config/m68k/xm-apollo68v.h
index c87ff478390..264076baa8e 100644
--- a/gdb/config/m68k/xm-apollo68v.h
+++ b/gdb/config/m68k/xm-apollo68v.h
@@ -1,21 +1,22 @@
 /* Macro defintions for an Apollo.
    Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /*
  * Changes for 80386 by Pace Willisson (pace@prep.ai.mit.edu)
@@ -25,20 +26,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
 /* I'm running gdb 3.4 under 386/ix 2.0.2, which is a derivative of AT&T's
-Sys V/386 3.2.
-
-On some machines, gdb crashes when it's starting up while calling the
-vendor's termio tgetent() routine.  It always works when run under
-itself (actually, under 3.2, it's not an infinitely recursive bug.)
-After some poking around, it appears that depending on the environment
-size, or whether you're running YP, or the phase of the moon or something,
-the stack is not always long-aligned when main() is called, and tgetent()
-takes strong offense at that.  On some machines this bug never appears, but
-on those where it does, it occurs quite reliably.  */
+   Sys V/386 3.2.
+
+   On some machines, gdb crashes when it's starting up while calling the
+   vendor's termio tgetent() routine.  It always works when run under
+   itself (actually, under 3.2, it's not an infinitely recursive bug.)
+   After some poking around, it appears that depending on the environment
+   size, or whether you're running YP, or the phase of the moon or something,
+   the stack is not always long-aligned when main() is called, and tgetent()
+   takes strong offense at that.  On some machines this bug never appears, but
+   on those where it does, it occurs quite reliably.  */
 #define ALIGN_STACK_ON_STARTUP
 
 /* define USG if you are using sys5 /usr/include's */
 #define USG
 
 #define HAVE_TERMIO
-
diff --git a/gdb/config/m68k/xm-delta68.h b/gdb/config/m68k/xm-delta68.h
index 6ce705cf85f..d1375459cd2 100644
--- a/gdb/config/m68k/xm-delta68.h
+++ b/gdb/config/m68k/xm-delta68.h
@@ -1,21 +1,22 @@
 /* Macro definitions for a Delta.
    Copyright (C) 1986, 1987, 1989, 1992 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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
diff --git a/gdb/config/m68k/xm-dpx2.h b/gdb/config/m68k/xm-dpx2.h
index e5532e7229c..f17d7143adb 100644
--- a/gdb/config/m68k/xm-dpx2.h
+++ b/gdb/config/m68k/xm-dpx2.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Bull DPX2.
    Copyright (C) 1986, 1987, 1989 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
diff --git a/gdb/config/m68k/xm-hp300bsd.h b/gdb/config/m68k/xm-hp300bsd.h
index 5e67792dad1..0da48bcf766 100644
--- a/gdb/config/m68k/xm-hp300bsd.h
+++ b/gdb/config/m68k/xm-hp300bsd.h
@@ -1,21 +1,22 @@
 /* Parameters for hosting on a Hewlett-Packard 9000/300, running bsd.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993  Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /*
  * Configuration file for HP9000/300 series machine running
@@ -25,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define	HOST_BYTE_ORDER	BIG_ENDIAN
 
-#include <sys/param.h>	/* For INT_MIN */
+#include <sys/param.h>		/* For INT_MIN */
 
 /* Kernel is a bit tenacious about sharing text segments, disallowing bpts.  */
 #define	ONE_PROCESS_WRITETEXT
diff --git a/gdb/config/m68k/xm-hp300hpux.h b/gdb/config/m68k/xm-hp300hpux.h
index b6d75d611e4..5f9d9747ddb 100644
--- a/gdb/config/m68k/xm-hp300hpux.h
+++ b/gdb/config/m68k/xm-hp300hpux.h
@@ -1,21 +1,22 @@
 /* Parameters for HP 9000 model 320 hosting, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
@@ -35,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* #define HPUX_VERSION_5 */
 
 /* define USG if you are using sys5 /usr/include's */
-#undef USG	/* In case it was defined in the Makefile for cplus-dem.c */
+#undef USG			/* In case it was defined in the Makefile for cplus-dem.c */
 #define USG
 
 #define HAVE_TERMIOS
diff --git a/gdb/config/m68k/xm-isi.h b/gdb/config/m68k/xm-isi.h
index 4e75333fcbb..d21d243cb70 100644
--- a/gdb/config/m68k/xm-isi.h
+++ b/gdb/config/m68k/xm-isi.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on an ISI Optimum V (3.05) under 4.3bsd.
    Copyright 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
@@ -25,11 +26,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* This is the amount to subtract from u.u_ar0
    to get the offset in the core file of the register values.  */
 
-/*#define KERNEL_U_ADDR 0x10800000*/
+/*#define KERNEL_U_ADDR 0x10800000 */
 #define KERNEL_U_ADDR 0
 
 /* expects blockend to be u.u_ar0 */
-extern int rloc[];  	/* Defined in isi-dep.c */
+extern int rloc[];		/* Defined in isi-dep.c */
 #define REGISTER_U_ADDR(addr, blockend, regno)                  \
 {       blockend &= UPAGES*NBPG - 1;                            \
 	if (regno < 18) addr = (int)blockend + rloc[regno]*4;  	\
diff --git a/gdb/config/m68k/xm-linux.h b/gdb/config/m68k/xm-linux.h
index 7266cffdfa2..704b781940d 100644
--- a/gdb/config/m68k/xm-linux.h
+++ b/gdb/config/m68k/xm-linux.h
@@ -1,21 +1,22 @@
 /* Native support for linux, for GDB, the GNU debugger.
    Copyright (C) 1996,1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef XM_LINUX_H
 #define XM_LINUX_H
@@ -37,4 +38,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Need R_OK etc, but USG isn't defined.  */
 #include <unistd.h>
 
-#endif	/* #ifndef XM_LINUX_H */
+#endif /* #ifndef XM_LINUX_H */
diff --git a/gdb/config/m68k/xm-m68k.h b/gdb/config/m68k/xm-m68k.h
index 547940877f1..a751f0ee089 100644
--- a/gdb/config/m68k/xm-m68k.h
+++ b/gdb/config/m68k/xm-m68k.h
@@ -2,21 +2,21 @@
    Copyright (C) 1991, Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygint)
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
-
diff --git a/gdb/config/m68k/xm-m68klynx.h b/gdb/config/m68k/xm-m68klynx.h
index ded6844c907..1247b5d7603 100644
--- a/gdb/config/m68k/xm-m68klynx.h
+++ b/gdb/config/m68k/xm-m68klynx.h
@@ -1,21 +1,22 @@
 /* Host-dependent definitions for Motorola 680x0 running LynxOS, for GDB.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
diff --git a/gdb/config/m68k/xm-m68kv4.h b/gdb/config/m68k/xm-m68kv4.h
index 2149c8ffd65..8c927c8e90b 100644
--- a/gdb/config/m68k/xm-m68kv4.h
+++ b/gdb/config/m68k/xm-m68kv4.h
@@ -3,21 +3,22 @@
    Copyright 1991, 1992 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygnus.com)
 
-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.  */
+   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.  */
 
 /* Pick up most of what we need from the generic m68k host include file. */
 
diff --git a/gdb/config/m68k/xm-mpw.h b/gdb/config/m68k/xm-mpw.h
index f0585b38a3a..1555c7d8659 100644
--- a/gdb/config/m68k/xm-mpw.h
+++ b/gdb/config/m68k/xm-mpw.h
@@ -1,21 +1,22 @@
 /* Macro definitions for running GDB on Apple 68k-based Macintoshes.
    Copyright (C) 1994, 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
diff --git a/gdb/config/m68k/xm-nbsd.h b/gdb/config/m68k/xm-nbsd.h
index aa28e19bdf7..c266a99e628 100644
--- a/gdb/config/m68k/xm-nbsd.h
+++ b/gdb/config/m68k/xm-nbsd.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Motorola m68k running NetBSD, for GDB.
    Copyright 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Get generic NetBSD host definitions. */
 #include "xm-nbsd.h"
diff --git a/gdb/config/m68k/xm-news.h b/gdb/config/m68k/xm-news.h
index 081337bcf33..d6f1ff4c923 100644
--- a/gdb/config/m68k/xm-news.h
+++ b/gdb/config/m68k/xm-news.h
@@ -1,25 +1,26 @@
 /* Parameters for execution on a Sony/NEWS, for GDB, the GNU debugger.
    Copyright 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
-#include <sys/param.h>	/* For INT_MIN */
+#include <sys/param.h>		/* For INT_MIN */
 
 #define HAVE_WAIT_STRUCT
 
diff --git a/gdb/config/m68k/xm-news1000.h b/gdb/config/m68k/xm-news1000.h
index b70234c058a..56fee6e7fd3 100644
--- a/gdb/config/m68k/xm-news1000.h
+++ b/gdb/config/m68k/xm-news1000.h
@@ -2,21 +2,22 @@
    for GDB, the GNU debugger.
    Copyright (C) 1990 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This is required by Sony include files like <sys/user.h> so we
    get the right offset into the u area.  Relying on the compiler
diff --git a/gdb/config/m68k/xm-sun2.h b/gdb/config/m68k/xm-sun2.h
index 457451c4d74..d50f713d601 100644
--- a/gdb/config/m68k/xm-sun2.h
+++ b/gdb/config/m68k/xm-sun2.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Sun, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
@@ -23,8 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    to get the offset in the core file of the register values.  */
 
 #define KERNEL_U_ADDR 0x2800
-
 
+
 /* Interface definitions for kernel debugger KDB.  */
 
 /* Map machine fault codes into signal numbers.
diff --git a/gdb/config/m68k/xm-sun3.h b/gdb/config/m68k/xm-sun3.h
index 3de7446d184..ffb4a96ac0b 100644
--- a/gdb/config/m68k/xm-sun3.h
+++ b/gdb/config/m68k/xm-sun3.h
@@ -1,25 +1,26 @@
 /* Parameters for execution on a Sun, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
-
 
+
 /* Interface definitions for kernel debugger KDB.  */
 
 /* Map machine fault codes into signal numbers.
diff --git a/gdb/config/m68k/xm-sun3os4.h b/gdb/config/m68k/xm-sun3os4.h
index faf3b7de7ed..79170041319 100644
--- a/gdb/config/m68k/xm-sun3os4.h
+++ b/gdb/config/m68k/xm-sun3os4.h
@@ -1,21 +1,22 @@
 /* Macro definitions for a sun 3 running os 4.
    Copyright (C) 1989, Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m68k/xm-sun3.h"
 #define FPU
diff --git a/gdb/config/m88k/nm-cxux.h b/gdb/config/m88k/nm-cxux.h
index fec953650c8..8a8eaef9aaa 100644
--- a/gdb/config/m88k/nm-cxux.h
+++ b/gdb/config/m88k/nm-cxux.h
@@ -1,21 +1,22 @@
 /* Native definitions for Motorola 88K running Harris CX/UX
    Copyright 1993, 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Override the standard fetch/store definitions.  */
 
@@ -28,5 +29,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define PTRACE_ATTACH 128
 #define PTRACE_DETACH 129
-
-
diff --git a/gdb/config/m88k/nm-delta88v4.h b/gdb/config/m88k/nm-delta88v4.h
index 9c1a30eb2bc..1f8e3ee862a 100644
--- a/gdb/config/m88k/nm-delta88v4.h
+++ b/gdb/config/m88k/nm-delta88v4.h
@@ -1,21 +1,22 @@
 /* Native machine description for Motorola Delta 88 box, for GDB.
    Copyright 1986, 1987, 1988, 1989, 1990, 1991 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m88k/nm-m88k.h"
 #include "nm-sysv4.h"
diff --git a/gdb/config/m88k/nm-m88k.h b/gdb/config/m88k/nm-m88k.h
index 95eca0a00f9..4c402bd1127 100644
--- a/gdb/config/m88k/nm-m88k.h
+++ b/gdb/config/m88k/nm-m88k.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define FETCH_INFERIOR_REGISTERS
 
diff --git a/gdb/config/m88k/tm-cxux.h b/gdb/config/m88k/tm-cxux.h
index e59c6dabfb9..b74f1224f51 100644
--- a/gdb/config/m88k/tm-cxux.h
+++ b/gdb/config/m88k/tm-cxux.h
@@ -1,21 +1,22 @@
 /* Target definitions for m88k running Harris CX/UX.
    Copyright 1993, 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HARRIS_TARGET 1
 
@@ -23,9 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Type of X registers, as supplied by the OS */
 
-typedef struct {
-   long w1, w2, w3, w4;
-} X_REGISTER_RAW_TYPE;
+typedef struct
+  {
+    long w1, w2, w3, w4;
+  }
+X_REGISTER_RAW_TYPE;
 
 #define X_REGISTER_VIRTUAL_TYPE double
 
diff --git a/gdb/config/m88k/tm-delta88.h b/gdb/config/m88k/tm-delta88.h
index c0a9c4a4f73..cc6bab6478c 100644
--- a/gdb/config/m88k/tm-delta88.h
+++ b/gdb/config/m88k/tm-delta88.h
@@ -1,21 +1,22 @@
 /* Target machine description for Motorola Delta 88 box, for GDB.
    Copyright 1986, 1987, 1988, 1989, 1990, 1991 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m88k/tm-m88k.h"
 
diff --git a/gdb/config/m88k/tm-delta88v4.h b/gdb/config/m88k/tm-delta88v4.h
index 112a4a6d65b..6804d9804df 100644
--- a/gdb/config/m88k/tm-delta88v4.h
+++ b/gdb/config/m88k/tm-delta88v4.h
@@ -1,21 +1,22 @@
 /* Target machine description for Motorola Delta 88 box, for GDB.
    Copyright 1986, 1987, 1988, 1989, 1990, 1991 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.  */
+   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.  */
 
 #define DELTA88
 
diff --git a/gdb/config/m88k/tm-m88k.h b/gdb/config/m88k/tm-m88k.h
index 0259c0b6291..1acb83e9584 100644
--- a/gdb/config/m88k/tm-m88k.h
+++ b/gdb/config/m88k/tm-m88k.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1993
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* g++ support is not yet included.  */
 
@@ -266,9 +267,9 @@ extern CORE_ADDR m88k_addr_bits_remove PARAMS ((CORE_ADDR));
 
 #define PC_REGNUM SXIP_REGNUM	/* Program Counter */
 #define NPC_REGNUM SNIP_REGNUM	/* Next Program Counter */
-#define NNPC_REGNUM SFIP_REGNUM /* Next Next Program Counter */
+#define NNPC_REGNUM SFIP_REGNUM	/* Next Next Program Counter */
 
-#define PSR_REGNUM 32           /* Processor Status Register */
+#define PSR_REGNUM 32		/* Processor Status Register */
 #define FPSR_REGNUM 33		/* Floating Point Status Register */
 #define FPCR_REGNUM 34		/* Floating Point Control Register */
 #define XFP_REGNUM 38		/* First Extended Float Register */
@@ -502,18 +503,18 @@ extern CORE_ADDR frame_locals_address ();
    nice information for GDB to have, but it is not strictly manditory if we
    can live without the ability to look at values within (or backup to)
    previous frames.
-*/
+ */
 
 struct frame_saved_regs;
 struct frame_info;
 
-void frame_find_saved_regs PARAMS((struct frame_info *fi,
-				   struct frame_saved_regs *fsr));
+void frame_find_saved_regs PARAMS ((struct frame_info * fi,
+				    struct frame_saved_regs * fsr));
 
 #define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs) \
         frame_find_saved_regs (frame_info, &frame_saved_regs)
-
 
+
 #define POP_FRAME pop_frame ()
 extern void pop_frame ();
 
@@ -521,7 +522,7 @@ extern void pop_frame ();
 
 #define CALL_DUMMY_LOCATION AFTER_TEXT_END
 
-extern void m88k_push_dummy_frame();
+extern void m88k_push_dummy_frame ();
 #define PUSH_DUMMY_FRAME	m88k_push_dummy_frame()
 
 #define CALL_DUMMY { 				\
@@ -597,11 +598,11 @@ extern void m88k_push_dummy_frame();
 /* According to the MC88100 RISC Microprocessor User's Manual, section
    6.4.3.1.2:
 
-   	... can be made to return to a particular instruction by placing a
-	valid instruction address in the SNIP and the next sequential
-	instruction address in the SFIP (with V bits set and E bits clear).
-	The rte resumes execution at the instruction pointed to by the 
-	SNIP, then the SFIP.
+   ... can be made to return to a particular instruction by placing a
+   valid instruction address in the SNIP and the next sequential
+   instruction address in the SFIP (with V bits set and E bits clear).
+   The rte resumes execution at the instruction pointed to by the 
+   SNIP, then the SFIP.
 
    The E bit is the least significant bit (bit 0).  The V (valid) bit is
    bit 1.  This is why we logical or 2 into the values we are writing
@@ -610,8 +611,8 @@ extern void m88k_push_dummy_frame();
    (presumably) give it a totally bogus value.
 
    -- Kevin Buettner
-*/
- 
+ */
+
 #define TARGET_WRITE_PC(val, pid) { \
   write_register_pid(SXIP_REGNUM, (long) val, pid); \
   write_register_pid(SNIP_REGNUM, (long) val | 2, pid); \
diff --git a/gdb/config/m88k/xm-cxux.h b/gdb/config/m88k/xm-cxux.h
index 582c613436b..86e209a3d84 100644
--- a/gdb/config/m88k/xm-cxux.h
+++ b/gdb/config/m88k/xm-cxux.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1993
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m88k/xm-m88k.h"
 
@@ -32,8 +33,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define x_fname _x_name
 #define USER ptrace_user
 /*
-#define _BSD_WAIT_FLAVOR
-*/
+   #define _BSD_WAIT_FLAVOR
+ */
 
 #define HAVE_TERMIO
 
@@ -63,4 +64,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define CORE_REGISTER_ADDR(regno, reg_ptr) \
    m88k_harris_core_register_addr(regno, reg_ptr)
-
diff --git a/gdb/config/m88k/xm-delta88.h b/gdb/config/m88k/xm-delta88.h
index 21669473e60..035abde1e95 100644
--- a/gdb/config/m88k/xm-delta88.h
+++ b/gdb/config/m88k/xm-delta88.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m88k/xm-m88k.h"
 
@@ -29,8 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define HAVE_TERMIO
 
-/*#define USIZE 2048*/
-/*#define NBPG NBPC*/
+/*#define USIZE 2048 */
+/*#define NBPG NBPC */
 /* Might be defined in <sys/param.h>.  I suspect this define was a relic
    from before when BFD did core files.  */
 /* #define UPAGES USIZE */
diff --git a/gdb/config/m88k/xm-delta88v4.h b/gdb/config/m88k/xm-delta88v4.h
index 55c9e2de538..ca4bd073a76 100644
--- a/gdb/config/m88k/xm-delta88v4.h
+++ b/gdb/config/m88k/xm-delta88v4.h
@@ -1,21 +1,22 @@
 /* Host machine description for Motorola Delta 88 box, for GDB.
    Copyright 1986, 1987, 1988, 1989, 1990, 1991 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "m88k/xm-m88k.h"
 
diff --git a/gdb/config/m88k/xm-dgux.h b/gdb/config/m88k/xm-dgux.h
index b3608e7d5c7..c96acb63000 100644
--- a/gdb/config/m88k/xm-dgux.h
+++ b/gdb/config/m88k/xm-dgux.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1993
    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.  */
+   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 "m88k/xm-m88k.h"
 
diff --git a/gdb/config/m88k/xm-m88k.h b/gdb/config/m88k/xm-m88k.h
index 35620a0ce01..68ae0554177 100644
--- a/gdb/config/m88k/xm-m88k.h
+++ b/gdb/config/m88k/xm-m88k.h
@@ -1,20 +1,21 @@
 /* Host-machine dependent parameters for Motorola 88000, for GDB.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
diff --git a/gdb/config/mips/nm-irix3.h b/gdb/config/mips/nm-irix3.h
index 3f4b06463c9..ab195fb0cc8 100644
--- a/gdb/config/mips/nm-irix3.h
+++ b/gdb/config/mips/nm-irix3.h
@@ -1,21 +1,22 @@
 /* Definitions for SGI irix3 native support.
    Copyright 1991, 1992 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.  */
+   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.  */
 
 /* Don't need special routines for Irix v3 -- we can use infptrace.c */
 #undef FETCH_INFERIOR_REGISTERS
diff --git a/gdb/config/mips/nm-irix4.h b/gdb/config/mips/nm-irix4.h
index 017695ca295..189dafe378e 100644
--- a/gdb/config/mips/nm-irix4.h
+++ b/gdb/config/mips/nm-irix4.h
@@ -1,22 +1,23 @@
 /* Definitions for native support of irix4.
 
-Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /*
  * Let's use /debug instead of all this dangerous mucking about
diff --git a/gdb/config/mips/nm-irix5.h b/gdb/config/mips/nm-irix5.h
index 90d454bb418..3ab4d25a359 100644
--- a/gdb/config/mips/nm-irix5.h
+++ b/gdb/config/mips/nm-irix5.h
@@ -1,22 +1,23 @@
 /* Definitions for native support of irix5.
 
-Copyright (C) 1993, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "nm-sysv4.h"
 #undef IN_SOLIB_DYNSYM_RESOLVE_CODE
diff --git a/gdb/config/mips/nm-mips.h b/gdb/config/mips/nm-mips.h
index 6418b86ee92..5b4cfa85c39 100644
--- a/gdb/config/mips/nm-mips.h
+++ b/gdb/config/mips/nm-mips.h
@@ -3,21 +3,22 @@
    Contributed by Per Bothner(bothner@cs.wisc.edu) at U.Wisconsin
    and by Alessandro Forin(af@cs.cmu.edu) at CMU
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
 #define FETCH_INFERIOR_REGISTERS
diff --git a/gdb/config/mips/nm-news-mips.h b/gdb/config/mips/nm-news-mips.h
index 1ab63ba2b12..4cc4c98fcf8 100644
--- a/gdb/config/mips/nm-news-mips.h
+++ b/gdb/config/mips/nm-news-mips.h
@@ -3,21 +3,22 @@
    Contributed by Per Bothner(bothner@cs.wisc.edu) at U.Wisconsin
    and by Alessandro Forin(af@cs.cmu.edu) at CMU
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_NEWS_MIPS_H
 #define NM_NEWS_MIPS_H 1
@@ -29,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define REGISTER_U_ADDR(addr, blockend, regno) 		\
 	if (regno < 38) addr = (NBPG*UPAGES) + (regno - 38)*sizeof(int);\
-	else addr = 0; /* ..somewhere in the pcb */
+	else addr = 0;		/* ..somewhere in the pcb */
 
 /* Kernel is a bit tenacious about sharing text segments, disallowing bpts.  */
 #define	ONE_PROCESS_WRITETEXT
@@ -39,4 +40,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Apparently not in <sys/types.h> */
 typedef int pid_t;
 
-#endif	/* NM_NEWS_MIPS_H */
+#endif /* NM_NEWS_MIPS_H */
diff --git a/gdb/config/mips/nm-riscos.h b/gdb/config/mips/nm-riscos.h
index 2d543455827..7f68b677092 100644
--- a/gdb/config/mips/nm-riscos.h
+++ b/gdb/config/mips/nm-riscos.h
@@ -1,16 +1,17 @@
 /* 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.  */
+   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.  */
 
 /* MIPS running RISC/os 4.52C.  */
 
diff --git a/gdb/config/mips/tm-bigmips.h b/gdb/config/mips/tm-bigmips.h
index 271ceb0b363..7035b98e09a 100644
--- a/gdb/config/mips/tm-bigmips.h
+++ b/gdb/config/mips/tm-bigmips.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1990 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_DEFAULT BIG_ENDIAN
 
diff --git a/gdb/config/mips/tm-bigmips64.h b/gdb/config/mips/tm-bigmips64.h
index 8b255a5a326..a456d2004a7 100644
--- a/gdb/config/mips/tm-bigmips64.h
+++ b/gdb/config/mips/tm-bigmips64.h
@@ -2,21 +2,22 @@
    Copyright 1994 Free Software Foundation, Inc.
    Contributed by Ian Lance Taylor (ian@cygnus.com)
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_DEFAULT BIG_ENDIAN
 
diff --git a/gdb/config/mips/tm-embed.h b/gdb/config/mips/tm-embed.h
index 7bf17597706..af51a7fc138 100644
--- a/gdb/config/mips/tm-embed.h
+++ b/gdb/config/mips/tm-embed.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1993 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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 
diff --git a/gdb/config/mips/tm-embed64.h b/gdb/config/mips/tm-embed64.h
index df90f58fa98..d1467d0ce0f 100644
--- a/gdb/config/mips/tm-embed64.h
+++ b/gdb/config/mips/tm-embed64.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 
diff --git a/gdb/config/mips/tm-embedl.h b/gdb/config/mips/tm-embedl.h
index 23abcd9db84..416a7e30510 100644
--- a/gdb/config/mips/tm-embedl.h
+++ b/gdb/config/mips/tm-embedl.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 
diff --git a/gdb/config/mips/tm-embedl64.h b/gdb/config/mips/tm-embedl64.h
index c7dca195324..77e368de90f 100644
--- a/gdb/config/mips/tm-embedl64.h
+++ b/gdb/config/mips/tm-embedl64.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 
diff --git a/gdb/config/mips/tm-irix3.h b/gdb/config/mips/tm-irix3.h
index c8a4775ef3f..57c344e770e 100644
--- a/gdb/config/mips/tm-irix3.h
+++ b/gdb/config/mips/tm-irix3.h
@@ -1,21 +1,22 @@
 /* Target machine description for SGI Iris under Irix, for GDB.
    Copyright 1990, 1991, 1992, 1993, 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "mips/tm-bigmips.h"
 
@@ -75,7 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Offsets for register values in _sigtramp frame.
    sigcontext is immediately above the _sigtramp frame on Irix.  */
-#define SIGFRAME_BASE		0x0 
+#define SIGFRAME_BASE		0x0
 #define SIGFRAME_PC_OFF		(SIGFRAME_BASE + 2 * 4)
 #define SIGFRAME_REGSAVE_OFF	(SIGFRAME_BASE + 3 * 4)
 #define SIGFRAME_FPREGSAVE_OFF	(SIGFRAME_BASE + 3 * 4 + 32 * 4 + 4)
diff --git a/gdb/config/mips/tm-irix5.h b/gdb/config/mips/tm-irix5.h
index ad98e881859..7f828c3aa97 100644
--- a/gdb/config/mips/tm-irix5.h
+++ b/gdb/config/mips/tm-irix5.h
@@ -1,21 +1,22 @@
 /* Target machine description for SGI Iris under Irix 5, for GDB.
    Copyright 1990, 1991, 1992, 1993, 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "mips/tm-irix3.h"
 
@@ -43,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 	 : builtin_type_int)
 
 #undef  MIPS_LAST_ARG_REGNUM
-#define MIPS_LAST_ARG_REGNUM 11  /* N32 uses R4 through R11 for args */
+#define MIPS_LAST_ARG_REGNUM 11	/* N32 uses R4 through R11 for args */
 
 #undef  MIPS_NUM_ARG_REGS
 #define MIPS_NUM_ARG_REGS 8
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index 99a54498727..fd0ae23e3e3 100644
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -4,21 +4,22 @@
    Contributed by Per Bothner (bothner@cs.wisc.edu) at U.Wisconsin
    and by Alessandro Forin (af@cs.cmu.edu) at CMU..
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_MIPS_H
 #define TM_MIPS_H 1
@@ -187,32 +188,32 @@ extern char *mips_register_name PARAMS ((int regnr));
 #define V0_REGNUM 2		/* Function integer return value */
 #define A0_REGNUM 4		/* Loc of first arg during a subr call */
 #if MIPS_EABI
-#  define MIPS_LAST_ARG_REGNUM 11 /* EABI uses R4 through R11 for args */
-#  define MIPS_NUM_ARG_REGS 8
+#define MIPS_LAST_ARG_REGNUM 11	/* EABI uses R4 through R11 for args */
+#define MIPS_NUM_ARG_REGS 8
 #else
-#  define MIPS_LAST_ARG_REGNUM 7  /* old ABI uses R4 through R7 for args */
-#  define MIPS_NUM_ARG_REGS 4
+#define MIPS_LAST_ARG_REGNUM 7	/* old ABI uses R4 through R7 for args */
+#define MIPS_NUM_ARG_REGS 4
 #endif
 #define T9_REGNUM 25		/* Contains address of callee in PIC */
 #define SP_REGNUM 29		/* Contains address of top of stack */
 #define RA_REGNUM 31		/* Contains return address value */
 #define PS_REGNUM 32		/* Contains processor status */
-#define HI_REGNUM 34            /* Multiple/divide temp */
-#define LO_REGNUM 33            /* ... */
+#define HI_REGNUM 34		/* Multiple/divide temp */
+#define LO_REGNUM 33		/* ... */
 #define BADVADDR_REGNUM 35	/* bad vaddr for addressing exception */
 #define CAUSE_REGNUM 36		/* describes last exception */
 #define PC_REGNUM 37		/* Contains program counter */
-#define FP0_REGNUM 38           /* Floating point register 0 (single float) */
-#define FPA0_REGNUM (FP0_REGNUM+12) /* First float argument register */
+#define FP0_REGNUM 38		/* Floating point register 0 (single float) */
+#define FPA0_REGNUM (FP0_REGNUM+12)	/* First float argument register */
 #if MIPS_EABI			/* EABI uses F12 through F19 for args */
-#  define MIPS_LAST_FP_ARG_REGNUM (FP0_REGNUM+19)
-#  define MIPS_NUM_FP_ARG_REGS 8
-#else				/* old ABI uses F12 through F15 for args */
-#  define MIPS_LAST_FP_ARG_REGNUM (FP0_REGNUM+15)
-#  define MIPS_NUM_FP_ARG_REGS 4
+#define MIPS_LAST_FP_ARG_REGNUM (FP0_REGNUM+19)
+#define MIPS_NUM_FP_ARG_REGS 8
+#else /* old ABI uses F12 through F15 for args */
+#define MIPS_LAST_FP_ARG_REGNUM (FP0_REGNUM+15)
+#define MIPS_NUM_FP_ARG_REGS 4
 #endif
-#define FCRCS_REGNUM 70         /* FP control/status */
-#define FCRIR_REGNUM 71         /* FP implementation/revision */
+#define FCRCS_REGNUM 70		/* FP control/status */
+#define FCRIR_REGNUM 71		/* FP implementation/revision */
 #define FP_REGNUM 72		/* Pseudo register that contains true address of executing stack frame */
 #define	UNUSED_REGNUM 73	/* Never used, FIXME */
 #define	FIRST_EMBED_REGNUM 74	/* First CP0 register for embedded use */
@@ -294,7 +295,8 @@ extern void mips_do_registers_info PARAMS ((int, int));
 /* Store the address of the place in which to copy the structure the
    subroutine will return.  Handled by mips_push_arguments.  */
 
-#define STORE_STRUCT_RETURN(addr, sp)	/**/
+#define STORE_STRUCT_RETURN(addr, sp)
+/**/
 
 /* Extract from an array REGBUF containing the (raw) register state
    a function return value of type TYPE, and copy that, in virtual format,
@@ -303,7 +305,7 @@ extern void mips_do_registers_info PARAMS ((int, int));
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
   mips_extract_return_value(TYPE, REGBUF, VALBUF)
 extern void
-mips_extract_return_value PARAMS ((struct type *, char [], char *));
+mips_extract_return_value PARAMS ((struct type *, char[], char *));
 
 /* Write into appropriate registers a function return value
    of type TYPE, given in virtual format.  */
@@ -378,8 +380,8 @@ extern int mips_frame_num_args PARAMS ((struct frame_info *));
     (frame_info)->saved_regs[SP_REGNUM] = (frame_info)->frame; \
   } while (0)
 extern void mips_find_saved_regs PARAMS ((struct frame_info *));
-
 
+
 /* Things needed for making the inferior call functions.  */
 
 /* Stack must be aligned on 32-bit boundaries when synthesizing
@@ -422,7 +424,7 @@ extern CORE_ADDR mips_call_dummy_address PARAMS ((void));
 /* There's a mess in stack frame creation.  See comments in blockframe.c
    near reference to INIT_FRAME_PC_FIRST.  */
 
-#define	INIT_FRAME_PC(fromleaf, prev) /* nada */
+#define	INIT_FRAME_PC(fromleaf, prev)	/* nada */
 
 #define INIT_FRAME_PC_FIRST(fromleaf, prev) \
    mips_init_frame_pc_first(fromleaf, prev)
@@ -438,18 +440,20 @@ extern void ecoff_relocate_efi PARAMS ((struct symbol *, CORE_ADDR));
    This overlays the MIPS's PDR records, 
    mipsread.c (ab)uses this to save memory */
 
-typedef struct mips_extra_func_info {
-	long	numargs;	/* number of args to procedure (was iopt) */
-	bfd_vma high_addr;      /* upper address bound */
-	long	frame_adjust;	/* offset of FP from SP (used on MIPS16) */
-	PDR	pdr;		/* Procedure descriptor record */
-} *mips_extra_func_info_t;
+typedef struct mips_extra_func_info
+  {
+    long numargs;		/* number of args to procedure (was iopt) */
+    bfd_vma high_addr;		/* upper address bound */
+    long frame_adjust;		/* offset of FP from SP (used on MIPS16) */
+    PDR pdr;			/* Procedure descriptor record */
+  }
+ *mips_extra_func_info_t;
 
 extern void mips_init_extra_frame_info PARAMS ((int fromleaf, struct frame_info *));
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fci) \
   mips_init_extra_frame_info(fromleaf, fci)
 
-extern void mips_print_extra_frame_info PARAMS ((struct frame_info *frame));
+extern void mips_print_extra_frame_info PARAMS ((struct frame_info * frame));
 #define	PRINT_EXTRA_FRAME_INFO(fi) \
   mips_print_extra_frame_info (fi)
 
@@ -508,8 +512,8 @@ extern char *mips_read_processor_type PARAMS ((void));
 #define IN_SOLIB_RETURN_TRAMPOLINE(pc, name)	mips_in_return_stub (pc, name)
 #define SKIP_TRAMPOLINE_CODE(pc)		mips_skip_stub (pc)
 #define IGNORE_HELPER_CALL(pc)			mips_ignore_helper (pc)
-extern int mips_in_call_stub PARAMS ((CORE_ADDR pc,  char *name));
-extern int mips_in_return_stub PARAMS ((CORE_ADDR pc,  char *name));
+extern int mips_in_call_stub PARAMS ((CORE_ADDR pc, char *name));
+extern int mips_in_return_stub PARAMS ((CORE_ADDR pc, char *name));
 extern CORE_ADDR mips_skip_stub PARAMS ((CORE_ADDR pc));
 extern int mips_ignore_helper PARAMS ((CORE_ADDR pc));
 
@@ -519,7 +523,7 @@ extern int mips_ignore_helper PARAMS ((CORE_ADDR pc));
 
 /* Definitions and declarations used by mips-tdep.c and remote-mips.c  */
 #define MIPS_INSTLEN 4		/* Length of an instruction */
-#define MIPS16_INSTLEN 2	/* Length of an instruction on MIPS16*/
+#define MIPS16_INSTLEN 2	/* Length of an instruction on MIPS16 */
 #define MIPS_NUMREGS 32		/* Number of integer or float registers */
 typedef unsigned long t_inst;	/* Integer big enough to hold an instruction */
 
@@ -529,7 +533,7 @@ typedef unsigned long t_inst;	/* Integer big enough to hold an instruction */
 #define MAKE_MIPS16_ADDR(addr)	 ((addr) | 1)
 #define UNMAKE_MIPS16_ADDR(addr) ((addr) & ~1)
 
-#endif	/* TM_MIPS_H */
+#endif /* TM_MIPS_H */
 
 /* Macros for setting and testing a bit in a minimal symbol that
    marks it as 16-bit function.  The MSB of the minimal symbol's
@@ -538,13 +542,13 @@ typedef unsigned long t_inst;	/* Integer big enough to hold an instruction */
    that the symbol size cannot exceed 2^31.
 
    ELF_MAKE_MSYMBOL_SPECIAL
-			tests whether an ELF symbol is "special", i.e. refers
-			to a 16-bit function, and sets a "special" bit in a 
-			minimal symbol to mark it as a 16-bit function
-   MSYMBOL_IS_SPECIAL	tests the "special" bit in a minimal symbol
-   MSYMBOL_SIZE		returns the size of the minimal symbol, i.e.
-			the "info" field with the "special" bit masked out
-*/
+   tests whether an ELF symbol is "special", i.e. refers
+   to a 16-bit function, and sets a "special" bit in a 
+   minimal symbol to mark it as a 16-bit function
+   MSYMBOL_IS_SPECIAL   tests the "special" bit in a minimal symbol
+   MSYMBOL_SIZE         returns the size of the minimal symbol, i.e.
+   the "info" field with the "special" bit masked out
+ */
 
 #define ELF_MAKE_MSYMBOL_SPECIAL(sym,msym) \
  { \
@@ -553,7 +557,7 @@ typedef unsigned long t_inst;	/* Integer big enough to hold an instruction */
     SYMBOL_VALUE_ADDRESS (msym) |= 1; \
   } \
  }
-   
+
 #define MSYMBOL_IS_SPECIAL(msym) \
   (((long) MSYMBOL_INFO (msym) & 0x80000000) != 0)
 #define MSYMBOL_SIZE(msym) \
diff --git a/gdb/config/mips/tm-mips64.h b/gdb/config/mips/tm-mips64.h
index 56a8927314d..0031695ad08 100644
--- a/gdb/config/mips/tm-mips64.h
+++ b/gdb/config/mips/tm-mips64.h
@@ -2,21 +2,22 @@
    Copyright 1994, 1996 Free Software Foundation, Inc.
    Contributed by Ian Lance Taylor (ian@cygnus.com)
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define GDB_TARGET_IS_MIPS64 1
 
@@ -31,8 +32,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 	 : builtin_type_long_long)
 
 /* Load double words in CALL_DUMMY.  */
-#define OP_LDFPR 065	/* ldc1 */
-#define OP_LDGPR 067	/* ld */
+#define OP_LDFPR 065		/* ldc1 */
+#define OP_LDGPR 067		/* ld */
 
 #if defined(MIPS_EABI) && (MIPS_EABI != 0)
 /* Define sizes for 64-bit data types, allow specific targets to override
diff --git a/gdb/config/mips/tm-mipsm3.h b/gdb/config/mips/tm-mipsm3.h
index f73660479ff..d1d0ea04a8b 100644
--- a/gdb/config/mips/tm-mipsm3.h
+++ b/gdb/config/mips/tm-mipsm3.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on a mips box under Mach 3.0
    Copyright (C) 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Mach specific definitions for little endian mips (e.g. pmax)
  * running Mach 3.0
@@ -43,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define MACHINE_CPROC_FP_OFFSET SAVED_FP
 
 /* Thread flavors used in setting the Trace state.
- *
+
  * In <mach/machine/thread_status.h>
  */
 #define TRACE_FLAVOR		MIPS_EXC_STATE
diff --git a/gdb/config/mips/tm-mipsv4.h b/gdb/config/mips/tm-mipsv4.h
index dd7aaa16d9b..02e188c0b6c 100644
--- a/gdb/config/mips/tm-mipsv4.h
+++ b/gdb/config/mips/tm-mipsv4.h
@@ -1,21 +1,22 @@
 /* Target machine description for MIPS running SVR4, for GDB.
    Copyright 1994, 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "mips/tm-bigmips.h"
 #include "tm-sysv4.h"
@@ -29,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* The signal handler trampoline is called _sigtramp.  */
 #undef IN_SIGTRAMP
 #define IN_SIGTRAMP(pc, name) ((name) && STREQ ("_sigtramp", name))
- 
+
 /* On entry to the signal handler trampoline, an ucontext is already
    pushed on the stack. We can get at the saved registers via the
    mcontext which is contained within the ucontext.  */
diff --git a/gdb/config/mips/tm-tx39.h b/gdb/config/mips/tm-tx39.h
index 36d9e2b2888..e212a51d31b 100644
--- a/gdb/config/mips/tm-tx39.h
+++ b/gdb/config/mips/tm-tx39.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 #define MIPS_EABI 1
diff --git a/gdb/config/mips/tm-tx39l.h b/gdb/config/mips/tm-tx39l.h
index 8889553cc84..5488830b5d7 100644
--- a/gdb/config/mips/tm-tx39l.h
+++ b/gdb/config/mips/tm-tx39l.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 #define MIPS_EABI 1
diff --git a/gdb/config/mips/tm-vr4100.h b/gdb/config/mips/tm-vr4100.h
index 843f49c2222..c139f9743f1 100644
--- a/gdb/config/mips/tm-vr4100.h
+++ b/gdb/config/mips/tm-vr4100.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 #define MIPS_EABI 1
diff --git a/gdb/config/mips/tm-vr4300.h b/gdb/config/mips/tm-vr4300.h
index 541ca44611d..273161ecc30 100644
--- a/gdb/config/mips/tm-vr4300.h
+++ b/gdb/config/mips/tm-vr4300.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1993, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 #define TARGET_MONITOR_PROMPT "<RISQ> "
diff --git a/gdb/config/mips/tm-vr4300el.h b/gdb/config/mips/tm-vr4300el.h
index 75e8693dfbb..1a938f3e6e7 100644
--- a/gdb/config/mips/tm-vr4300el.h
+++ b/gdb/config/mips/tm-vr4300el.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1993, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 #define TARGET_MONITOR_PROMPT "<RISQ> "
diff --git a/gdb/config/mips/tm-vr5000.h b/gdb/config/mips/tm-vr5000.h
index b834a7762fc..39663102d8a 100644
--- a/gdb/config/mips/tm-vr5000.h
+++ b/gdb/config/mips/tm-vr5000.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 #define TARGET_MONITOR_PROMPT "<RISQ> "
diff --git a/gdb/config/mips/tm-vr5000el.h b/gdb/config/mips/tm-vr5000el.h
index c6897d12ee1..eae58045091 100644
--- a/gdb/config/mips/tm-vr5000el.h
+++ b/gdb/config/mips/tm-vr5000el.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 #define TARGET_MONITOR_PROMPT "<RISQ> "
diff --git a/gdb/config/mips/tm-vxmips.h b/gdb/config/mips/tm-vxmips.h
index 3f45d7eed5c..e4ef2b6a2bd 100644
--- a/gdb/config/mips/tm-vxmips.h
+++ b/gdb/config/mips/tm-vxmips.h
@@ -2,21 +2,22 @@
    Copyright 1996, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
-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.  */
+   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 "mips/tm-mips.h"
 #include "tm-vxworks.h"
diff --git a/gdb/config/mips/xm-irix3.h b/gdb/config/mips/xm-irix3.h
index d096594c6be..a8fff39b434 100644
--- a/gdb/config/mips/xm-irix3.h
+++ b/gdb/config/mips/xm-irix3.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1991 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This is for the iris. */
 
@@ -28,4 +29,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
   if (regno < PC_REGNUM)				\
       addr = regno;					\
   else							\
-      addr = regno + NSIG_HNDLRS; /* Skip over signal handlers */
+      addr = regno + NSIG_HNDLRS;	/* Skip over signal handlers */
diff --git a/gdb/config/mips/xm-irix4.h b/gdb/config/mips/xm-irix4.h
index 14d21f04fea..5be86ed0369 100644
--- a/gdb/config/mips/xm-irix4.h
+++ b/gdb/config/mips/xm-irix4.h
@@ -1,22 +1,23 @@
 /* Definitions for irix4 hosting support.
 
-Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This is for the iris. */
 
diff --git a/gdb/config/mips/xm-irix5.h b/gdb/config/mips/xm-irix5.h
index a64277b3142..9fe67861559 100644
--- a/gdb/config/mips/xm-irix5.h
+++ b/gdb/config/mips/xm-irix5.h
@@ -1,22 +1,23 @@
 /* Definitions for irix5 hosting support.
 
-Copyright (C) 1993, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "xm-sysv4.h"
 
@@ -28,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
   if (regno < PC_REGNUM)				\
       addr = regno;					\
   else							\
-      addr = regno + NSIG_HNDLRS; /* Skip over signal handlers */
+      addr = regno + NSIG_HNDLRS;	/* Skip over signal handlers */
 
 /* This enables reliable signals (and the associated setjmp/longjmp), and gives
    bsdish prototypes for getpgrp/setpgrg/setgroups and initgroups.  */
diff --git a/gdb/config/mips/xm-mips.h b/gdb/config/mips/xm-mips.h
index a2e9a509915..2fad12b0ab7 100644
--- a/gdb/config/mips/xm-mips.h
+++ b/gdb/config/mips/xm-mips.h
@@ -3,21 +3,22 @@
    Contributed by Per Bothner(bothner@cs.wisc.edu) at U.Wisconsin
    and by Alessandro Forin(af@cs.cmu.edu) at CMU
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #if !defined (HOST_BYTE_ORDER)
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
@@ -35,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #endif
 
 #if ! defined (__STDC__) && ! defined (offsetof)
-# define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
 #endif
 
 /* Only used for core files on DECstations.
diff --git a/gdb/config/mips/xm-mipsm3.h b/gdb/config/mips/xm-mipsm3.h
index 6a5a73cd833..5bb60096a20 100644
--- a/gdb/config/mips/xm-mipsm3.h
+++ b/gdb/config/mips/xm-mipsm3.h
@@ -3,30 +3,31 @@
    Contributed by Per Bothner(bothner@cs.wisc.edu) at U.Wisconsin
    and by Alessandro Forin(af@cs.cmu.edu) at CMU
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #if !defined (HOST_BYTE_ORDER)
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 #endif
 
-#define KERNEL_U_ADDR 0 /* Not needed. */
+#define KERNEL_U_ADDR 0		/* Not needed. */
 
 /* Only used for core files on DECstations. */
 
 #define REGISTER_U_ADDR(addr, blockend, regno) 		\
 	if (regno < 38) addr = (NBPG*UPAGES) + (regno - 38)*sizeof(int);\
-	else addr = 0; /* ..somewhere in the pcb */
+	else addr = 0;		/* ..somewhere in the pcb */
diff --git a/gdb/config/mips/xm-mipsv4.h b/gdb/config/mips/xm-mipsv4.h
index d80ba433e29..d49593ff113 100644
--- a/gdb/config/mips/xm-mipsv4.h
+++ b/gdb/config/mips/xm-mipsv4.h
@@ -1,22 +1,23 @@
 /* Definitions for MIPS running SVR4 hosting support.
 
-Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "xm-sysv4.h"
 
diff --git a/gdb/config/mips/xm-news-mips.h b/gdb/config/mips/xm-news-mips.h
index 06aac1ad3b7..25a2755ef90 100644
--- a/gdb/config/mips/xm-news-mips.h
+++ b/gdb/config/mips/xm-news-mips.h
@@ -3,21 +3,22 @@
    Contributed by Per Bothner(bothner@cs.wisc.edu) at U.Wisconsin
    and by Alessandro Forin(af@cs.cmu.edu) at CMU
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #if !defined (HOST_BYTE_ORDER)
 #define HOST_BYTE_ORDER BIG_ENDIAN
diff --git a/gdb/config/mips/xm-riscos.h b/gdb/config/mips/xm-riscos.h
index 467f32ac11b..ae87de9393d 100644
--- a/gdb/config/mips/xm-riscos.h
+++ b/gdb/config/mips/xm-riscos.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1993 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.  */
+   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.  */
 
 #define HAVE_TERMIO
 
diff --git a/gdb/config/mn10200/tm-mn10200.h b/gdb/config/mn10200/tm-mn10200.h
index 94cd6ea3367..082ab0eab61 100644
--- a/gdb/config/mn10200/tm-mn10200.h
+++ b/gdb/config/mn10200/tm-mn10200.h
@@ -3,21 +3,22 @@
 
    Contributed by Geoffrey Noer <noer@cygnus.com>
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* The mn10200 is little endian.  */
 #define TARGET_BYTE_ORDER LITTLE_ENDIAN
@@ -105,7 +106,7 @@ extern void mn10200_init_extra_frame_info PARAMS ((struct frame_info *));
 #define INIT_FRAME_PC(x,y)
 
 extern void mn10200_frame_find_saved_regs PARAMS ((struct frame_info *,
-						   struct frame_saved_regs *));
+						struct frame_saved_regs *));
 #define FRAME_FIND_SAVED_REGS(fi, regaddr) regaddr = fi->fsr
 
 extern CORE_ADDR mn10200_frame_chain PARAMS ((struct frame_info *));
@@ -113,7 +114,7 @@ extern CORE_ADDR mn10200_frame_chain PARAMS ((struct frame_info *));
 #define FRAME_CHAIN_VALID(FP, FI)	generic_frame_chain_valid (FP, FI)
 
 extern CORE_ADDR mn10200_find_callers_reg PARAMS ((struct frame_info *, int));
-extern CORE_ADDR mn10200_frame_saved_pc   PARAMS ((struct frame_info *));
+extern CORE_ADDR mn10200_frame_saved_pc PARAMS ((struct frame_info *));
 #define FRAME_SAVED_PC(FI) (mn10200_frame_saved_pc (FI))
 
 /* Extract from an array REGBUF containing the (raw) register state
@@ -191,8 +192,8 @@ extern CORE_ADDR mn10200_push_return_address PARAMS ((CORE_ADDR, CORE_ADDR));
 #define PUSH_DUMMY_FRAME	generic_push_dummy_frame ()
 
 extern CORE_ADDR
-mn10200_push_arguments PARAMS ((int, struct value **, CORE_ADDR,
-			     unsigned char, CORE_ADDR));
+  mn10200_push_arguments PARAMS ((int, struct value **, CORE_ADDR,
+				  unsigned char, CORE_ADDR));
 #define PUSH_ARGUMENTS(NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR) \
   (mn10200_push_arguments (NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR))
 
diff --git a/gdb/config/mn10300/tm-mn10300.h b/gdb/config/mn10300/tm-mn10300.h
index 20f93f4aa03..7a4482b5c57 100644
--- a/gdb/config/mn10300/tm-mn10300.h
+++ b/gdb/config/mn10300/tm-mn10300.h
@@ -3,21 +3,22 @@
 
    Contributed by Geoffrey Noer <noer@cygnus.com>
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* The mn10300 is little endian.  */
 #define TARGET_BYTE_ORDER_DEFAULT LITTLE_ENDIAN
@@ -65,7 +66,7 @@ extern breakpoint_from_pc_fn mn10300_breakpoint_from_pc;
 
 #define INNER_THAN(lhs,rhs) ((lhs) < (rhs))
 
-extern CORE_ADDR mn10300_saved_pc_after_call PARAMS ((struct frame_info *frame));
+extern CORE_ADDR mn10300_saved_pc_after_call PARAMS ((struct frame_info * frame));
 #define SAVED_PC_AFTER_CALL(frame) \
   mn10300_saved_pc_after_call (frame)
 
@@ -79,21 +80,21 @@ extern void mn10300_init_extra_frame_info PARAMS ((struct frame_info *));
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) mn10300_init_extra_frame_info (fi)
 #define INIT_FRAME_PC		/* Not necessary */
 
-#define FRAME_INIT_SAVED_REGS(fi) /* handled by init_extra_frame_info */
+#define FRAME_INIT_SAVED_REGS(fi)	/* handled by init_extra_frame_info */
 
 extern CORE_ADDR mn10300_frame_chain PARAMS ((struct frame_info *));
 #define FRAME_CHAIN(fi) mn10300_frame_chain (fi)
 #define FRAME_CHAIN_VALID(FP, FI)	generic_frame_chain_valid (FP, FI)
 
 extern CORE_ADDR mn10300_find_callers_reg PARAMS ((struct frame_info *, int));
-extern CORE_ADDR mn10300_frame_saved_pc   PARAMS ((struct frame_info *));
+extern CORE_ADDR mn10300_frame_saved_pc PARAMS ((struct frame_info *));
 #define FRAME_SAVED_PC(FI) (mn10300_frame_saved_pc (FI))
 
 /* Extract from an array REGBUF containing the (raw) register state
    a function return value of type TYPE, and copy that, in virtual format,
    into VALBUF. */
 
-extern void mn10300_extract_return_value PARAMS ((struct type *type, char *regbuf, char *valbuf));
+extern void mn10300_extract_return_value PARAMS ((struct type * type, char *regbuf, char *valbuf));
 #define EXTRACT_RETURN_VALUE(TYPE, REGBUF, VALBUF) \
   mn10300_extract_return_value (TYPE, REGBUF, VALBUF)
 
@@ -101,7 +102,7 @@ CORE_ADDR mn10300_extract_struct_value_address PARAMS ((char *regbuf));
 #define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) \
   mn10300_extract_struct_value_address (REGBUF)
 
-void mn10300_store_return_value PARAMS ((struct type *type, char *valbuf));
+void mn10300_store_return_value PARAMS ((struct type * type, char *valbuf));
 #define STORE_RETURN_VALUE(TYPE, VALBUF) \
   mn10300_store_return_value (TYPE, VALBUF)
 
@@ -137,8 +138,8 @@ extern CORE_ADDR mn10300_push_return_address PARAMS ((CORE_ADDR, CORE_ADDR));
 #define SAVE_DUMMY_FRAME_TOS(SP) generic_save_dummy_frame_tos (SP)
 
 extern CORE_ADDR
-mn10300_push_arguments PARAMS ((int, struct value **, CORE_ADDR,
-				unsigned char, CORE_ADDR ));
+  mn10300_push_arguments PARAMS ((int, struct value **, CORE_ADDR,
+				  unsigned char, CORE_ADDR));
 #define PUSH_ARGUMENTS(NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR) \
   (mn10300_push_arguments (NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR))
 
diff --git a/gdb/config/nm-gnu.h b/gdb/config/nm-gnu.h
index 38a85f7accf..acd75212d60 100644
--- a/gdb/config/nm-gnu.h
+++ b/gdb/config/nm-gnu.h
@@ -16,7 +16,8 @@
 
    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. */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA. */
 
 #ifndef __NM_GNU_H__
 #define __NM_GNU_H__
diff --git a/gdb/config/nm-lynx.h b/gdb/config/nm-lynx.h
index 2daf0faaef8..e97b886971a 100644
--- a/gdb/config/nm-lynx.h
+++ b/gdb/config/nm-lynx.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for LynxOS.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_LYNX_H
 #define NM_LYNX_H
@@ -40,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define KERNEL_U_ADDR USRSTACK
 
-#undef FLOAT_INFO	/* No float info yet */
+#undef FLOAT_INFO		/* No float info yet */
 
 /* As of LynxOS 2.2.2 (beta 8/15/94), this is int.  Previous versions seem to
    have had no prototype, so I'm not sure why GDB used to define this to
@@ -69,7 +70,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "target.h"
 
-extern int child_wait PARAMS ((int pid, struct target_waitstatus *status));
+extern int child_wait PARAMS ((int pid, struct target_waitstatus * status));
 
 /* Lynx needs a special definition of this so that we can
    print out the pid and thread number seperatly.  */
diff --git a/gdb/config/nm-m3.h b/gdb/config/nm-m3.h
index 6ea52565b94..5d89b63028c 100644
--- a/gdb/config/nm-m3.h
+++ b/gdb/config/nm-m3.h
@@ -2,21 +2,22 @@
 
    Copyright (C) 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_M3_H
 #define NM_M3_H
@@ -42,7 +43,7 @@ extern int must_suspend_thread;
 #define PREPARE_TO_PROCEED(select_it) mach3_prepare_to_proceed(select_it)
 
 /* Try to get the privileged host port for authentication to machid
- *
+
  * If you can get this, you may debug anything on this host.
  *
  * If you can't, gdb gives it's own task port as the
@@ -93,10 +94,11 @@ extern int must_suspend_thread;
 /*
  * Top of emulator stack holds link and reply port.
  */
-struct emul_stack_top {
-	struct emul_stack_top	*link;
-	mach_port_t		reply_port;
-};
+struct emul_stack_top
+  {
+    struct emul_stack_top *link;
+    mach_port_t reply_port;
+  };
 
 #define EMULATOR_STACK_SIZE (4096*4)
 
diff --git a/gdb/config/nm-nbsd.h b/gdb/config/nm-nbsd.h
index bc1d6a621ac..c7c1fb5c4d2 100644
--- a/gdb/config/nm-nbsd.h
+++ b/gdb/config/nm-nbsd.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for NetBSD.
    Copyright 1994, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This is the amount to subtract from u.u_ar0
    to get the offset in the core file of the register values.  */
@@ -30,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define ATTACH_DETACH
 
-#include "solib.h"      /* Support for shared libraries. */
+#include "solib.h"		/* Support for shared libraries. */
 
 /* make structure definitions match up with those expected in solib.c */
 #define link_object	sod
diff --git a/gdb/config/nm-sysv4.h b/gdb/config/nm-sysv4.h
index b891d4d9138..ea63e687434 100644
--- a/gdb/config/nm-sysv4.h
+++ b/gdb/config/nm-sysv4.h
@@ -2,21 +2,22 @@
    Copyright 1991, 1992, 1998 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygnus.com).
 
-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.  */
+   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.  */
 
 /* Use SVR4 style shared library support */
 
diff --git a/gdb/config/none/nm-none.h b/gdb/config/none/nm-none.h
index 9d630f36e4e..4ee9a0be1f3 100644
--- a/gdb/config/none/nm-none.h
+++ b/gdb/config/none/nm-none.h
@@ -1,18 +1,19 @@
 /* Defines needed when configuring for "none".
    Copyright (C) 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
diff --git a/gdb/config/none/tm-none.h b/gdb/config/none/tm-none.h
index 4b16b3bc141..2cd7baf2f8e 100644
--- a/gdb/config/none/tm-none.h
+++ b/gdb/config/none/tm-none.h
@@ -1,21 +1,22 @@
 /* Defines needed when configuring for "none".
    Copyright (C) 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This define is needed so that "gcc -MM" doesn't get errors and fail on
    source files that use the value of INNER_THAN in preprocessor lines. */
diff --git a/gdb/config/none/xm-none.h b/gdb/config/none/xm-none.h
index 9d630f36e4e..4ee9a0be1f3 100644
--- a/gdb/config/none/xm-none.h
+++ b/gdb/config/none/xm-none.h
@@ -1,18 +1,19 @@
 /* Defines needed when configuring for "none".
    Copyright (C) 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
diff --git a/gdb/config/ns32k/nm-nbsd.h b/gdb/config/ns32k/nm-nbsd.h
index cef536e4050..e4aa02e2533 100644
--- a/gdb/config/ns32k/nm-nbsd.h
+++ b/gdb/config/ns32k/nm-nbsd.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for ns32k running NetBSD, for GDB.
    Copyright 1986, 1987, 1989, 1992, 1994 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.  */
+   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.  */
 
 #ifndef NM_NBSD_H
 #define NM_NBSD_H
diff --git a/gdb/config/ns32k/nm-umax.h b/gdb/config/ns32k/nm-umax.h
index add6e70f31b..76f0c4193d2 100644
--- a/gdb/config/ns32k/nm-umax.h
+++ b/gdb/config/ns32k/nm-umax.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on an encore under umax 4.2
    Copyright 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Do implement the attach and detach commands...  */
 #define ATTACH_DETACH
diff --git a/gdb/config/ns32k/tm-merlin.h b/gdb/config/ns32k/tm-merlin.h
index 907179fe68a..5fa06b8078c 100644
--- a/gdb/config/ns32k/tm-merlin.h
+++ b/gdb/config/ns32k/tm-merlin.h
@@ -1,21 +1,22 @@
 /* Definitions to target GDB to a merlin under utek 2.1
    Copyright 1986, 1987, 1989, 1991, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER LITTLE_ENDIAN
 
@@ -137,7 +138,7 @@ extern CORE_ADDR merlin_skip_prologue PARAMS ((CORE_ADDR));
     ((N) >= LP0_REGNUM ?	\
      builtin_type_double	\
      : builtin_type_float)	\
-   : builtin_type_int)	
+   : builtin_type_int)
 
 /* Store the address of the place in which to copy the structure the
    subroutine will return.  This is called from call_function.
@@ -192,7 +193,7 @@ extern CORE_ADDR merlin_skip_prologue PARAMS ((CORE_ADDR));
 /* Return number of args passed to a frame.
    Can return -1, meaning no way to tell.  */
 
-extern int merlin_frame_num_args PARAMS ((struct frame_info *fi));
+extern int merlin_frame_num_args PARAMS ((struct frame_info * fi));
 #define FRAME_NUM_ARGS(fi) (merlin_frame_num_args ((fi)))
 
 /* Return number of bytes at start of arglist that are not really args.  */
@@ -222,8 +223,8 @@ extern int merlin_frame_num_args PARAMS ((struct frame_info *fi));
   (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 4;	\
   (frame_saved_regs).regs[FP_REGNUM]				\
      = read_memory_integer ((frame_info)->frame, 4); }
-
 
+
 /* Things needed for making the inferior call functions.  */
 
 /* Push an empty stack frame, to record the current PC, etc.  */
@@ -259,10 +260,10 @@ extern int merlin_frame_num_args PARAMS ((struct frame_info *fi));
 }
 
 /* This sequence of words is the instructions
-     enter	0xff,0		82 ff 00
-     jsr	@0x00010203	7f ae c0 01 02 03
-     adjspd	0x69696969	7f a5 01 02 03 04
-     bpt			f2
+   enter        0xff,0          82 ff 00
+   jsr  @0x00010203     7f ae c0 01 02 03
+   adjspd       0x69696969      7f a5 01 02 03 04
+   bpt                  f2
    Note this is 16 bytes.  */
 
 #define CALL_DUMMY { 0x7f00ff82, 0x0201c0ae, 0x01a57f03, 0xf2040302 }
diff --git a/gdb/config/ns32k/tm-nbsd.h b/gdb/config/ns32k/tm-nbsd.h
index 6e61de31e56..e21de58742c 100644
--- a/gdb/config/ns32k/tm-nbsd.h
+++ b/gdb/config/ns32k/tm-nbsd.h
@@ -1,21 +1,22 @@
 /* Macro definitions for ns32k running under NetBSD.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Override number of expected traps from sysv. */
 #define START_INFERIOR_TRAPS_EXPECTED 2
@@ -76,4 +77,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define REGISTER_BYTE(N) (((N) < LP0_REGNUM? (N)\
 			   : ((N) - LP0_REGNUM) & 1? (N) - 1 \
 			   : ((N) - LP0_REGNUM + FP0_REGNUM)) * 4)
-
diff --git a/gdb/config/ns32k/tm-ns32km3.h b/gdb/config/ns32k/tm-ns32km3.h
index 27d07d75cd5..1d08aa7f599 100644
--- a/gdb/config/ns32k/tm-ns32km3.h
+++ b/gdb/config/ns32k/tm-ns32km3.h
@@ -1,21 +1,22 @@
 /* Macro definitions for ns532, Mach 3.0
    Copyright (C) 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 common definitions for Mach3 systems */
 #include "nm-m3.h"
diff --git a/gdb/config/ns32k/tm-umax.h b/gdb/config/ns32k/tm-umax.h
index dd59388a005..392d3285cf0 100644
--- a/gdb/config/ns32k/tm-umax.h
+++ b/gdb/config/ns32k/tm-umax.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on an encore under umax 4.2
    Copyright 1987, 1989, 1991, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This is also included by tm-ns32km3.h, as well as being used by umax.  */
 
@@ -64,11 +65,11 @@ extern CORE_ADDR umax_skip_prologue PARAMS ((CORE_ADDR));
 
 #define DECR_PC_AFTER_BREAK 0
 
-#if 0 /* Disable until fixed *correctly*.  */
+#if 0				/* Disable until fixed *correctly*.  */
 #ifndef INVALID_FLOAT
 #ifndef NaN
 #include <nan.h>
-#endif NaN
+#endif /* NaN */
 
 /* Return 1 if P points to an invalid floating point value.  */
 /* Surely wrong for cross-debugging.  */
@@ -231,7 +232,7 @@ extern CORE_ADDR ns32k_get_enter_addr ();
    ways in the stack frame.  sp is even more special:
    the address we return for it IS the sp for the next frame.  */
 
-extern int umax_frame_num_args PARAMS ((struct frame_info *fi));
+extern int umax_frame_num_args PARAMS ((struct frame_info * fi));
 #define FRAME_NUM_ARGS(fi) (umax_frame_num_args ((fi)))
 
 /* Things needed for making the inferior call functions.  */
@@ -269,10 +270,10 @@ extern int umax_frame_num_args PARAMS ((struct frame_info *fi));
 }
 
 /* This sequence of words is the instructions
-     enter	0xff,0		82 ff 00
-     jsr	@0x00010203	7f ae c0 01 02 03
-     adjspd	0x69696969	7f a5 01 02 03 04
-     bpt			f2
+   enter        0xff,0          82 ff 00
+   jsr  @0x00010203     7f ae c0 01 02 03
+   adjspd       0x69696969      7f a5 01 02 03 04
+   bpt                  f2
    Note this is 16 bytes.  */
 
 #define CALL_DUMMY { 0x7f00ff82, 0x0201c0ae, 0x01a57f03, 0xf2040302 }
diff --git a/gdb/config/ns32k/xm-merlin.h b/gdb/config/ns32k/xm-merlin.h
index b8329f65d1b..83a810cafff 100644
--- a/gdb/config/ns32k/xm-merlin.h
+++ b/gdb/config/ns32k/xm-merlin.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on a merlin under utek 2.1
    Copyright 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 <machine/reg.h>
 
diff --git a/gdb/config/ns32k/xm-nbsd.h b/gdb/config/ns32k/xm-nbsd.h
index db8c0bcff1a..23a0650d280 100644
--- a/gdb/config/ns32k/xm-nbsd.h
+++ b/gdb/config/ns32k/xm-nbsd.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a ns32k running NetBSD, for GDB.
    Copyright 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Get generic NetBSD host definitions. */
 #include "xm-nbsd.h"
diff --git a/gdb/config/ns32k/xm-ns32km3.h b/gdb/config/ns32k/xm-ns32km3.h
index 3d08e67c82d..45ec7710056 100644
--- a/gdb/config/ns32k/xm-ns32km3.h
+++ b/gdb/config/ns32k/xm-ns32km3.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on Mach 3 on an National ns32k
    Copyright (C) 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
diff --git a/gdb/config/ns32k/xm-umax.h b/gdb/config/ns32k/xm-umax.h
index 1bb00714daf..b7f4dad6dc1 100644
--- a/gdb/config/ns32k/xm-umax.h
+++ b/gdb/config/ns32k/xm-umax.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on an encore under umax 4.2
    Copyright 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
@@ -23,4 +24,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Doesn't have siginterupt.  */
 #define NO_SIGINTERRUPT
-
diff --git a/gdb/config/pa/nm-hppab.h b/gdb/config/pa/nm-hppab.h
index 6b6367419c0..bf008e5c6f1 100644
--- a/gdb/config/pa/nm-hppab.h
+++ b/gdb/config/pa/nm-hppab.h
@@ -1,21 +1,22 @@
 /* HPPA PA-RISC machine native support for BSD, for GDB.
    Copyright 1991, 1992 Free Software Foundation, Inc. 
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "somsolib.h"
 
@@ -74,7 +75,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    it possible for the kernel to easily decide if a trap was caused
    by a watchpoint or by the user writing to protected memory and can
    signal the user program differently in each case.  
-   
+
    Second, the PA has a bit in the processor status word which causes
    data memory breakpoints (aka watchpoints) to be disabled for a single
    instruction.  This bit can be used to avoid the overhead of unprotecting
@@ -97,7 +98,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    fired because of a write to an address on the same page as a watchpoint,
    but no write to the watched address occured).  */
 
-#define TARGET_HAS_HARDWARE_WATCHPOINTS	/* Enable the code in procfs.c */
+#define TARGET_HAS_HARDWARE_WATCHPOINTS		/* Enable the code in procfs.c */
 
 /* The PA can watch any number of locations, there's no need for it to reject
    anything (generic routines already check that all intermediates are
diff --git a/gdb/config/pa/nm-hppah.h b/gdb/config/pa/nm-hppah.h
index c14c0648b91..9d0866ce1a8 100644
--- a/gdb/config/pa/nm-hppah.h
+++ b/gdb/config/pa/nm-hppah.h
@@ -1,21 +1,22 @@
 /* Native support for HPPA-RISC machine running HPUX, for GDB.
    Copyright 1991, 1992 Free Software Foundation, Inc. 
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define U_REGS_OFFSET 0
 
@@ -57,7 +58,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* While this is for use by threaded programs, it doesn't appear
  * to hurt non-threaded ones.  This is used in infrun.c: */
 #define PREPARE_TO_PROCEED(select_it) hppa_prepare_to_proceed()
-extern int hppa_prepare_to_proceed PARAMS(( void ));
+extern int hppa_prepare_to_proceed PARAMS ((void));
 
 /* In infptrace.c or infttrace.c: */
 #define CHILD_PID_TO_EXEC_FILE
@@ -82,7 +83,7 @@ extern int hppa_prepare_to_proceed PARAMS(( void ));
 extern int hppa_require_attach PARAMS ((int));
 
 #define REQUIRE_DETACH(pid,signal) hppa_require_detach(pid,signal)
-extern int hppa_require_detach PARAMS ((int,int));
+extern int hppa_require_detach PARAMS ((int, int));
 
 /* So we can cleanly use code in infptrace.c.  */
 #define PT_KILL		PT_EXIT
@@ -193,14 +194,14 @@ extern int hppa_require_detach PARAMS ((int,int));
 
    infptrace.c supplies dummy versions of these; infttrace.c is where the
    meaningful implementations are.
-   */
+ */
 #define TARGET_ENABLE_HW_WATCHPOINTS(pid) \
         hppa_enable_page_protection_events (pid)
-extern void  hppa_enable_page_protection_events PARAMS ((int));
+extern void hppa_enable_page_protection_events PARAMS ((int));
 
 #define TARGET_DISABLE_HW_WATCHPOINTS(pid) \
         hppa_disable_page_protection_events (pid)
-extern void  hppa_disable_page_protection_events PARAMS ((int));
+extern void hppa_disable_page_protection_events PARAMS ((int));
 
 /* Use these macros for watchpoint insertion/deletion.  */
 #define target_insert_watchpoint(addr, len, type) \
@@ -215,11 +216,11 @@ extern void  hppa_disable_page_protection_events PARAMS ((int));
  */
 #define target_pid_to_str( pid ) \
         hppa_pid_to_str( pid )
-extern char * hppa_pid_to_str PARAMS ((pid_t));
+extern char *hppa_pid_to_str PARAMS ((pid_t));
 
 #define target_tid_to_str( pid ) \
         hppa_tid_to_str( pid )
-extern char * hppa_tid_to_str PARAMS ((pid_t));
+extern char *hppa_tid_to_str PARAMS ((pid_t));
 
 /* For this, ID can be either a process or thread ID, and the function
    will describe it appropriately, returning the description as a printable
@@ -227,10 +228,10 @@ extern char * hppa_tid_to_str PARAMS ((pid_t));
 
    The function that implements this macro is defined in infptrace.c and
    infttrace.c.
-   */
+ */
 #define target_pid_or_tid_to_str(ID) \
         hppa_pid_or_tid_to_str (ID)
-extern char * hppa_pid_or_tid_to_str PARAMS ((pid_t));
+extern char *hppa_pid_or_tid_to_str PARAMS ((pid_t));
 
 /* This is used when handling events caused by a call to vfork().  On ptrace-
    based HP-UXs, when you resume the vforked child, the parent automagically
@@ -240,15 +241,15 @@ extern char * hppa_pid_or_tid_to_str PARAMS ((pid_t));
 
    1. the vfork event for the new child process
    2. the exit or exec event of the new child process (actually, you get
-      two exec events on ptrace-based HP-UXs)
+   two exec events on ptrace-based HP-UXs)
    3. the vfork event for the original parent process
 
    The first is always received first.  The other two may be received in any
    order; HP-UX doesn't guarantee an order.
-   */
+ */
 #define ENSURE_VFORKING_PARENT_REMAINS_STOPPED(PID) \
         hppa_ensure_vforking_parent_remains_stopped (PID)
-extern void  hppa_ensure_vforking_parent_remains_stopped PARAMS((int));
+extern void hppa_ensure_vforking_parent_remains_stopped PARAMS ((int));
 
 /* This is used when handling events caused by a call to vfork().
 
@@ -259,10 +260,10 @@ extern void  hppa_ensure_vforking_parent_remains_stopped PARAMS((int));
    On ptrace-based HP-UXs, you must resume the child after its exec event is
    delivered or you won't get the parent's vfork.  I.e., you can't just wait()
    and get the parent vfork, after receiving the child exec.
-   */
+ */
 #define RESUME_EXECD_VFORKING_CHILD_TO_GET_PARENT_VFORK() \
         hppa_resume_execd_vforking_child_to_get_parent_vfork ()
-extern int  hppa_resume_execd_vforking_child_to_get_parent_vfork PARAMS ((void));
+extern int hppa_resume_execd_vforking_child_to_get_parent_vfork PARAMS ((void));
 
 #ifdef HAVE_HPUX_THREAD_SUPPORT
 
@@ -270,7 +271,7 @@ extern int  hppa_resume_execd_vforking_child_to_get_parent_vfork PARAMS ((void))
 struct objfile;
 #endif
 
-void hpux_thread_new_objfile PARAMS ((struct objfile *objfile));
+void hpux_thread_new_objfile PARAMS ((struct objfile * objfile));
 #define target_new_objfile(OBJFILE) hpux_thread_new_objfile (OBJFILE)
 
 extern char *hpux_pid_to_str PARAMS ((int pid));
@@ -285,4 +286,3 @@ extern char *hpux_pid_to_str PARAMS ((int pid));
 #define MAY_FOLLOW_EXEC (1)
 
 #define USE_THREAD_STEP_NEEDED (1)
-
diff --git a/gdb/config/pa/nm-hppah11.h b/gdb/config/pa/nm-hppah11.h
index 7a73c241b7e..2c2b507a436 100644
--- a/gdb/config/pa/nm-hppah11.h
+++ b/gdb/config/pa/nm-hppah11.h
@@ -1,21 +1,22 @@
 /* Native support for HPPA-RISC machine running HPUX 11.x, for GDB.
    Copyright 1998 Free Software Foundation, Inc. 
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define GDB_NATIVE_HPUX_11
 
diff --git a/gdb/config/pa/nm-hppao.h b/gdb/config/pa/nm-hppao.h
index a09dfd1c14c..c0d755eb468 100644
--- a/gdb/config/pa/nm-hppao.h
+++ b/gdb/config/pa/nm-hppao.h
@@ -1,21 +1,22 @@
 /* HPPA PA-RISC machine native support for Lites, for GDB.
    Copyright 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.  */
+   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 "nm-m3.h"
 #define U_REGS_OFFSET 0
diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index ec83395d656..f284a189004 100644
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -5,21 +5,22 @@
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Forward declarations of some types we use in prototypes */
 
@@ -68,7 +69,7 @@ struct inferior_status;
    Zero on most machines.  */
 
 #define FUNCTION_START_OFFSET 0
-     
+
 /* Advance PC across any function entry prologue instructions
    to reach some "real" code.  */
 
@@ -105,10 +106,10 @@ extern CORE_ADDR saved_pc_after_call PARAMS ((struct frame_info *));
 
 /* elz: adjust the quantity to the next highest value which is 64-bit aligned.
    This is used in valops.c, when the sp is adjusted.
-   On hppa the sp must always be kept 64-bit aligned*/
+   On hppa the sp must always be kept 64-bit aligned */
 
 #define STACK_ALIGN(arg) ( ((arg)%8) ? (((arg)+7)&-8) : (arg))
-#define NO_EXTRA_ALIGNMENT_NEEDED 1 
+#define NO_EXTRA_ALIGNMENT_NEEDED 1
 
 /* Sequence of bytes for breakpoint instruction.  */
 
@@ -145,11 +146,11 @@ extern CORE_ADDR saved_pc_after_call PARAMS ((struct frame_info *));
    is of these "really, truly negative" addresses that come from the
    minimal symbols, I'm resorting to the gross hack of checking the
    top byte of the address for all 1's.  Sigh.
-   */
+ */
 #define PC_REQUIRES_RUN_BEFORE_USE(pc) \
   (! target_has_stack && (pc & 0xFF000000))
 
-/* return instruction is bv r0(rp) or bv,n r0(rp)*/
+/* return instruction is bv r0(rp) or bv,n r0(rp) */
 
 #define ABOUT_TO_RETURN(pc) ((read_memory_integer (pc, 4) | 0x2) == 0xE840C002)
 
@@ -212,14 +213,14 @@ extern CORE_ADDR saved_pc_after_call PARAMS ((struct frame_info *));
 #define RCR_REGNUM 51		/* Recover Counter (also known as cr0) */
 #define CCR_REGNUM 54		/* Coprocessor Configuration Register */
 #define TR0_REGNUM 57		/* Temporary Registers (cr24 -> cr31) */
-#define CR27_REGNUM 60          /* Base register for thread-local storage, cr27 */
-#define FP0_REGNUM 64		/* floating point reg. 0 (fspr)*/
+#define CR27_REGNUM 60		/* Base register for thread-local storage, cr27 */
+#define FP0_REGNUM 64		/* floating point reg. 0 (fspr) */
 #define FP4_REGNUM 72
 
-#define ARG0_REGNUM 26          /* The first argument of a callee. */
-#define ARG1_REGNUM 25          /* The second argument of a callee. */
-#define ARG2_REGNUM 24          /* The third argument of a callee. */
-#define ARG3_REGNUM 23          /* The fourth argument of a callee. */
+#define ARG0_REGNUM 26		/* The first argument of a callee. */
+#define ARG1_REGNUM 25		/* The second argument of a callee. */
+#define ARG2_REGNUM 24		/* The third argument of a callee. */
+#define ARG3_REGNUM 23		/* The fourth argument of a callee. */
 
 /* compatibility with the rest of gdb. */
 #define PC_REGNUM PCOQ_HEAD_REGNUM
@@ -229,22 +230,22 @@ extern CORE_ADDR saved_pc_after_call PARAMS ((struct frame_info *));
  * Processor Status Word Masks
  */
 
-#define PSW_T   0x01000000      /* Taken Branch Trap Enable */
-#define PSW_H   0x00800000      /* Higher-Privilege Transfer Trap Enable */
-#define PSW_L   0x00400000      /* Lower-Privilege Transfer Trap Enable */
-#define PSW_N   0x00200000      /* PC Queue Front Instruction Nullified */
-#define PSW_X   0x00100000      /* Data Memory Break Disable */
-#define PSW_B   0x00080000      /* Taken Branch in Previous Cycle */
-#define PSW_C   0x00040000      /* Code Address Translation Enable */
-#define PSW_V   0x00020000      /* Divide Step Correction */
-#define PSW_M   0x00010000      /* High-Priority Machine Check Disable */
-#define PSW_CB  0x0000ff00      /* Carry/Borrow Bits */
-#define PSW_R   0x00000010      /* Recovery Counter Enable */
-#define PSW_Q   0x00000008      /* Interruption State Collection Enable */
-#define PSW_P   0x00000004      /* Protection ID Validation Enable */
-#define PSW_D   0x00000002      /* Data Address Translation Enable */
-#define PSW_I   0x00000001      /* External, Power Failure, Low-Priority */
-                                /* Machine Check Interruption Enable */
+#define PSW_T   0x01000000	/* Taken Branch Trap Enable */
+#define PSW_H   0x00800000	/* Higher-Privilege Transfer Trap Enable */
+#define PSW_L   0x00400000	/* Lower-Privilege Transfer Trap Enable */
+#define PSW_N   0x00200000	/* PC Queue Front Instruction Nullified */
+#define PSW_X   0x00100000	/* Data Memory Break Disable */
+#define PSW_B   0x00080000	/* Taken Branch in Previous Cycle */
+#define PSW_C   0x00040000	/* Code Address Translation Enable */
+#define PSW_V   0x00020000	/* Divide Step Correction */
+#define PSW_M   0x00010000	/* High-Priority Machine Check Disable */
+#define PSW_CB  0x0000ff00	/* Carry/Borrow Bits */
+#define PSW_R   0x00000010	/* Recovery Counter Enable */
+#define PSW_Q   0x00000008	/* Interruption State Collection Enable */
+#define PSW_P   0x00000004	/* Protection ID Validation Enable */
+#define PSW_D   0x00000002	/* Data Address Translation Enable */
+#define PSW_I   0x00000001	/* External, Power Failure, Low-Priority */
+				/* Machine Check Interruption Enable */
 
 /* When fetching register values from an inferior or a core file,
    clean them up using this macro.  BUF is a char pointer to
@@ -347,7 +348,7 @@ extern void pa_do_strcat_registers_info PARAMS ((int, int, GDB_FILE *, enum prec
     fr4: floating point up to 64 bits
     sr1: space identifier (32-bit)
     stack: any lager than 64-bit, with the address in r28
- */
+  */
 extern use_struct_convention_fn hppa_use_struct_convention;
 #define USE_STRUCT_CONVENTION(gcc_p,type) hppa_use_struct_convention (gcc_p,type)
 
@@ -384,7 +385,7 @@ extern use_struct_convention_fn hppa_use_struct_convention;
    convention doc. As far as I know, the only way to get the return value
    is to have the caller tell us where it told the callee to put it, rather
    than have the callee tell us.
-*/
+ */
 #define VALUE_RETURNED_FROM_STACK(valtype,addr) \
   hppa_value_returned_from_stack (valtype, addr)
 
@@ -441,7 +442,7 @@ extern int hppa_frame_chain_valid PARAMS ((CORE_ADDR, struct frame_info *));
   (frameless_function_invocation (FI))
 extern int frameless_function_invocation PARAMS ((struct frame_info *));
 
-extern CORE_ADDR hppa_frame_saved_pc PARAMS ((struct frame_info *frame));
+extern CORE_ADDR hppa_frame_saved_pc PARAMS ((struct frame_info * frame));
 #define FRAME_SAVED_PC(FRAME) hppa_frame_saved_pc (FRAME)
 
 #define FRAME_ARGS_ADDRESS(fi) ((fi)->frame)
@@ -463,8 +464,8 @@ extern CORE_ADDR hppa_frame_saved_pc PARAMS ((struct frame_info *frame));
 extern void
 hppa_frame_find_saved_regs PARAMS ((struct frame_info *,
 				    struct frame_saved_regs *));
-
 
+
 /* Things needed for making the inferior call functions.  */
 
 /* Push an empty stack frame, to record the current PC, etc. */
@@ -486,40 +487,40 @@ extern void hppa_pop_frame PARAMS ((void));
 
 /* This sequence of words is the instructions
 
-; Call stack frame has already been built by gdb. Since we could be calling 
-; a varargs function, and we do not have the benefit of a stub to put things in
-; the right place, we load the first 4 word of arguments into both the general
-; and fp registers.
-call_dummy
-	ldw -36(sp), arg0
-	ldw -40(sp), arg1
-	ldw -44(sp), arg2
-	ldw -48(sp), arg3
-	ldo -36(sp), r1
-	fldws 0(0, r1), fr4
-	fldds -4(0, r1), fr5
-	fldws -8(0, r1), fr6
-	fldds -12(0, r1), fr7
-	ldil 0, r22			; FUNC_LDIL_OFFSET must point here
-	ldo 0(r22), r22			; FUNC_LDO_OFFSET must point here
-	ldsid (0,r22), r4
-	ldil 0, r1			; SR4EXPORT_LDIL_OFFSET must point here
-	ldo 0(r1), r1			; SR4EXPORT_LDO_OFFSET must point here
-	ldsid (0,r1), r20
-	combt,=,n r4, r20, text_space	; If target is in data space, do a
-	ble 0(sr5, r22)			; "normal" procedure call
-	copy r31, r2
-	break 4, 8 
-	mtsp r21, sr0
-	ble,n 0(sr0, r22)
-text_space				; Otherwise, go through _sr4export,
-	ble (sr4, r1)			; which will return back here.
-	stw r31,-24(r30)
-	break 4, 8
-	mtsp r21, sr0
-	ble,n 0(sr0, r22)
-	nop				; To avoid kernel bugs 
-	nop				; and keep the dummy 8 byte aligned
+   ; Call stack frame has already been built by gdb. Since we could be calling 
+   ; a varargs function, and we do not have the benefit of a stub to put things in
+   ; the right place, we load the first 4 word of arguments into both the general
+   ; and fp registers.
+   call_dummy
+   ldw -36(sp), arg0
+   ldw -40(sp), arg1
+   ldw -44(sp), arg2
+   ldw -48(sp), arg3
+   ldo -36(sp), r1
+   fldws 0(0, r1), fr4
+   fldds -4(0, r1), fr5
+   fldws -8(0, r1), fr6
+   fldds -12(0, r1), fr7
+   ldil 0, r22                  ; FUNC_LDIL_OFFSET must point here
+   ldo 0(r22), r22                      ; FUNC_LDO_OFFSET must point here
+   ldsid (0,r22), r4
+   ldil 0, r1                   ; SR4EXPORT_LDIL_OFFSET must point here
+   ldo 0(r1), r1                        ; SR4EXPORT_LDO_OFFSET must point here
+   ldsid (0,r1), r20
+   combt,=,n r4, r20, text_space        ; If target is in data space, do a
+   ble 0(sr5, r22)                      ; "normal" procedure call
+   copy r31, r2
+   break 4, 8 
+   mtsp r21, sr0
+   ble,n 0(sr0, r22)
+   text_space                           ; Otherwise, go through _sr4export,
+   ble (sr4, r1)                        ; which will return back here.
+   stw r31,-24(r30)
+   break 4, 8
+   mtsp r21, sr0
+   ble,n 0(sr0, r22)
+   nop                          ; To avoid kernel bugs 
+   nop                          ; and keep the dummy 8 byte aligned
 
    The dummy decides if the target is in text space or data space. If
    it's in data space, there's no problem because the target can
@@ -570,21 +571,21 @@ text_space				; Otherwise, go through _sr4export,
    registers (or floating point??), so we skip all that inter-space call stuff,
    and avoid touching the fp regs.
 
-call_dummy
-
-	ldw -36(%sp), %arg0
-	ldw -40(%sp), %arg1
-	ldw -44(%sp), %arg2
-	ldw -48(%sp), %arg3
-	ldil 0, %r31			; FUNC_LDIL_OFFSET must point here
-	ldo 0(%r31), %r31		; FUNC_LDO_OFFSET must point here
-	ble 0(%sr0, %r31)
-	copy %r31, %r2
-	break 4, 8 
-	nop				; restore_pc_queue expects these
-	bv,n 0(%r22)			; instructions to be here...
-	nop
-*/
+   call_dummy
+
+   ldw -36(%sp), %arg0
+   ldw -40(%sp), %arg1
+   ldw -44(%sp), %arg2
+   ldw -48(%sp), %arg3
+   ldil 0, %r31                 ; FUNC_LDIL_OFFSET must point here
+   ldo 0(%r31), %r31            ; FUNC_LDO_OFFSET must point here
+   ble 0(%sr0, %r31)
+   copy %r31, %r2
+   break 4, 8 
+   nop                          ; restore_pc_queue expects these
+   bv,n 0(%r22)                 ; instructions to be here...
+   nop
+ */
 
 /* Define offsets into the call dummy for the target function address */
 #define FUNC_LDIL_OFFSET (INSTRUCTION_SIZE * 4)
@@ -620,14 +621,14 @@ call_dummy
 #define FIX_CALL_DUMMY hppa_fix_call_dummy
 
 extern CORE_ADDR
-hppa_fix_call_dummy PARAMS ((char *, CORE_ADDR, CORE_ADDR, int,
-			     struct value **, struct type *, int));
+  hppa_fix_call_dummy PARAMS ((char *, CORE_ADDR, CORE_ADDR, int,
+			       struct value **, struct type *, int));
 
 #define PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) \
   (hppa_push_arguments((nargs), (args), (sp), (struct_return), (struct_addr)))
 extern CORE_ADDR
-hppa_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int,
-			     CORE_ADDR));
+  hppa_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int,
+			       CORE_ADDR));
 
 /* The low two bits of the PC on the PA contain the privilege level.  Some
    genius implementing a (non-GCC) compiler apparently decided this means
@@ -645,51 +646,54 @@ hppa_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int,
  * Unwind table and descriptor.
  */
 
-struct unwind_table_entry {
-  unsigned int region_start;
-  unsigned int region_end;
-
-  unsigned int Cannot_unwind         :  1;                      /* 0 */
-  unsigned int Millicode             :  1;                      /* 1 */
-  unsigned int Millicode_save_sr0    :  1;                      /* 2 */
-  unsigned int Region_description    :  2;                      /* 3..4 */
-  unsigned int reserved1             :  1;                      /* 5 */
-  unsigned int Entry_SR              :  1;                      /* 6 */
-  unsigned int Entry_FR              :  4; /* number saved */   /* 7..10 */
-  unsigned int Entry_GR              :  5; /* number saved */   /* 11..15 */
-  unsigned int Args_stored           :  1;                      /* 16 */
-  unsigned int Variable_Frame	     :  1;                      /* 17 */
-  unsigned int Separate_Package_Body :  1;                      /* 18 */
-  unsigned int Frame_Extension_Millicode:1;                     /* 19 */
-  unsigned int Stack_Overflow_Check  :  1;                      /* 20 */
-  unsigned int Two_Instruction_SP_Increment:1;                  /* 21 */
-  unsigned int Ada_Region	     :  1;                      /* 22 */
-  unsigned int cxx_info              :  1;                      /* 23 */
-  unsigned int cxx_try_catch         :  1;                      /* 24 */
-  unsigned int sched_entry_seq       :  1;                      /* 25 */
-  unsigned int reserved2	     :  1;                      /* 26 */
-  unsigned int Save_SP               :  1;                      /* 27 */
-  unsigned int Save_RP               :  1;                      /* 28 */
-  unsigned int Save_MRP_in_frame     :  1;                      /* 29 */
-  unsigned int extn_ptr_defined      :  1;                      /* 30 */
-  unsigned int Cleanup_defined       :  1;                      /* 31 */
-
-  unsigned int MPE_XL_interrupt_marker: 1;                      /* 0 */
-  unsigned int HP_UX_interrupt_marker:  1;                      /* 1 */
-  unsigned int Large_frame	     :  1;                      /* 2 */
-  unsigned int Pseudo_SP_Set         :  1;                      /* 3 */
-  unsigned int reserved4             :  1;                      /* 4 */
-  unsigned int Total_frame_size      : 27;                      /* 5..31 */
-
-  /* This is *NOT* part of an actual unwind_descriptor in an object
-     file.  It is *ONLY* part of the "internalized" descriptors that
-     we create from those in a file.
+struct unwind_table_entry
+  {
+    unsigned int region_start;
+    unsigned int region_end;
+
+    unsigned int Cannot_unwind:1;	/* 0 */
+    unsigned int Millicode:1;	/* 1 */
+    unsigned int Millicode_save_sr0:1;	/* 2 */
+    unsigned int Region_description:2;	/* 3..4 */
+    unsigned int reserved1:1;	/* 5 */
+    unsigned int Entry_SR:1;	/* 6 */
+    unsigned int Entry_FR:4;	/* number saved *//* 7..10 */
+    unsigned int Entry_GR:5;	/* number saved *//* 11..15 */
+    unsigned int Args_stored:1;	/* 16 */
+    unsigned int Variable_Frame:1;	/* 17 */
+    unsigned int Separate_Package_Body:1;	/* 18 */
+    unsigned int Frame_Extension_Millicode:1;	/* 19 */
+    unsigned int Stack_Overflow_Check:1;	/* 20 */
+    unsigned int Two_Instruction_SP_Increment:1;	/* 21 */
+    unsigned int Ada_Region:1;	/* 22 */
+    unsigned int cxx_info:1;	/* 23 */
+    unsigned int cxx_try_catch:1;	/* 24 */
+    unsigned int sched_entry_seq:1;	/* 25 */
+    unsigned int reserved2:1;	/* 26 */
+    unsigned int Save_SP:1;	/* 27 */
+    unsigned int Save_RP:1;	/* 28 */
+    unsigned int Save_MRP_in_frame:1;	/* 29 */
+    unsigned int extn_ptr_defined:1;	/* 30 */
+    unsigned int Cleanup_defined:1;	/* 31 */
+
+    unsigned int MPE_XL_interrupt_marker:1;	/* 0 */
+    unsigned int HP_UX_interrupt_marker:1;	/* 1 */
+    unsigned int Large_frame:1;	/* 2 */
+    unsigned int Pseudo_SP_Set:1;	/* 3 */
+    unsigned int reserved4:1;	/* 4 */
+    unsigned int Total_frame_size:27;	/* 5..31 */
+
+    /* This is *NOT* part of an actual unwind_descriptor in an object
+       file.  It is *ONLY* part of the "internalized" descriptors that
+       we create from those in a file.
      */
-  struct {
-    unsigned int  stub_type          : 4;                       /* 0..3 */
-    unsigned int  padding            : 28;                      /* 4..31 */
-  } stub_unwind;
-};
+    struct
+      {
+	unsigned int stub_type:4;	/* 0..3 */
+	unsigned int padding:28;	/* 4..31 */
+      }
+    stub_unwind;
+  };
 
 /* HP linkers also generate unwinds for various linker-generated stubs.
    GDB reads in the stubs from the $UNWIND_END$ subspace, then 
@@ -697,19 +701,19 @@ struct unwind_table_entry {
    fields to store the stub type.  */
 
 struct stub_unwind_entry
-{
-  /* The offset within the executable for the associated stub.  */
-  unsigned stub_offset;
+  {
+    /* The offset within the executable for the associated stub.  */
+    unsigned stub_offset;
 
-  /* The type of stub this unwind entry describes.  */
-  char type;
+    /* The type of stub this unwind entry describes.  */
+    char type;
 
-  /* Unknown.  Not needed by GDB at this time.  */
-  char prs_info;
+    /* Unknown.  Not needed by GDB at this time.  */
+    char prs_info;
 
-  /* Length (in instructions) of the associated stub.  */
-  short stub_length;
-};
+    /* Length (in instructions) of the associated stub.  */
+    short stub_length;
+  };
 
 /* Sizes (in bytes) of the native unwind entries.  */
 #define UNWIND_ENTRY_SIZE 16
@@ -718,61 +722,65 @@ struct stub_unwind_entry
 /* The gaps represent linker stubs used in MPE and space for future
    expansion.  */
 enum unwind_stub_types
-{
-  LONG_BRANCH = 1,
-  PARAMETER_RELOCATION = 2,
-  EXPORT = 10,
-  IMPORT = 11,
-  IMPORT_SHLIB = 12,
-};
+  {
+    LONG_BRANCH = 1,
+    PARAMETER_RELOCATION = 2,
+    EXPORT = 10,
+    IMPORT = 11,
+    IMPORT_SHLIB = 12,
+  };
 
 /* We use the objfile->obj_private pointer for two things:
- *
+
  * 1.  An unwind table;
  *
  * 2.  A pointer to any associated shared library object.
  *
  * #defines are used to help refer to these objects.
  */
- 
+
 /* Info about the unwind table associated with an object file.
- *
+
  * This is hung off of the "objfile->obj_private" pointer, and
  * is allocated in the objfile's psymbol obstack.  This allows
  * us to have unique unwind info for each executable and shared
  * library that we are debugging.
  */
-struct obj_unwind_info {
-  struct unwind_table_entry *table; /* Pointer to unwind info */
-  struct unwind_table_entry *cache; /* Pointer to last entry we found */
-  int last;		   	    /* Index of last entry */
-};
-
-typedef struct obj_private_struct {
-   struct obj_unwind_info *unwind_info; /* a pointer */
-   struct so_list         *so_info;     /* a pointer  */
-} obj_private_data_t;
+struct obj_unwind_info
+  {
+    struct unwind_table_entry *table;	/* Pointer to unwind info */
+    struct unwind_table_entry *cache;	/* Pointer to last entry we found */
+    int last;			/* Index of last entry */
+  };
+
+typedef struct obj_private_struct
+  {
+    struct obj_unwind_info *unwind_info;	/* a pointer */
+    struct so_list *so_info;	/* a pointer  */
+  }
+obj_private_data_t;
 
 #if 0
-extern void target_write_pc PARAMS ((CORE_ADDR, int))
-extern CORE_ADDR target_read_pc PARAMS ((int));
-extern CORE_ADDR skip_trampoline_code PARAMS ((CORE_ADDR, char *));
+extern void target_write_pc
+PARAMS ((CORE_ADDR, int))
+     extern CORE_ADDR target_read_pc PARAMS ((int));
+     extern CORE_ADDR skip_trampoline_code PARAMS ((CORE_ADDR, char *));
 #endif
 
 #define TARGET_READ_PC(pid) target_read_pc (pid)
-extern CORE_ADDR target_read_pc PARAMS ((int));
+     extern CORE_ADDR target_read_pc PARAMS ((int));
 
 #define TARGET_WRITE_PC(v,pid) target_write_pc (v,pid)
-extern void target_write_pc PARAMS ((CORE_ADDR, int));
+     extern void target_write_pc PARAMS ((CORE_ADDR, int));
 
 #define TARGET_READ_FP() target_read_fp (inferior_pid)
-extern CORE_ADDR  target_read_fp PARAMS ((int));
+     extern CORE_ADDR target_read_fp PARAMS ((int));
 
 /* For a number of horrible reasons we may have to adjust the location
    of variables on the stack.  Ugh.  */
 #define HPREAD_ADJUST_STACK_ADDRESS(ADDR) hpread_adjust_stack_address(ADDR)
 
-extern int hpread_adjust_stack_address PARAMS ((CORE_ADDR));
+     extern int hpread_adjust_stack_address PARAMS ((CORE_ADDR));
 
 /* If the current gcc for for this target does not produce correct debugging
    information for float parameters, both prototyped and unprototyped, then
diff --git a/gdb/config/pa/tm-hppah.h b/gdb/config/pa/tm-hppah.h
index a8f11668c57..d6906bf0925 100644
--- a/gdb/config/pa/tm-hppah.h
+++ b/gdb/config/pa/tm-hppah.h
@@ -4,21 +4,22 @@
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
 
-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.  */
+   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.  */
 
 #define HPUX_SNAP1
 #define HPUX_SNAP2
diff --git a/gdb/config/pa/tm-hppao.h b/gdb/config/pa/tm-hppao.h
index 7df42474744..2e87efa9c45 100644
--- a/gdb/config/pa/tm-hppao.h
+++ b/gdb/config/pa/tm-hppao.h
@@ -12,7 +12,7 @@
 /*
  * Software defined PSW masks.
  */
-#define PSW_SS  0x10000000      /* Kernel managed single step */
+#define PSW_SS  0x10000000	/* Kernel managed single step */
 
 /* Thread flavors used in re-setting the T bit.
  * @@ this is also bad for cross debugging.
@@ -89,7 +89,7 @@
         write_register(IPSW_REGNUM, ipsw & ~(PSW_N | PSW_B | PSW_X)); \
         stop_pc = pcoqt; \
       } \
-   }), 0) 
+   }), 0)
 
 /* It's mostly just the common stuff.  */
 
diff --git a/gdb/config/pa/xm-hppab.h b/gdb/config/pa/xm-hppab.h
index 9f6467fcf0a..d3b6b7aae42 100644
--- a/gdb/config/pa/xm-hppab.h
+++ b/gdb/config/pa/xm-hppab.h
@@ -4,21 +4,22 @@
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
 
-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.  */
+   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.  */
 
 /* This is a big-endian host.  */
 
diff --git a/gdb/config/pa/xm-hppah.h b/gdb/config/pa/xm-hppah.h
index 2cd47ddcf03..1542d327035 100644
--- a/gdb/config/pa/xm-hppah.h
+++ b/gdb/config/pa/xm-hppah.h
@@ -4,21 +4,22 @@
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Host is big-endian. */
 #define	HOST_BYTE_ORDER	BIG_ENDIAN
@@ -40,10 +41,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define MALLOC_INCOMPATIBLE
 
 extern void *
-malloc PARAMS ((size_t));
+  malloc PARAMS ((size_t));
 
 extern void *
-realloc PARAMS ((void *, size_t));
+  realloc PARAMS ((void *, size_t));
 
 extern void
 free PARAMS ((void *));
diff --git a/gdb/config/powerpc/nm-aix.h b/gdb/config/powerpc/nm-aix.h
index c771e8c1288..d73c0714da0 100644
--- a/gdb/config/powerpc/nm-aix.h
+++ b/gdb/config/powerpc/nm-aix.h
@@ -1,21 +1,22 @@
 /* IBM PowerPC native-dependent macros for GDB, the GNU debugger.
    Copyright 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "rs6000/nm-rs6000.h"
 
diff --git a/gdb/config/powerpc/nm-macos.h b/gdb/config/powerpc/nm-macos.h
index a1a3d9e6c3d..9a710d11dba 100644
--- a/gdb/config/powerpc/nm-macos.h
+++ b/gdb/config/powerpc/nm-macos.h
@@ -1,20 +1,21 @@
 /* PowerMac native-dependent macros for GDB, the GNU debugger.
    Copyright (C) 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Nothing needed, at least so far.  */
diff --git a/gdb/config/powerpc/nm-solaris.h b/gdb/config/powerpc/nm-solaris.h
index b276a7151ef..2496f1ec6c0 100644
--- a/gdb/config/powerpc/nm-solaris.h
+++ b/gdb/config/powerpc/nm-solaris.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for PowerPC running Solaris.
    Copyright 1996 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.  */
+   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 the generic SVR4 definitions.  */
 
diff --git a/gdb/config/powerpc/tm-cygwin.h b/gdb/config/powerpc/tm-cygwin.h
index 27ae24aefcd..39ef275492e 100644
--- a/gdb/config/powerpc/tm-cygwin.h
+++ b/gdb/config/powerpc/tm-cygwin.h
@@ -15,7 +15,7 @@
 
    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.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include "powerpc/tm-ppcle-eabi.h"
-
diff --git a/gdb/config/powerpc/tm-macos.h b/gdb/config/powerpc/tm-macos.h
index d32d0de1cd8..bfd7a73f726 100644
--- a/gdb/config/powerpc/tm-macos.h
+++ b/gdb/config/powerpc/tm-macos.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Power PC running MacOS.
    Copyright (C) 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Use generic RS6000 definitions. */
 #include "rs6000/tm-rs6000.h"
diff --git a/gdb/config/powerpc/tm-ppc-aix.h b/gdb/config/powerpc/tm-ppc-aix.h
index 521b9afa349..d3afbd5d0a7 100644
--- a/gdb/config/powerpc/tm-ppc-aix.h
+++ b/gdb/config/powerpc/tm-ppc-aix.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Power PC running AIX.
    Copyright 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.  */
+   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.  */
 
 #ifndef TM_PPC_AIX_H
 #define TM_PPC_AIX_H
diff --git a/gdb/config/powerpc/tm-ppc-eabi.h b/gdb/config/powerpc/tm-ppc-eabi.h
index 41b80a82a81..a90543bbab8 100644
--- a/gdb/config/powerpc/tm-ppc-eabi.h
+++ b/gdb/config/powerpc/tm-ppc-eabi.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Power PC running embedded ABI.
    Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_PPC_EABI_H
 #define TM_PPC_EABI_H
@@ -53,7 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* target-specific dummy_frame stuff */
 
-extern struct frame_info *rs6000_pop_frame PARAMS ((struct frame_info *frame));
+extern struct frame_info *rs6000_pop_frame PARAMS ((struct frame_info * frame));
 
 extern CORE_ADDR ppc_push_return_address PARAMS ((CORE_ADDR, CORE_ADDR));
 
diff --git a/gdb/config/powerpc/tm-ppc-nw.h b/gdb/config/powerpc/tm-ppc-nw.h
index 38f72112bb4..7306ea00d7c 100644
--- a/gdb/config/powerpc/tm-ppc-nw.h
+++ b/gdb/config/powerpc/tm-ppc-nw.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Power PC running Netware.
    Copyright 1994 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.  */
+   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.  */
 
 #ifndef TM_PPC_NW_H
 #define TM_PPC_NW_H
diff --git a/gdb/config/powerpc/tm-ppc-sim.h b/gdb/config/powerpc/tm-ppc-sim.h
index e4116bcc686..9fa11861e1a 100644
--- a/gdb/config/powerpc/tm-ppc-sim.h
+++ b/gdb/config/powerpc/tm-ppc-sim.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Power PC running embedded ABI under the simulator.
    Copyright 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_PPC_SIM_H
 #define TM_PPC_SIM_H
@@ -23,4 +24,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "powerpc/tm-ppc-eabi.h"
 
 #endif /* TM_PPC_SIM_H */
-
diff --git a/gdb/config/powerpc/tm-ppcle-eabi.h b/gdb/config/powerpc/tm-ppcle-eabi.h
index 355195d8a0e..412b4c9331f 100644
--- a/gdb/config/powerpc/tm-ppcle-eabi.h
+++ b/gdb/config/powerpc/tm-ppcle-eabi.h
@@ -2,21 +2,22 @@
    in little endian mode.
    Copyright 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.  */
+   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.  */
 
 #ifndef TM_PPCLE_EABI_H
 #define TM_PPCLE_EABI_H
diff --git a/gdb/config/powerpc/tm-ppcle-sim.h b/gdb/config/powerpc/tm-ppcle-sim.h
index 76564f2cdc3..02707f40019 100644
--- a/gdb/config/powerpc/tm-ppcle-sim.h
+++ b/gdb/config/powerpc/tm-ppcle-sim.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Power PC running embedded ABI under the simulator.
    Copyright 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_PPCLE_SIM_H
 #define TM_PPCLE_SIM_H
@@ -23,4 +24,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "powerpc/tm-ppcle-eabi.h"
 
 #endif /* TM_PPCLE_SIM_H */
-
diff --git a/gdb/config/powerpc/tm-solaris.h b/gdb/config/powerpc/tm-solaris.h
index bd9373fad87..67ddb5296bb 100644
--- a/gdb/config/powerpc/tm-solaris.h
+++ b/gdb/config/powerpc/tm-solaris.h
@@ -1,36 +1,37 @@
 /* Macro definitions for GDB for a PowerPC running Solaris 2
    Copyright 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "powerpc/tm-ppc-eabi.h"
- 
+
 /* There are two different signal handler trampolines in Solaris2.  */
 #define IN_SIGTRAMP(pc, name) \
   ((name) \
    && (STREQ ("sigacthandler", name) || STREQ ("ucbsigvechandler", name)))
- 
+
 /* The signal handler gets a pointer to an ucontext as third argument
    if it is called from sigacthandler.  This is the offset to the saved
    PC within it.  sparc_frame_saved_pc knows how to deal with
-   ucbsigvechandler.  */  
+   ucbsigvechandler.  */
 #define SIGCONTEXT_PC_OFFSET 44
 
-#if 0	/* FIXME Setjmp/longjmp are not as well doc'd in SunOS 5.x yet */
+#if 0				/* FIXME Setjmp/longjmp are not as well doc'd in SunOS 5.x yet */
 
 /* Offsets into jmp_buf.  Not defined by Sun, but at least documented in a
    comment in <machine/setjmp.h>! */
@@ -57,7 +58,7 @@ extern int
 get_longjmp_target PARAMS ((CORE_ADDR *));
 
 #define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR)
-#endif  /* 0 */
+#endif /* 0 */
 
 /* The SunPRO compiler puts out 0 instead of the address in N_SO symbols,
    and for SunPRO 3.0, N_FUN symbols too.  */
diff --git a/gdb/config/powerpc/xm-aix.h b/gdb/config/powerpc/xm-aix.h
index e616d9ee6fd..c5a5ca969d4 100644
--- a/gdb/config/powerpc/xm-aix.h
+++ b/gdb/config/powerpc/xm-aix.h
@@ -2,21 +2,22 @@
    Copyright 1995 Free Software Foundation, Inc.
    Contributed by Cygnus Corporation.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "xm-aix4.h"
 
diff --git a/gdb/config/powerpc/xm-cygwin.h b/gdb/config/powerpc/xm-cygwin.h
index 82aa0fb2b62..2993606285f 100644
--- a/gdb/config/powerpc/xm-cygwin.h
+++ b/gdb/config/powerpc/xm-cygwin.h
@@ -1,21 +1,22 @@
 /* Definitions for hosting on WIN32, for GDB.
    Copyright 1995, 1996, 1998 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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
diff --git a/gdb/config/powerpc/xm-linux.h b/gdb/config/powerpc/xm-linux.h
index 41c8ba71dc5..754f8589ae5 100644
--- a/gdb/config/powerpc/xm-linux.h
+++ b/gdb/config/powerpc/xm-linux.h
@@ -2,20 +2,21 @@
    Copyright 1996
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
diff --git a/gdb/config/powerpc/xm-mpw.h b/gdb/config/powerpc/xm-mpw.h
index 6b33ca206ba..92c9a762aed 100644
--- a/gdb/config/powerpc/xm-mpw.h
+++ b/gdb/config/powerpc/xm-mpw.h
@@ -1,21 +1,22 @@
 /* Macro definitions for running GDB on Apple Power Macintoshes.
    Copyright (C) 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
diff --git a/gdb/config/powerpc/xm-solaris.h b/gdb/config/powerpc/xm-solaris.h
index 9ead87a3887..d14ea343067 100644
--- a/gdb/config/powerpc/xm-solaris.h
+++ b/gdb/config/powerpc/xm-solaris.h
@@ -2,20 +2,21 @@
    Copyright 1996
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
diff --git a/gdb/config/pyr/tm-pyr.h b/gdb/config/pyr/tm-pyr.h
index e28d6fb2019..2647e1565e1 100644
--- a/gdb/config/pyr/tm-pyr.h
+++ b/gdb/config/pyr/tm-pyr.h
@@ -140,21 +140,21 @@
 /* OBSOLETE    but do serve to get the desired values when passed to read_register.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE /* pseudo-registers: *x/ */
-/* OBSOLETE #define PS_REGNUM 64		/* Contains processor status *x/ */
-/* OBSOLETE #define PSW_REGNUM 64		/* Contains current psw, whatever it is.*x/ */
-/* OBSOLETE #define CSP_REGNUM 65		/* address of this control stack frame*x/ */
-/* OBSOLETE #define KSP_REGNUM 66		/* Contains process's Kernel Stack Pointer *x/ */
+/* OBSOLETE #define PS_REGNUM 64                /* Contains processor status *x/ */
+/* OBSOLETE #define PSW_REGNUM 64               /* Contains current psw, whatever it is.*x/ */
+/* OBSOLETE #define CSP_REGNUM 65               /* address of this control stack frame*x/ */
+/* OBSOLETE #define KSP_REGNUM 66               /* Contains process's Kernel Stack Pointer *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define CFP_REGNUM 13		/* Current data-stack frame ptr *x/ */
-/* OBSOLETE #define TR0_REGNUM 48		/* After function call, contains */
-/* OBSOLETE 				   function result *x/ */
+/* OBSOLETE #define CFP_REGNUM 13               /* Current data-stack frame ptr *x/ */
+/* OBSOLETE #define TR0_REGNUM 48               /* After function call, contains */
+/* OBSOLETE                                function result *x/ */
 /* OBSOLETE  */
 /* OBSOLETE /* Registers interesting to the machine-independent part of gdb*x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define FP_REGNUM CSP_REGNUM	/* Contains address of executing (control) */
-/* OBSOLETE 				   stack frame *x/ */
-/* OBSOLETE #define SP_REGNUM 14		/* Contains address of top of stack -??*x/ */
-/* OBSOLETE #define PC_REGNUM 15		/* Contains program counter *x/ */
+/* OBSOLETE #define FP_REGNUM CSP_REGNUM        /* Contains address of executing (control) */
+/* OBSOLETE                                stack frame *x/ */
+/* OBSOLETE #define SP_REGNUM 14                /* Contains address of top of stack -??*x/ */
+/* OBSOLETE #define PC_REGNUM 15                /* Contains program counter *x/ */
 /* OBSOLETE  */
 /* OBSOLETE /* Define DO_REGISTERS_INFO() to do machine-specific formatting */
 /* OBSOLETE    of register dumps. *x/ */
@@ -179,7 +179,7 @@
 /* OBSOLETE    registers shifting into ins counts) upon subroutine calls and thus */
 /* OBSOLETE    there is no need to search more than one stack frame for it. *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define REGISTER_IN_WINDOW_P(regnum)	\ */
+/* OBSOLETE #define REGISTER_IN_WINDOW_P(regnum)        \ */
 /* OBSOLETE   ((regnum) >= 16 && (regnum) < 64) */
 /* OBSOLETE  */
 /* OBSOLETE /* Index within `registers' of the first byte of the space for */
@@ -250,9 +250,9 @@
 /* OBSOLETE    (its caller).  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define EXTRA_FRAME_INFO \ */
-/* OBSOLETE 	CORE_ADDR bottom;	\ */
-/* OBSOLETE 	CORE_ADDR frame_cfp;	\ */
-/* OBSOLETE 	CORE_ADDR frame_window_addr; */
+/* OBSOLETE     CORE_ADDR bottom;       \ */
+/* OBSOLETE     CORE_ADDR frame_cfp;    \ */
+/* OBSOLETE     CORE_ADDR frame_window_addr; */
 /* OBSOLETE  */
 /* OBSOLETE /* The bottom field is misnamed, since it might imply that memory from */
 /* OBSOLETE    bottom to frame contains this frame.  That need not be true if */
@@ -260,18 +260,18 @@
 /* OBSOLETE    stack, some on a heap in the data segment).  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define INIT_EXTRA_FRAME_INFO(fromleaf, fci)  \ */
-/* OBSOLETE do {								\ */
-/* OBSOLETE   (fci)->frame_window_addr = (fci)->frame;			\ */
-/* OBSOLETE   (fci)->bottom =						\ */
-/* OBSOLETE 	  ((fci)->next ?					\ */
-/* OBSOLETE 	   ((fci)->frame == (fci)->next->frame ?			\ */
-/* OBSOLETE 	    (fci)->next->bottom : (fci)->next->frame) :		\ */
-/* OBSOLETE 	   read_register (SP_REGNUM));				\ */
-/* OBSOLETE   (fci)->frame_cfp =						\ */
-/* OBSOLETE 	  read_register (CFP_REGNUM);				\ */
-/* OBSOLETE   /***fprintf (stderr,						\ */
-/* OBSOLETE 	   "[[creating new frame for %0x,pc=%0x,csp=%0x]]\n",	\ */
-/* OBSOLETE 	   (fci)->frame, (fci)->pc,(fci)->frame_cfp);*x/		\ */
+/* OBSOLETE do {                                                                \ */
+/* OBSOLETE   (fci)->frame_window_addr = (fci)->frame;                  \ */
+/* OBSOLETE   (fci)->bottom =                                           \ */
+/* OBSOLETE       ((fci)->next ?                                        \ */
+/* OBSOLETE        ((fci)->frame == (fci)->next->frame ?                        \ */
+/* OBSOLETE         (fci)->next->bottom : (fci)->next->frame) :         \ */
+/* OBSOLETE        read_register (SP_REGNUM));                          \ */
+/* OBSOLETE   (fci)->frame_cfp =                                                \ */
+/* OBSOLETE       read_register (CFP_REGNUM);                           \ */
+/* OBSOLETE   /***fprintf (stderr,                                              \ */
+/* OBSOLETE        "[[creating new frame for %0x,pc=%0x,csp=%0x]]\n",   \ */
+/* OBSOLETE        (fci)->frame, (fci)->pc,(fci)->frame_cfp);*x/                \ */
 /* OBSOLETE } while (0); */
 /* OBSOLETE  */
 /* OBSOLETE /* FRAME_CHAIN takes a frame's nominal address */
@@ -280,7 +280,7 @@
 /* OBSOLETE /* In the case of the pyr, the frame's nominal address is the address */
 /* OBSOLETE    of parameter register 0.  The previous frame is found 32 words up.   *x/ */
 /* OBSOLETE  */
-/* OBSOLETE #define FRAME_CHAIN(thisframe)	\ */
+/* OBSOLETE #define FRAME_CHAIN(thisframe)      \ */
 /* OBSOLETE   ( (thisframe) -> frame - CONTROL_STACK_FRAME_SIZE) */
 /* OBSOLETE  */
 /* OBSOLETE  /*((thisframe) >= CONTROL_STACK_ADDR))*x/ */
@@ -362,54 +362,54 @@
 /* OBSOLETE    compiler and gcc currently ignore them, so it's not an issue.   *x/  */
 /* OBSOLETE  */
 /* OBSOLETE #define FRAME_FIND_SAVED_REGS(fi_p, frame_saved_regs) \ */
-/* OBSOLETE {  register int regnum;							\ */
-/* OBSOLETE   register CORE_ADDR pc;						\ */
-/* OBSOLETE   register CORE_ADDR fn_start_pc;					\ */
-/* OBSOLETE   register int first_insn;						\ */
-/* OBSOLETE   register CORE_ADDR prev_cf_addr;					\ */
-/* OBSOLETE   register int window_ptr;						\ */
-/* OBSOLETE   if (!fi_p) fatal ("Bad frame info struct in FRAME_FIND_SAVED_REGS");	\ */
-/* OBSOLETE   memset (&(frame_saved_regs), '\0', sizeof (frame_saved_regs));		\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE   window_ptr = prev_cf_addr = FRAME_FP(fi_p);				\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE   for (regnum = 16 ; regnum < 64; regnum++,window_ptr+=4)		\ */
-/* OBSOLETE   {									\ */
-/* OBSOLETE     (frame_saved_regs).regs[regnum] = window_ptr;			\ */
-/* OBSOLETE   }									\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE   /* In each window, psw, and pc are "saved" in tr14,tr15. *x/		\ */
-/* OBSOLETE   /*** psw is sometimes saved in gr12 (so sez <sys/pcb.h>) *x/		\ */
-/* OBSOLETE   (frame_saved_regs).regs[PS_REGNUM] = FRAME_FP(fi_p) + (14*4);  	\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE /*(frame_saved_regs).regs[PC_REGNUM] = (frame_saved_regs).regs[31];*x/	\ */
-/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = FRAME_FP(fi_p) + ((15+32)*4);	\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE   /* Functions that allocate a frame save sp *where*? *x/		\ */
+/* OBSOLETE {  register int regnum;                                                     \ */
+/* OBSOLETE   register CORE_ADDR pc;                                            \ */
+/* OBSOLETE   register CORE_ADDR fn_start_pc;                                   \ */
+/* OBSOLETE   register int first_insn;                                          \ */
+/* OBSOLETE   register CORE_ADDR prev_cf_addr;                                  \ */
+/* OBSOLETE   register int window_ptr;                                          \ */
+/* OBSOLETE   if (!fi_p) fatal ("Bad frame info struct in FRAME_FIND_SAVED_REGS");      \ */
+/* OBSOLETE   memset (&(frame_saved_regs), '\0', sizeof (frame_saved_regs));            \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE   window_ptr = prev_cf_addr = FRAME_FP(fi_p);                               \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE   for (regnum = 16 ; regnum < 64; regnum++,window_ptr+=4)           \ */
+/* OBSOLETE   {                                                                 \ */
+/* OBSOLETE     (frame_saved_regs).regs[regnum] = window_ptr;                   \ */
+/* OBSOLETE   }                                                                 \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE   /* In each window, psw, and pc are "saved" in tr14,tr15. *x/              \ */
+/* OBSOLETE   /*** psw is sometimes saved in gr12 (so sez <sys/pcb.h>) *x/              \ */
+/* OBSOLETE   (frame_saved_regs).regs[PS_REGNUM] = FRAME_FP(fi_p) + (14*4);     \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE /*(frame_saved_regs).regs[PC_REGNUM] = (frame_saved_regs).regs[31];*x/      \ */
+/* OBSOLETE   (frame_saved_regs).regs[PC_REGNUM] = FRAME_FP(fi_p) + ((15+32)*4);        \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE   /* Functions that allocate a frame save sp *where*? *x/           \ */
 /* OBSOLETE /*first_insn = read_memory_integer (get_pc_function_start ((fi_p)->pc),4); *x/ \ */
-/* OBSOLETE 									\ */
-/* OBSOLETE   fn_start_pc = (get_pc_function_start ((fi_p)->pc));			\ */
-/* OBSOLETE   first_insn = read_memory_integer(fn_start_pc, 4);			\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE   if (0x08 == ((first_insn >> 20) &0x0ff)) {				\ */
-/* OBSOLETE     /* NB: because WINDOW_REGISTER_P(cfp) is false, a saved cfp		\ */
-/* OBSOLETE        in this frame is only visible in this frame's callers.		\ */
-/* OBSOLETE        That means the cfp we mark saved is my caller's cfp, ie pr13.	\ */
-/* OBSOLETE        I don't understand why we don't have to do that for pc, too.  *x/	\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE     (frame_saved_regs).regs[CFP_REGNUM] = FRAME_FP(fi_p)+(13*4);	\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE     (frame_saved_regs).regs[SP_REGNUM] =				\ */
-/* OBSOLETE 	  read_memory_integer (FRAME_FP(fi_p)+((13+32)*4),4);		\ */
-/* OBSOLETE   }									\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE /*									\ */
-/* OBSOLETE  *(frame_saved_regs).regs[CFP_REGNUM] = (frame_saved_regs).regs[61];	\ */
-/* OBSOLETE  * (frame_saved_regs).regs[SP_REGNUM] =					\ */
-/* OBSOLETE  *	  read_memory_integer (FRAME_FP(fi_p)+((13+32)*4),4);		\ */
-/* OBSOLETE  *x/									\ */
-/* OBSOLETE 									\ */
-/* OBSOLETE   (frame_saved_regs).regs[CSP_REGNUM] = prev_cf_addr;			\ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE   fn_start_pc = (get_pc_function_start ((fi_p)->pc));                       \ */
+/* OBSOLETE   first_insn = read_memory_integer(fn_start_pc, 4);                 \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE   if (0x08 == ((first_insn >> 20) &0x0ff)) {                                \ */
+/* OBSOLETE     /* NB: because WINDOW_REGISTER_P(cfp) is false, a saved cfp             \ */
+/* OBSOLETE        in this frame is only visible in this frame's callers.               \ */
+/* OBSOLETE        That means the cfp we mark saved is my caller's cfp, ie pr13.        \ */
+/* OBSOLETE        I don't understand why we don't have to do that for pc, too.  *x/    \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE     (frame_saved_regs).regs[CFP_REGNUM] = FRAME_FP(fi_p)+(13*4);    \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE     (frame_saved_regs).regs[SP_REGNUM] =                            \ */
+/* OBSOLETE       read_memory_integer (FRAME_FP(fi_p)+((13+32)*4),4);           \ */
+/* OBSOLETE   }                                                                 \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE /*                                                                  \ */
+/* OBSOLETE  *(frame_saved_regs).regs[CFP_REGNUM] = (frame_saved_regs).regs[61];        \ */
+/* OBSOLETE  * (frame_saved_regs).regs[SP_REGNUM] =                                     \ */
+/* OBSOLETE  *    read_memory_integer (FRAME_FP(fi_p)+((13+32)*4),4);           \ */
+/* OBSOLETE  *x/                                                                        \ */
+/* OBSOLETE                                                                     \ */
+/* OBSOLETE   (frame_saved_regs).regs[CSP_REGNUM] = prev_cf_addr;                       \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* Things needed for making the inferior call functions.  *x/ */
@@ -425,41 +425,41 @@
 /* OBSOLETE  */
 /* OBSOLETE #define PUSH_DUMMY_FRAME \ */
 /* OBSOLETE { register CORE_ADDR sp = read_register (SP_REGNUM);\ */
-/* OBSOLETE   register int regnum;				    \ */
-/* OBSOLETE   sp = push_word (sp, 0); /* arglist *x/		    \ */
-/* OBSOLETE   for (regnum = 11; regnum >= 0; regnum--)	    \ */
+/* OBSOLETE   register int regnum;                                  \ */
+/* OBSOLETE   sp = push_word (sp, 0); /* arglist *x/                \ */
+/* OBSOLETE   for (regnum = 11; regnum >= 0; regnum--)      \ */
 /* OBSOLETE     sp = push_word (sp, read_register (regnum));    \ */
 /* OBSOLETE   sp = push_word (sp, read_register (PC_REGNUM));   \ */
 /* OBSOLETE   sp = push_word (sp, read_register (FP_REGNUM));   \ */
 /* OBSOLETE /*  sp = push_word (sp, read_register (AP_REGNUM));*x/   \ */
 /* OBSOLETE   sp = push_word (sp, (read_register (PS_REGNUM) & 0xffef)   \ */
-/* OBSOLETE 		      + 0x2fff0000);		    \ */
-/* OBSOLETE   sp = push_word (sp, 0); 			    \ */
-/* OBSOLETE   write_register (SP_REGNUM, sp);		    \ */
-/* OBSOLETE   write_register (FP_REGNUM, sp);		    \ */
+/* OBSOLETE                   + 0x2fff0000);                \ */
+/* OBSOLETE   sp = push_word (sp, 0);                       \ */
+/* OBSOLETE   write_register (SP_REGNUM, sp);               \ */
+/* OBSOLETE   write_register (FP_REGNUM, sp);               \ */
 /* OBSOLETE /*  write_register (AP_REGNUM, sp + 17 * sizeof (int));*x/ } */
 /* OBSOLETE  */
 /* OBSOLETE /* Discard from the stack the innermost frame, restoring all registers.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define POP_FRAME  \ */
-/* OBSOLETE { register CORE_ADDR fp = read_register (FP_REGNUM);		 \ */
-/* OBSOLETE   register int regnum;						 \ */
-/* OBSOLETE   register int regmask = read_memory_integer (fp + 4, 4);	 \ */
-/* OBSOLETE   write_register (PS_REGNUM, 					 \ */
-/* OBSOLETE 		  (regmask & 0xffff)				 \ */
-/* OBSOLETE 		  | (read_register (PS_REGNUM) & 0xffff0000));	 \ */
+/* OBSOLETE { register CORE_ADDR fp = read_register (FP_REGNUM);                 \ */
+/* OBSOLETE   register int regnum;                                               \ */
+/* OBSOLETE   register int regmask = read_memory_integer (fp + 4, 4);    \ */
+/* OBSOLETE   write_register (PS_REGNUM,                                         \ */
+/* OBSOLETE               (regmask & 0xffff)                             \ */
+/* OBSOLETE               | (read_register (PS_REGNUM) & 0xffff0000));   \ */
 /* OBSOLETE   write_register (PC_REGNUM, read_memory_integer (fp + 16, 4));  \ */
 /* OBSOLETE   write_register (FP_REGNUM, read_memory_integer (fp + 12, 4));  \ */
 /* OBSOLETE /*  write_register (AP_REGNUM, read_memory_integer (fp + 8, 4));*x/   \ */
-/* OBSOLETE   fp += 16;							 \ */
-/* OBSOLETE   for (regnum = 0; regnum < 12; regnum++)			 \ */
-/* OBSOLETE     if (regmask & (0x10000 << regnum))				 \ */
+/* OBSOLETE   fp += 16;                                                  \ */
+/* OBSOLETE   for (regnum = 0; regnum < 12; regnum++)                    \ */
+/* OBSOLETE     if (regmask & (0x10000 << regnum))                               \ */
 /* OBSOLETE       write_register (regnum, read_memory_integer (fp += 4, 4)); \ */
-/* OBSOLETE   fp = fp + 4 + ((regmask >> 30) & 3);				 \ */
-/* OBSOLETE   if (regmask & 0x20000000)					 \ */
-/* OBSOLETE     { regnum = read_memory_integer (fp, 4);			 \ */
-/* OBSOLETE       fp += (regnum + 1) * 4; }					 \ */
-/* OBSOLETE   write_register (SP_REGNUM, fp);				 \ */
+/* OBSOLETE   fp = fp + 4 + ((regmask >> 30) & 3);                               \ */
+/* OBSOLETE   if (regmask & 0x20000000)                                  \ */
+/* OBSOLETE     { regnum = read_memory_integer (fp, 4);                  \ */
+/* OBSOLETE       fp += (regnum + 1) * 4; }                                      \ */
+/* OBSOLETE   write_register (SP_REGNUM, fp);                            \ */
 /* OBSOLETE   set_current_frame (read_register (FP_REGNUM)); } */
 /* OBSOLETE  */
 /* OBSOLETE /* This sequence of words is the instructions */
@@ -475,7 +475,7 @@
 /* OBSOLETE    into a call sequence of the above form stored at DUMMYNAME.  *x/ */
 /* OBSOLETE  */
 /* OBSOLETE #define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p)   \ */
-/* OBSOLETE { *((char *) dummyname + 1) = nargs;		\ */
+/* OBSOLETE { *((char *) dummyname + 1) = nargs;                \ */
 /* OBSOLETE   *(int *)((char *) dummyname + 3) = fun; } */
 /* OBSOLETE #endif /* 0 *x/ */
 /* OBSOLETE  */
diff --git a/gdb/config/pyr/xm-pyr.h b/gdb/config/pyr/xm-pyr.h
index d10afc5c7e8..9fb56b87743 100644
--- a/gdb/config/pyr/xm-pyr.h
+++ b/gdb/config/pyr/xm-pyr.h
@@ -61,31 +61,31 @@
 /* OBSOLETE #define KERNEL_U_ADDR (0x80000000 - (UPAGES * NBPG)) */
 /* OBSOLETE  */
 /* OBSOLETE /* Define offsets of registers in the core file (or maybe u area) *x/ */
-/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno)	\ */
-/* OBSOLETE { struct user __u;					\ */
-/* OBSOLETE   addr = blockend  + (regno - 16 ) * 4;			\ */
-/* OBSOLETE   if (regno == 67) {   					\ */
-/* OBSOLETE       printf("\\geting reg 67\\");			\ */
-/* OBSOLETE       addr = (int)(&__u.u_pcb.pcb_csp) - (int) &__u;	\ */
-/* OBSOLETE   } else if (regno == KSP_REGNUM) {			\ */
-/* OBSOLETE       printf("\\geting KSP (reg %d)\\", KSP_REGNUM);	\ */
-/* OBSOLETE       addr = (int)(&__u.u_pcb.pcb_ksp) - (int) &__u;	\ */
-/* OBSOLETE   } else if (regno == CSP_REGNUM) {			\ */
-/* OBSOLETE       printf("\\geting CSP (reg %d\\",CSP_REGNUM);	\ */
-/* OBSOLETE       addr = (int)(&__u.u_pcb.pcb_csp) - (int) &__u;	\ */
-/* OBSOLETE   } else if (regno == 64) {				\ */
-/* OBSOLETE       printf("\\geting reg 64\\");			\ */
-/* OBSOLETE       addr = (int)(&__u.u_pcb.pcb_csp) - (int) &__u;	\ */
-/* OBSOLETE    } else if (regno == PS_REGNUM)			\ */
-/* OBSOLETE       addr = blockend - 4;				\ */
-/* OBSOLETE   else if (1 && ((16 > regno) && (regno > 11)))		\ */
-/* OBSOLETE       addr = last_frame_offset + (4 *(regno+32));	\ */
-/* OBSOLETE   else if (0 && (12 > regno)) 				\ */
-/* OBSOLETE       addr = global_reg_offset + (4 *regno);		\ */
-/* OBSOLETE   else if (16 > regno)	 				\ */
-/* OBSOLETE       addr = global_reg_offset + (4 *regno);		\ */
-/* OBSOLETE  else							\ */
-/* OBSOLETE       addr = blockend  + (regno - 16 ) * 4;		\ */
+/* OBSOLETE #define REGISTER_U_ADDR(addr, blockend, regno)      \ */
+/* OBSOLETE { struct user __u;                                  \ */
+/* OBSOLETE   addr = blockend  + (regno - 16 ) * 4;                     \ */
+/* OBSOLETE   if (regno == 67) {                                        \ */
+/* OBSOLETE       printf("\\geting reg 67\\");                  \ */
+/* OBSOLETE       addr = (int)(&__u.u_pcb.pcb_csp) - (int) &__u;        \ */
+/* OBSOLETE   } else if (regno == KSP_REGNUM) {                 \ */
+/* OBSOLETE       printf("\\geting KSP (reg %d)\\", KSP_REGNUM);        \ */
+/* OBSOLETE       addr = (int)(&__u.u_pcb.pcb_ksp) - (int) &__u;        \ */
+/* OBSOLETE   } else if (regno == CSP_REGNUM) {                 \ */
+/* OBSOLETE       printf("\\geting CSP (reg %d\\",CSP_REGNUM);  \ */
+/* OBSOLETE       addr = (int)(&__u.u_pcb.pcb_csp) - (int) &__u;        \ */
+/* OBSOLETE   } else if (regno == 64) {                         \ */
+/* OBSOLETE       printf("\\geting reg 64\\");                  \ */
+/* OBSOLETE       addr = (int)(&__u.u_pcb.pcb_csp) - (int) &__u;        \ */
+/* OBSOLETE    } else if (regno == PS_REGNUM)                   \ */
+/* OBSOLETE       addr = blockend - 4;                          \ */
+/* OBSOLETE   else if (1 && ((16 > regno) && (regno > 11)))             \ */
+/* OBSOLETE       addr = last_frame_offset + (4 *(regno+32));   \ */
+/* OBSOLETE   else if (0 && (12 > regno))                               \ */
+/* OBSOLETE       addr = global_reg_offset + (4 *regno);                \ */
+/* OBSOLETE   else if (16 > regno)                                      \ */
+/* OBSOLETE       addr = global_reg_offset + (4 *regno);                \ */
+/* OBSOLETE  else                                                       \ */
+/* OBSOLETE       addr = blockend  + (regno - 16 ) * 4;         \ */
 /* OBSOLETE } */
 /* OBSOLETE  */
 /* OBSOLETE /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  *x/ */
diff --git a/gdb/config/romp/xm-rtbsd.h b/gdb/config/romp/xm-rtbsd.h
index d99b57f44ae..5781d752856 100644
--- a/gdb/config/romp/xm-rtbsd.h
+++ b/gdb/config/romp/xm-rtbsd.h
@@ -2,21 +2,22 @@
    Copyright 1986, 1987, 1989, 1991, 1992  Free Software Foundation, Inc.
    Contributed by David Wood @ New York University (wood@lab.ultra.nyu.edu).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This machine is most significant byte first */
 #define HOST_BYTE_ORDER BIG_ENDIAN
@@ -30,11 +31,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
  * do remote debugging.  I know there is a gdb for the RT, but there wasn't
  * an xconfig/rt* file.  
  */
-#define KERNEL_U_ADDR_BSD  /* This may be correct, but hasn't been tested */
+#define KERNEL_U_ADDR_BSD	/* This may be correct, but hasn't been tested */
 #define REGISTER_U_ADDR(a,b,c)	   \
 	(printf("GDB can not debug IBM RT/PC BSD executables (yet)\n"),\
 	quit(),0)
 #else
-# include	"GDB for the RT is not included in the distribution" 
+#include	"GDB for the RT is not included in the distribution"
 #endif
-
diff --git a/gdb/config/rs6000/nm-rs6000.h b/gdb/config/rs6000/nm-rs6000.h
index cf0d53dde35..1d6f970c760 100644
--- a/gdb/config/rs6000/nm-rs6000.h
+++ b/gdb/config/rs6000/nm-rs6000.h
@@ -1,21 +1,22 @@
 /* IBM RS/6000 native-dependent macros for GDB, the GNU debugger.
    Copyright 1986, 1987, 1989, 1991, 1992, 1994 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.  */
+   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.  */
 
 /* Do implement the attach and detach commands.  */
 
diff --git a/gdb/config/rs6000/nm-rs6000ly.h b/gdb/config/rs6000/nm-rs6000ly.h
index 4159822e20c..7bc1267d266 100644
--- a/gdb/config/rs6000/nm-rs6000ly.h
+++ b/gdb/config/rs6000/nm-rs6000ly.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for RS6000 running LynxOS.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_RS6000LYNX_H
 #define NM_RS6000LYNX_H
diff --git a/gdb/config/rs6000/tm-rs6000-aix4.h b/gdb/config/rs6000/tm-rs6000-aix4.h
index c7889e4ceb8..243befe7d6f 100644
--- a/gdb/config/rs6000/tm-rs6000-aix4.h
+++ b/gdb/config/rs6000/tm-rs6000-aix4.h
@@ -1,21 +1,22 @@
 /* Macro definitions for RS/6000 running AIX4.
    Copyright 1995, 1997 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_RS6000_AIX4_H
 #define TM_RS6000_AIX4_H
diff --git a/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h
index 34fe391d849..d45fe9bd3f9 100644
--- a/gdb/config/rs6000/tm-rs6000.h
+++ b/gdb/config/rs6000/tm-rs6000.h
@@ -3,23 +3,24 @@
    Free Software Foundation, Inc.
    Contributed by IBM Corporation.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
-#ifdef __STDC__		/* Forward decls for prototypes */
+#ifdef __STDC__			/* Forward decls for prototypes */
 struct frame_info;
 struct type;
 struct value;
@@ -52,33 +53,36 @@ extern int inferior_pid;
 
 /* We are missing register descriptions in the system header files. Sigh! */
 
-struct regs {
-	int	gregs [32];		/* general purpose registers */
-	int	pc;			/* program conter	*/
-	int	ps;			/* processor status, or machine state */
-};
+struct regs
+  {
+    int gregs[32];		/* general purpose registers */
+    int pc;			/* program conter       */
+    int ps;			/* processor status, or machine state */
+  };
 
-struct fp_status {
-	double	fpregs [32];		/* floating GP registers */
-};
+struct fp_status
+  {
+    double fpregs[32];		/* floating GP registers */
+  };
 
 
 /* To be used by skip_prologue. */
 
-struct rs6000_framedata {
-  int	offset;				/* total size of frame --- the distance
-					   by which we decrement sp to allocate
-					   the frame */
-  int	saved_gpr;			/* smallest # of saved gpr */
-  int	saved_fpr;			/* smallest # of saved fpr */
-  int	alloca_reg;			/* alloca register number (frame ptr) */
-  char	frameless;			/* true if frameless functions. */
-  char	nosavedpc;			/* true if pc not saved. */
-  int	gpr_offset;			/* offset of saved gprs from prev sp */
-  int	fpr_offset;			/* offset of saved fprs from prev sp */
-  int	lr_offset;			/* offset of saved lr */
-  int	cr_offset;			/* offset of saved cr */
-};
+struct rs6000_framedata
+  {
+    int offset;			/* total size of frame --- the distance
+				   by which we decrement sp to allocate
+				   the frame */
+    int saved_gpr;		/* smallest # of saved gpr */
+    int saved_fpr;		/* smallest # of saved fpr */
+    int alloca_reg;		/* alloca register number (frame ptr) */
+    char frameless;		/* true if frameless functions. */
+    char nosavedpc;		/* true if pc not saved. */
+    int gpr_offset;		/* offset of saved gprs from prev sp */
+    int fpr_offset;		/* offset of saved fprs from prev sp */
+    int lr_offset;		/* offset of saved lr */
+    int cr_offset;		/* offset of saved cr */
+  };
 
 /* Define the byte order of the machine.  */
 
@@ -100,7 +104,7 @@ struct rs6000_framedata {
 extern CORE_ADDR rs6000_skip_prologue PARAMS ((CORE_ADDR));
 #define SKIP_PROLOGUE(pc) (rs6000_skip_prologue (pc))
 
-extern CORE_ADDR skip_prologue PARAMS((CORE_ADDR, struct rs6000_framedata *));
+extern CORE_ADDR skip_prologue PARAMS ((CORE_ADDR, struct rs6000_framedata *));
 
 
 /* If PC is in some function-call trampoline code, return the PC
@@ -134,7 +138,7 @@ extern CORE_ADDR skip_trampoline_code PARAMS ((CORE_ADDR));
 
 #define	PROCESS_LINENUMBER_HOOK()	aix_process_linenos ()
 extern void aix_process_linenos PARAMS ((void));
-   
+
 /* Immediately after a function call, return the saved pc.
    Can't go through the frames for this because on some machines
    the new frame is not set up until the new function executes
@@ -198,13 +202,13 @@ extern char *rs6000_register_name (int reg);
 #define FP0_REGNUM 32		/* Floating point register 0 */
 #define	GP0_REGNUM 0		/* GPR register 0 */
 #define FP0_REGNUM 32		/* FPR (Floating point) register 0 */
-#define FPLAST_REGNUM 63	/* Last floating point register */  
+#define FPLAST_REGNUM 63	/* Last floating point register */
 
 /* Special purpose registers... */
 /* P.S. keep these in the same order as in /usr/mstsave.h `mstsave'
    structure, for easier processing */
 
-#define PC_REGNUM 64		/* Program counter (instruction address %iar)*/
+#define PC_REGNUM 64		/* Program counter (instruction address %iar) */
 #define PS_REGNUM 65		/* Processor (or machine) status (%msr) */
 #define	CR_REGNUM 66		/* Condition register */
 #define	LR_REGNUM 67		/* Link register */
@@ -223,11 +227,11 @@ extern char *rs6000_register_name (int reg);
 
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.
-	     32 4-byte gpr's
-	     32 8-byte fpr's
-	     7  4-byte UISA special purpose registers, 
-	     16 4-byte segment registers,
-	     32 4-byte standard OEA special-purpose registers,
+   32 4-byte gpr's
+   32 8-byte fpr's
+   7  4-byte UISA special purpose registers, 
+   16 4-byte segment registers,
+   32 4-byte standard OEA special-purpose registers,
    and up to 64 4-byte non-standard OEA special purpose regs.
    total: (+ (* 32 4) (* 32 8) (* 7 4) (* 16 4) (* 32 4) (* 64 4)) 860 bytes
    Keep some extra space for now, in case to add more. */
@@ -327,11 +331,11 @@ extern CORE_ADDR rs6000_struct_return_address;
    into VALBUF.  */
 
 /* #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
-  memcpy (VALBUF, REGBUF, TYPE_LENGTH (TYPE)) */
+   memcpy (VALBUF, REGBUF, TYPE_LENGTH (TYPE)) */
 
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
   extract_return_value(TYPE,REGBUF,VALBUF)
-extern void extract_return_value PARAMS ((struct type *, char [], char *));
+extern void extract_return_value PARAMS ((struct type *, char[], char *));
 
 /* Write into appropriate registers a function return value
    of type TYPE, given in virtual format.  */
@@ -380,12 +384,12 @@ CORE_ADDR rs6000_frame_chain PARAMS ((struct frame_info *));
 #define FRAMELESS_FUNCTION_INVOCATION(FI) \
   (frameless_function_invocation (FI))
 
-extern int frameless_function_invocation PARAMS((struct frame_info *));
+extern int frameless_function_invocation PARAMS ((struct frame_info *));
 
 #define INIT_FRAME_PC_FIRST(fromleaf, prev) \
   prev->pc = (fromleaf ? SAVED_PC_AFTER_CALL (prev->next) : \
 	      prev->next ? FRAME_SAVED_PC (prev->next) : read_pc ());
-#define INIT_FRAME_PC(fromleaf, prev) /* nothing */
+#define INIT_FRAME_PC(fromleaf, prev)	/* nothing */
 extern void rs6000_init_extra_frame_info (int fromleaf, struct frame_info *);
 #define	INIT_EXTRA_FRAME_INFO(fromleaf, fi) rs6000_init_extra_frame_info (fromleaf, fi)
 
@@ -454,39 +458,39 @@ extern void pop_frame PARAMS ((void));
 
 /* This sequence of words is the instructions:
 
-	mflr	r0		// 0x7c0802a6
-				// save fpr's
-	stfd	r?, num(r1)	// 0xd8010000 there should be 32 of this??
-				// save gpr's
-	stm	r0, num(r1)	// 0xbc010000
-	stu	r1, num(r1)	// 0x94210000
-
-	// the function we want to branch might be in a different load 
-	// segment. reset the toc register. Note that the actual toc address
-	// will be fix by fix_call_dummy () along with function address.
-
-	st	r2, 0x14(r1)	// 0x90410014 save toc register
-	liu	r2, 0x1234	// 0x3c401234 reset a new toc value 0x12345678
-	oril	r2, r2,0x5678   // 0x60425678	
-
-				// load absolute address 0x12345678 to r0
-	liu	r0, 0x1234	// 0x3c001234
-	oril	r0, r0,0x5678	// 0x60005678
-	mtctr	r0		// 0x7c0903a6 ctr <- r0
-	bctrl			// 0x4e800421 jump subroutine 0x12345678 (%ctr)
-	cror	0xf, 0xf, 0xf	// 0x4def7b82
-	brpt			// 0x7d821008, breakpoint
-	cror	0xf, 0xf, 0xf	// 0x4def7b82 (for 8 byte alignment)
-
-
-  We actually start executing by saving the toc register first, since the pushing 
-  of the registers is done by PUSH_DUMMY_FRAME.  If this were real code,
-  the arguments for the function called by the `bctrl' would be pushed
-  between the `stu' and the `bctrl', and we could allow it to execute through.
-  But the arguments have to be pushed by GDB after the PUSH_DUMMY_FRAME is done,
-  and we cannot allow to push the registers again.
-*/
-	
+   mflr r0              // 0x7c0802a6
+   // save fpr's
+   stfd r?, num(r1)     // 0xd8010000 there should be 32 of this??
+   // save gpr's
+   stm  r0, num(r1)     // 0xbc010000
+   stu  r1, num(r1)     // 0x94210000
+
+   // the function we want to branch might be in a different load 
+   // segment. reset the toc register. Note that the actual toc address
+   // will be fix by fix_call_dummy () along with function address.
+
+   st   r2, 0x14(r1)    // 0x90410014 save toc register
+   liu  r2, 0x1234      // 0x3c401234 reset a new toc value 0x12345678
+   oril r2, r2,0x5678   // 0x60425678   
+
+   // load absolute address 0x12345678 to r0
+   liu  r0, 0x1234      // 0x3c001234
+   oril r0, r0,0x5678   // 0x60005678
+   mtctr        r0              // 0x7c0903a6 ctr <- r0
+   bctrl                        // 0x4e800421 jump subroutine 0x12345678 (%ctr)
+   cror 0xf, 0xf, 0xf   // 0x4def7b82
+   brpt                 // 0x7d821008, breakpoint
+   cror 0xf, 0xf, 0xf   // 0x4def7b82 (for 8 byte alignment)
+
+
+   We actually start executing by saving the toc register first, since the pushing 
+   of the registers is done by PUSH_DUMMY_FRAME.  If this were real code,
+   the arguments for the function called by the `bctrl' would be pushed
+   between the `stu' and the `bctrl', and we could allow it to execute through.
+   But the arguments have to be pushed by GDB after the PUSH_DUMMY_FRAME is done,
+   and we cannot allow to push the registers again.
+ */
+
 #define CALL_DUMMY {0x7c0802a6, 0xd8010000, 0xbc010000, 0x94210000, \
 		    0x90410014, 0x3c401234, 0x60425678,		    \
 		    0x3c001234, 0x60005678, 0x7c0903a6, 0x4e800421, \
@@ -509,16 +513,17 @@ extern void rs6000_fix_call_dummy PARAMS ((char *, CORE_ADDR, CORE_ADDR,
 
 /* Hook in rs6000-tdep.c for determining the TOC address when
    calling functions in the inferior.  */
-extern CORE_ADDR (*find_toc_address_hook) PARAMS ((CORE_ADDR));
+extern
+CORE_ADDR (*find_toc_address_hook) PARAMS ((CORE_ADDR));
 
 /* xcoffread.c provides a function to determine the TOC offset
    for a given object file.
    It is used under native AIX configurations for determining the
    TOC address when calling functions in the inferior.  */
 #ifdef __STDC__
-struct objfile;
+     struct objfile;
 #endif
-extern CORE_ADDR get_toc_offset PARAMS ((struct objfile *));
+     extern CORE_ADDR get_toc_offset PARAMS ((struct objfile *));
 
 /* Usually a function pointer's representation is simply the address
    of the function. On the RS/6000 however, a function pointer is
@@ -536,7 +541,7 @@ extern CORE_ADDR get_toc_offset PARAMS ((struct objfile *));
 
 #define CONVERT_FROM_FUNC_PTR_ADDR(ADDR) \
   (is_magic_function_pointer (ADDR) ? read_memory_integer (ADDR, 4) : (ADDR))
-extern int is_magic_function_pointer PARAMS ((CORE_ADDR));
+     extern int is_magic_function_pointer PARAMS ((CORE_ADDR));
 
 /* Flag for machine-specific stuff in shared files.  FIXME */
 #define IBM6000_TARGET
@@ -544,7 +549,7 @@ extern int is_magic_function_pointer PARAMS ((CORE_ADDR));
 /* RS6000/AIX does not support PT_STEP.  Has to be simulated.  */
 
 #define SOFTWARE_SINGLE_STEP_P 1
-extern void rs6000_software_single_step PARAMS ((unsigned int, int));
+     extern void rs6000_software_single_step PARAMS ((unsigned int, int));
 #define SOFTWARE_SINGLE_STEP(sig,bp_p) rs6000_software_single_step (sig, bp_p)
 
 /* If the current gcc for for this target does not produce correct debugging
diff --git a/gdb/config/rs6000/tm-rs6000ly.h b/gdb/config/rs6000/tm-rs6000ly.h
index 0946b0f476a..ce555139c85 100644
--- a/gdb/config/rs6000/tm-rs6000ly.h
+++ b/gdb/config/rs6000/tm-rs6000ly.h
@@ -1,21 +1,22 @@
 /* Macro definitions for RS6000 running under LynxOS.
    Copyright 1993 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.  */
+   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.  */
 
 #ifndef TM_RS6000LYNX_H
 #define TM_RS6000LYNX_H
diff --git a/gdb/config/rs6000/xm-aix4.h b/gdb/config/rs6000/xm-aix4.h
index 1bc5cae9326..c0a6f8fa59c 100644
--- a/gdb/config/rs6000/xm-aix4.h
+++ b/gdb/config/rs6000/xm-aix4.h
@@ -2,25 +2,25 @@
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
    Contributed by IBM Corporation.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "xm-aix4.h"
 
 /* AIX 4.x uses nonstandard "int *" as type of third argument to ptrace() */
 
 #define PTRACE_ARG3_TYPE int*
-
diff --git a/gdb/config/rs6000/xm-rs6000.h b/gdb/config/rs6000/xm-rs6000.h
index 44b8b244e94..9efeaa6f7f5 100644
--- a/gdb/config/rs6000/xm-rs6000.h
+++ b/gdb/config/rs6000/xm-rs6000.h
@@ -2,21 +2,22 @@
    Copyright 1986-87, 1989, 1991-96, 1998 Free Software Foundation, Inc.
    Contributed by IBM Corporation.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* The following text is taken from config/rs6000.mh:
  * # The IBM version of /usr/include/rpc/rpc.h has a bug -- it says
@@ -104,4 +105,3 @@ aix_resizewindow (signo)			\
 /* setpgrp() messes up controling terminal. The other version of it
    requires libbsd.a. */
 #define	setpgrp(XX,YY)		setpgid (XX, YY)
-
diff --git a/gdb/config/rs6000/xm-rs6000ly.h b/gdb/config/rs6000/xm-rs6000ly.h
index f75cfab139f..39f7e481f02 100644
--- a/gdb/config/rs6000/xm-rs6000ly.h
+++ b/gdb/config/rs6000/xm-rs6000ly.h
@@ -1,21 +1,22 @@
 /* Host-dependent definitions for RS6000 running LynxOS, for GDB.
    Copyright 1993 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.  */
+   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.  */
 
 #ifndef XM_RS6000LYNX_H
 #define XM_RS6000LYNX_H
diff --git a/gdb/config/sh/tm-sh.h b/gdb/config/sh/tm-sh.h
index 2a94f5858d2..f39f30874a8 100644
--- a/gdb/config/sh/tm-sh.h
+++ b/gdb/config/sh/tm-sh.h
@@ -1,21 +1,22 @@
 /* Target-specific definition for a Hitachi Super-H.
    Copyright (C) 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Contributed by Steve Chamberlain sac@cygnus.com */
 
@@ -62,8 +63,8 @@ extern CORE_ADDR sh_skip_prologue PARAMS ((CORE_ADDR));
 /* Illegal instruction - used by the simulator for breakpoint
    detection */
 
-#define BREAKPOINT {0xc3, 0xc3}  /* 0xc3c3 is trapa #c3, and it works in big
-				    and little endian modes  */
+#define BREAKPOINT {0xc3, 0xc3}	/* 0xc3c3 is trapa #c3, and it works in big
+				   and little endian modes  */
 
 #define BIG_REMOTE_BREAKPOINT    { 0xc3, 0x20 }
 #define LITTLE_REMOTE_BREAKPOINT { 0x20, 0xc3 }
@@ -215,8 +216,8 @@ extern void sh_init_extra_frame_info PARAMS ((int, struct frame_info *));
 
 #define FRAME_ARGS_SKIP 0
 
-extern void sh_frame_find_saved_regs PARAMS ((struct frame_info *fi,
-					      struct frame_saved_regs *fsr));
+extern void sh_frame_find_saved_regs PARAMS ((struct frame_info * fi,
+					    struct frame_saved_regs * fsr));
 
 /* Put here the code to store, into a struct frame_saved_regs,
    the addresses of the saved registers of frame described by FRAME_INFO.
@@ -230,7 +231,7 @@ extern void sh_frame_find_saved_regs PARAMS ((struct frame_info *fi,
 typedef unsigned short INSN_WORD;
 
 extern CORE_ADDR sh_push_arguments PARAMS ((int nargs,
-					    struct value **args,
+					    struct value ** args,
 					    CORE_ADDR sp,
 					    unsigned char struct_return,
 					    CORE_ADDR struct_addr));
@@ -243,7 +244,7 @@ extern CORE_ADDR sh_push_arguments PARAMS ((int nargs,
 #define FIX_CALL_DUMMY(DUMMY, STARTADDR, FUNADDR, NARGS, ARGS, TYPE, GCCP)
 #define CALL_DUMMY_LOCATION          AT_ENTRY_POINT
 #define CALL_DUMMY_ADDRESS()         entry_point_address ()
-extern CORE_ADDR sh_push_return_address   PARAMS ((CORE_ADDR, CORE_ADDR));
+extern CORE_ADDR sh_push_return_address PARAMS ((CORE_ADDR, CORE_ADDR));
 #define PUSH_RETURN_ADDRESS(PC, SP)  sh_push_return_address (PC, SP)
 
 
diff --git a/gdb/config/sparc/nm-linux.h b/gdb/config/sparc/nm-linux.h
index b2b2a917f3e..f6f26bcf8a1 100644
--- a/gdb/config/sparc/nm-linux.h
+++ b/gdb/config/sparc/nm-linux.h
@@ -1,21 +1,22 @@
 /* Macro definitions for running gdb on a Sparc running Linux.
    Copyright (C) 1989, 1992, 1996, 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 <nm-sysv4.h>
 #include "solib.h"
@@ -28,4 +29,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 extern int kernel_u_size PARAMS ((void));
 
 /* Linux is svr4ish but not that much */
-#undef USE_PROC_FS      
+#undef USE_PROC_FS
diff --git a/gdb/config/sparc/nm-nbsd.h b/gdb/config/sparc/nm-nbsd.h
index 016772ae372..7668f9f58e3 100644
--- a/gdb/config/sparc/nm-nbsd.h
+++ b/gdb/config/sparc/nm-nbsd.h
@@ -2,21 +2,22 @@
    Copyright (C) 1986, 1987, 1989, 1992, 1995, 1996
    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.  */
+   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.  */
 
 #ifndef NM_NBSD_H
 #define NM_NBSD_H
diff --git a/gdb/config/sparc/nm-sparclynx.h b/gdb/config/sparc/nm-sparclynx.h
index 24011dca649..d5dd867a0fd 100644
--- a/gdb/config/sparc/nm-sparclynx.h
+++ b/gdb/config/sparc/nm-sparclynx.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Sparc running LynxOS.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef NM_SPARCLYNX_H
 #define NM_SPARCLYNX_H
diff --git a/gdb/config/sparc/nm-sun4os4.h b/gdb/config/sparc/nm-sun4os4.h
index 9da96be5ddc..dcd20fb0fe9 100644
--- a/gdb/config/sparc/nm-sun4os4.h
+++ b/gdb/config/sparc/nm-sun4os4.h
@@ -1,21 +1,22 @@
 /* Macro definitions for running gdb on a Sun 4 running sunos 4.
    Copyright (C) 1989, 1992, 1996 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.  */
+   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.  */
 
 /* Do implement the attach and detach commands.  */
 
diff --git a/gdb/config/sparc/nm-sun4sol2.h b/gdb/config/sparc/nm-sun4sol2.h
index f6833f42a61..a1de6e4e63b 100644
--- a/gdb/config/sparc/nm-sun4sol2.h
+++ b/gdb/config/sparc/nm-sun4sol2.h
@@ -1,21 +1,22 @@
 /* Native-dependent definitions for Sparc running SVR4.
    Copyright 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 the generic SVR4 definitions.  */
 
@@ -37,7 +38,7 @@ struct objfile;
 
 #define target_new_objfile(OBJFILE) sol_thread_new_objfile (OBJFILE)
 
-void sol_thread_new_objfile PARAMS ((struct objfile *objfile));
+void sol_thread_new_objfile PARAMS ((struct objfile * objfile));
 
 #define FIND_NEW_THREADS sol_find_new_threads
 void sol_find_new_threads PARAMS ((void));
diff --git a/gdb/config/sparc/tm-linux.h b/gdb/config/sparc/tm-linux.h
index 2cc708aa080..8822f1dfed0 100644
--- a/gdb/config/sparc/tm-linux.h
+++ b/gdb/config/sparc/tm-linux.h
@@ -1,21 +1,22 @@
 /* Macro definitions for GDB for a Sparc running Linux.
    Copyright 1989, 1992, 1994, 1995, 1998 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.  */
+   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.  */
 
 #ifndef TM_SPARCLINUX_H
 #define TM_SPARCLINUX_H
diff --git a/gdb/config/sparc/tm-nbsd.h b/gdb/config/sparc/tm-nbsd.h
index 1a310844194..b434efe8dbd 100644
--- a/gdb/config/sparc/tm-nbsd.h
+++ b/gdb/config/sparc/tm-nbsd.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Sparc running under NetBSD.
    Copyright 1994 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.  */
+   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.  */
 
 #ifndef TM_NBSD_H
 #define TM_NBSD_H
diff --git a/gdb/config/sparc/tm-sp64.h b/gdb/config/sparc/tm-sp64.h
index 693fa082685..bba364dc697 100644
--- a/gdb/config/sparc/tm-sp64.h
+++ b/gdb/config/sparc/tm-sp64.h
@@ -5,21 +5,22 @@
    Contributed by Doug Evans (dje@cygnus.com).
    Further modified by Bob Manson (manson@cygnus.com).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define GDB_TARGET_IS_SPARC64
 
@@ -69,7 +70,7 @@ struct value;
    ta  1
    nop
    nop
-   */
+ */
 
 #define CALL_DUMMY {		 0x9de3bec0fd3fa7f7LL, 0xf93fa7eff53fa7e7LL,\
 				 0xf13fa7dfed3fa7d7LL, 0xe93fa7cfe53fa7c7LL,\
@@ -156,8 +157,8 @@ struct value;
    to be actual register numbers as far as the user is concerned
    but do serve to get the desired values when passed to read_register.  */
 
-#if 0 /* defined in tm-sparc.h, replicated for doc purposes */
-#define	G0_REGNUM 0             /* %g0 */
+#if 0				/* defined in tm-sparc.h, replicated for doc purposes */
+#define	G0_REGNUM 0		/* %g0 */
 #define	G1_REGNUM 1		/* %g1 */
 #define O0_REGNUM 8		/* %o0 */
 #define	SP_REGNUM 14		/* Contains address of top of stack, \
@@ -188,38 +189,38 @@ struct value;
 
 /* v9 misc. and priv. regs */
 
-#define C0_REGNUM FP_MAX_REGNUM			/* Start of control registers */
-#define PC_REGNUM (C0_REGNUM + 0)		/* Current PC */
-#define NPC_REGNUM (C0_REGNUM + 1)		/* Next PC */
-#define CCR_REGNUM (C0_REGNUM + 2)		/* Condition Code Register (%xcc,%icc) */
-#define FSR_REGNUM (C0_REGNUM + 3)		/* Floating Point State */
-#define FPRS_REGNUM (C0_REGNUM + 4)		/* Floating Point Registers State */
-#define	Y_REGNUM (C0_REGNUM + 5)		/* Temp register for multiplication, etc.  */
-#define ASI_REGNUM (C0_REGNUM + 6)		/* Alternate Space Identifier */
-#define VER_REGNUM (C0_REGNUM + 7)		/* Version register */
-#define TICK_REGNUM (C0_REGNUM + 8)		/* Tick register */
-#define PIL_REGNUM (C0_REGNUM + 9)		/* Processor Interrupt Level */
-#define PSTATE_REGNUM (C0_REGNUM + 10)		/* Processor State */
-#define TSTATE_REGNUM (C0_REGNUM + 11)		/* Trap State */
-#define TBA_REGNUM (C0_REGNUM + 12)		/* Trap Base Address */
-#define TL_REGNUM (C0_REGNUM + 13)		/* Trap Level */
-#define TT_REGNUM (C0_REGNUM + 14)		/* Trap Type */
-#define TPC_REGNUM (C0_REGNUM + 15)		/* Trap pc */
-#define TNPC_REGNUM (C0_REGNUM + 16)		/* Trap npc */
-#define WSTATE_REGNUM (C0_REGNUM + 17)		/* Window State */
-#define CWP_REGNUM (C0_REGNUM + 18)		/* Current Window Pointer */
+#define C0_REGNUM FP_MAX_REGNUM	/* Start of control registers */
+#define PC_REGNUM (C0_REGNUM + 0)	/* Current PC */
+#define NPC_REGNUM (C0_REGNUM + 1)	/* Next PC */
+#define CCR_REGNUM (C0_REGNUM + 2)	/* Condition Code Register (%xcc,%icc) */
+#define FSR_REGNUM (C0_REGNUM + 3)	/* Floating Point State */
+#define FPRS_REGNUM (C0_REGNUM + 4)	/* Floating Point Registers State */
+#define	Y_REGNUM (C0_REGNUM + 5)	/* Temp register for multiplication, etc.  */
+#define ASI_REGNUM (C0_REGNUM + 6)	/* Alternate Space Identifier */
+#define VER_REGNUM (C0_REGNUM + 7)	/* Version register */
+#define TICK_REGNUM (C0_REGNUM + 8)	/* Tick register */
+#define PIL_REGNUM (C0_REGNUM + 9)	/* Processor Interrupt Level */
+#define PSTATE_REGNUM (C0_REGNUM + 10)	/* Processor State */
+#define TSTATE_REGNUM (C0_REGNUM + 11)	/* Trap State */
+#define TBA_REGNUM (C0_REGNUM + 12)	/* Trap Base Address */
+#define TL_REGNUM (C0_REGNUM + 13)	/* Trap Level */
+#define TT_REGNUM (C0_REGNUM + 14)	/* Trap Type */
+#define TPC_REGNUM (C0_REGNUM + 15)	/* Trap pc */
+#define TNPC_REGNUM (C0_REGNUM + 16)	/* Trap npc */
+#define WSTATE_REGNUM (C0_REGNUM + 17)	/* Window State */
+#define CWP_REGNUM (C0_REGNUM + 18)	/* Current Window Pointer */
 #define CANSAVE_REGNUM (C0_REGNUM + 19)		/* Savable Windows */
 #define CANRESTORE_REGNUM (C0_REGNUM + 20)	/* Restorable Windows */
 #define CLEANWIN_REGNUM (C0_REGNUM + 21)	/* Clean Windows */
 #define OTHERWIN_REGNUM (C0_REGNUM + 22)	/* Other Windows */
 #define ASR_REGNUM(n) (C0_REGNUM+(23-16)+(n))	/* Ancillary State Register
 						   (n = 16...31) */
-#define ICC_REGNUM (C0_REGNUM + 39)		/* 32 bit condition codes */
-#define XCC_REGNUM (C0_REGNUM + 40)		/* 64 bit condition codes */
-#define FCC0_REGNUM (C0_REGNUM + 41)		/* fp cc reg 0 */
-#define FCC1_REGNUM (C0_REGNUM + 42)		/* fp cc reg 1 */
-#define FCC2_REGNUM (C0_REGNUM + 43)		/* fp cc reg 2 */
-#define FCC3_REGNUM (C0_REGNUM + 44)		/* fp cc reg 3 */
+#define ICC_REGNUM (C0_REGNUM + 39)	/* 32 bit condition codes */
+#define XCC_REGNUM (C0_REGNUM + 40)	/* 64 bit condition codes */
+#define FCC0_REGNUM (C0_REGNUM + 41)	/* fp cc reg 0 */
+#define FCC1_REGNUM (C0_REGNUM + 42)	/* fp cc reg 1 */
+#define FCC2_REGNUM (C0_REGNUM + 43)	/* fp cc reg 2 */
+#define FCC3_REGNUM (C0_REGNUM + 44)	/* fp cc reg 3 */
 
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.
@@ -375,4 +376,4 @@ CORE_ADDR sp64_push_arguments PARAMS ((int, struct value **, CORE_ADDR, unsigned
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
   sparc64_extract_return_value(TYPE, REGBUF, VALBUF, 0)
 extern void
-sparc64_extract_return_value PARAMS ((struct type *, char [], char *, int));
+sparc64_extract_return_value PARAMS ((struct type *, char[], char *, int));
diff --git a/gdb/config/sparc/tm-sp64sim.h b/gdb/config/sparc/tm-sp64sim.h
index 4545f32b4f4..8d83db1eebf 100644
--- a/gdb/config/sparc/tm-sp64sim.h
+++ b/gdb/config/sparc/tm-sp64sim.h
@@ -1,21 +1,22 @@
 /* Macro definitions for GDB with the SPARC64 Simulator.
    Copyright 1993 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.  */
+   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.  */
 
 /* ??? This file is based on tm-spc-em.h.  Our contents are probably bogus
    but it's a good start.  */
diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h
index f3a9c662d74..ab0ad16e5ff 100644
--- a/gdb/config/sparc/tm-sparc.h
+++ b/gdb/config/sparc/tm-sparc.h
@@ -4,21 +4,22 @@
    Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@mcc.com)
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifdef __STDC__
 struct frame_info;
@@ -158,7 +159,7 @@ extern CORE_ADDR sparc_pc_adjust PARAMS ((CORE_ADDR));
    to be actual register numbers as far as the user is concerned
    but do serve to get the desired values when passed to read_register.  */
 
-#define	G0_REGNUM 0             /* %g0 */
+#define	G0_REGNUM 0		/* %g0 */
 #define	G1_REGNUM 1		/* %g1 */
 #define O0_REGNUM 8		/* %o0 */
 #define	SP_REGNUM 14		/* Contains address of top of stack, \
@@ -178,7 +179,7 @@ extern CORE_ADDR sparc_pc_adjust PARAMS ((CORE_ADDR));
 #define	WIM_REGNUM 66		/* Window Invalid Mask (not really supported) */
 #define	TBR_REGNUM 67		/* Trap Base Register (not really supported) */
 #define	PC_REGNUM 68		/* Contains program counter */
-#define	NPC_REGNUM 69           /* Contains next PC */
+#define	NPC_REGNUM 69		/* Contains next PC */
 #define	FPS_REGNUM 70		/* Floating point status register */
 #define	CPS_REGNUM 71		/* Coprocessor status register */
 
@@ -208,7 +209,7 @@ extern CORE_ADDR sparc_pc_adjust PARAMS ((CORE_ADDR));
 struct frame_info;
 enum lval_type;
 #endif
-void sparc_get_saved_register PARAMS ((char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lvalp));
+void sparc_get_saved_register PARAMS ((char *raw_buffer, int *optimized, CORE_ADDR * addrp, struct frame_info * frame, int regnum, enum lval_type * lvalp));
 #define GET_SAVED_REGISTER(raw_buffer, optimized, addrp, frame, regnum, lval) \
       sparc_get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval)
 
@@ -262,7 +263,7 @@ void sparc_get_saved_register PARAMS ((char *raw_buffer, int *optimized, CORE_AD
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
   sparc_extract_return_value(TYPE, REGBUF, VALBUF)
 extern void
-sparc_extract_return_value PARAMS ((struct type *, char [], char *));
+sparc_extract_return_value PARAMS ((struct type *, char[], char *));
 
 /* Write into appropriate registers a function return value
    of type TYPE, given in virtual format.  */
@@ -278,9 +279,9 @@ extern void sparc_store_return_value PARAMS ((struct type *, char *));
   (sparc_extract_struct_value_address (REGBUF))
 
 extern CORE_ADDR
-sparc_extract_struct_value_address PARAMS ((char [REGISTER_BYTES]));
-
+  sparc_extract_struct_value_address PARAMS ((char[REGISTER_BYTES]));
 
+
 /* Describe the pointer in each stack frame to the previous stack frame
    (its caller).  */
 
@@ -334,11 +335,11 @@ sparc_extract_struct_value_address PARAMS ((char [REGISTER_BYTES]));
   /* time of the register saves.  */ \
   int sp_offset;
 
-#define FRAME_INIT_SAVED_REGS(fp) /*no-op*/
+#define FRAME_INIT_SAVED_REGS(fp)	/*no-op */
 
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fci) \
   sparc_init_extra_frame_info (fromleaf, fci)
-extern void sparc_init_extra_frame_info PARAMS((int, struct frame_info *));
+extern void sparc_init_extra_frame_info PARAMS ((int, struct frame_info *));
 
 #define	PRINT_EXTRA_FRAME_INFO(fi) \
   { \
@@ -352,7 +353,7 @@ extern CORE_ADDR sparc_frame_chain PARAMS ((struct frame_info *));
 
 /* INIT_EXTRA_FRAME_INFO needs the PC to detect flat frames.  */
 
-#define	INIT_FRAME_PC(fromleaf, prev) /* nothing */
+#define	INIT_FRAME_PC(fromleaf, prev)	/* nothing */
 #define INIT_FRAME_PC_FIRST(fromleaf, prev) \
   (prev)->pc = ((fromleaf) ? SAVED_PC_AFTER_CALL ((prev)->next) : \
 	      (prev)->next ? FRAME_SAVED_PC ((prev)->next) : read_pc ());
@@ -473,24 +474,24 @@ void sparc_push_dummy_frame PARAMS ((void)), sparc_pop_frame PARAMS ((void));
    4:   9d e3 80 00     save  %sp, %g0, %sp
    8:   bc 10 00 02     mov  %g2, %fp
    c:   be 10 00 03     mov  %g3, %i7
-  10:   da 03 a0 58     ld  [ %sp + 0x58 ], %o5
-  14:   d8 03 a0 54     ld  [ %sp + 0x54 ], %o4
-  18:   d6 03 a0 50     ld  [ %sp + 0x50 ], %o3
-  1c:   d4 03 a0 4c     ld  [ %sp + 0x4c ], %o2
-  20:   d2 03 a0 48     ld  [ %sp + 0x48 ], %o1
-  24:   40 00 00 00     call  <fun>
-  28:   d0 03 a0 44     ld  [ %sp + 0x44 ], %o0
-  2c:   01 00 00 00     nop 
-  30:   91 d0 20 01     ta  1
-  34:   01 00 00 00     nop
+   10:   da 03 a0 58     ld  [ %sp + 0x58 ], %o5
+   14:   d8 03 a0 54     ld  [ %sp + 0x54 ], %o4
+   18:   d6 03 a0 50     ld  [ %sp + 0x50 ], %o3
+   1c:   d4 03 a0 4c     ld  [ %sp + 0x4c ], %o2
+   20:   d2 03 a0 48     ld  [ %sp + 0x48 ], %o1
+   24:   40 00 00 00     call  <fun>
+   28:   d0 03 a0 44     ld  [ %sp + 0x44 ], %o0
+   2c:   01 00 00 00     nop 
+   30:   91 d0 20 01     ta  1
+   34:   01 00 00 00     nop
 
    NOTES:
-	* the first four instructions are necessary only on the simulator.
-	* this is a multiple of 8 (not only 4) bytes.
-	* the `call' insn is a relative, not an absolute call.
-	* the `nop' at the end is needed to keep the trap from
-	  clobbering things (if NPC pointed to garbage instead).
-*/
+   * the first four instructions are necessary only on the simulator.
+   * this is a multiple of 8 (not only 4) bytes.
+   * the `call' insn is a relative, not an absolute call.
+   * the `nop' at the end is needed to keep the trap from
+   clobbering things (if NPC pointed to garbage instead).
+ */
 
 #define CALL_DUMMY { 0xbc100001, 0x9de38000, 0xbc100002, 0xbe100003,	\
 		     0xda03a058, 0xd803a054, 0xd603a050, 0xd403a04c,	\
@@ -523,7 +524,7 @@ void sparc_push_dummy_frame PARAMS ((void)), sparc_pop_frame PARAMS ((void));
 #define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p) \
  sparc_fix_call_dummy (dummyname, pc, fun, type, gcc_p)
 void sparc_fix_call_dummy PARAMS ((char *dummy, CORE_ADDR pc, CORE_ADDR fun,
-				   struct type *value_type, int using_gcc));
+				   struct type * value_type, int using_gcc));
 
 /* The Sparc returns long doubles on the stack.  */
 
@@ -585,4 +586,4 @@ extern int deferred_stores;
 #define PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) \
   (sparc_push_arguments((nargs), (args), (sp), (struct_return), (struct_addr)))
 extern CORE_ADDR
-sparc_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int, CORE_ADDR));
+  sparc_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int, CORE_ADDR));
diff --git a/gdb/config/sparc/tm-sparclet.h b/gdb/config/sparc/tm-sparclet.h
index bc430830b8b..2cec5128b08 100644
--- a/gdb/config/sparc/tm-sparclet.h
+++ b/gdb/config/sparc/tm-sparclet.h
@@ -1,21 +1,22 @@
 /* Target machine definitions for GDB for an embedded SPARC.
    Copyright 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "sparc/tm-sparc.h"
 
@@ -37,11 +38,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define BIG_BREAKPOINT {0x91, 0xd0, 0x20, 0x01}
 #define LITTLE_BREAKPOINT {0x01, 0x20, 0xd0, 0x91}
 
-#undef  NUM_REGS /* formerly "72" */
+#undef  NUM_REGS		/* formerly "72" */
 /*                WIN  FP   CPU  CCP  ASR  AWR  APSR */
 #define NUM_REGS (32 + 32 + 8  + 8  + 8/*+ 32 + 1*/)
 
-#undef  REGISTER_BYTES /* formerly "(32*4 + 32*4 + 8*4)" */
+#undef  REGISTER_BYTES		/* formerly "(32*4 + 32*4 + 8*4)" */
 #define REGISTER_BYTES (32*4 + 32*4 + 8*4 + 8*4 + 8*4/* + 32*4 + 1*4*/)
 
 /* Initializer for an array of names of registers.
@@ -78,9 +79,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 }
 
 /* Remove FP dependant code which was defined in tm-sparc.h */
-#undef	FP0_REGNUM /* Floating point register 0 */
-#undef	FPS_REGNUM /* Floating point status register */
-#undef 	CPS_REGNUM /* Coprocessor status register */
+#undef	FP0_REGNUM		/* Floating point register 0 */
+#undef	FPS_REGNUM		/* Floating point status register */
+#undef 	CPS_REGNUM		/* Coprocessor status register */
 
 /* sparclet register numbers */
 #define CCSR_REGNUM 72
diff --git a/gdb/config/sparc/tm-sparclite.h b/gdb/config/sparc/tm-sparclite.h
index d841f89c356..e419fe9dff1 100644
--- a/gdb/config/sparc/tm-sparclite.h
+++ b/gdb/config/sparc/tm-sparclite.h
@@ -1,21 +1,22 @@
 /* Macro definitions for GDB for a Fujitsu SPARClite.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_SPARCLITE 1
 
@@ -40,8 +41,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define FRAME_CHAIN_VALID(fp,fi) alternate_frame_chain_valid (fp, fi)
 
-#undef NUM_REGS 
-#define NUM_REGS 80 
+#undef NUM_REGS
+#define NUM_REGS 80
 
 #undef REGISTER_BYTES
 #define REGISTER_BYTES (32*4+32*4+8*4+8*4)
@@ -61,14 +62,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
   "y", "psr", "wim", "tbr", "pc", "npc", "fpsr", "cpsr",        \
   "dia1", "dia2", "dda1", "dda2", "ddv1", "ddv2", "dcr", "dsr" }
 
-#define DIA1_REGNUM 72          /* debug instr address register 1 */
-#define DIA2_REGNUM 73          /* debug instr address register 2 */
-#define DDA1_REGNUM 74          /* debug data address register 1 */
-#define DDA2_REGNUM 75          /* debug data address register 2 */
-#define DDV1_REGNUM 76          /* debug data value register 1 */
-#define DDV2_REGNUM 77          /* debug data value register 2 */
-#define DCR_REGNUM 78           /* debug control register */
-#define DSR_REGNUM 79           /* debug status regsiter */
+#define DIA1_REGNUM 72		/* debug instr address register 1 */
+#define DIA2_REGNUM 73		/* debug instr address register 2 */
+#define DDA1_REGNUM 74		/* debug data address register 1 */
+#define DDA2_REGNUM 75		/* debug data address register 2 */
+#define DDV1_REGNUM 76		/* debug data value register 1 */
+#define DDV2_REGNUM 77		/* debug data value register 2 */
+#define DCR_REGNUM 78		/* debug control register */
+#define DSR_REGNUM 79		/* debug status regsiter */
 
 #define TARGET_HW_BREAK_LIMIT 2
 #define TARGET_HW_WATCH_LIMIT 2
@@ -84,11 +85,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    instruction which caused the watchpoint.  It will be necessary for
    GDB to step over the watchpoint. ***
 
-#define STOPPED_BY_WATCHPOINT(W) \
-  ((W).kind == TARGET_WAITKIND_STOPPED \
+   #define STOPPED_BY_WATCHPOINT(W) \
+   ((W).kind == TARGET_WAITKIND_STOPPED \
    && (W).value.sig == TARGET_SIGNAL_TRAP \
    && ((int) read_register (IPSW_REGNUM) & 0x00100000))
-*/
+ */
 
 /* Use these macros for watchpoint insertion/deletion.  */
 #define target_insert_watchpoint(addr, len, type) sparclite_insert_watchpoint (addr, len, type)
diff --git a/gdb/config/sparc/tm-sparclynx.h b/gdb/config/sparc/tm-sparclynx.h
index 5a0d908c658..36924df371f 100644
--- a/gdb/config/sparc/tm-sparclynx.h
+++ b/gdb/config/sparc/tm-sparclynx.h
@@ -1,21 +1,22 @@
 /* Macro definitions for Sparc running under LynxOS.
    Copyright 1993 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.  */
+   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.  */
 
 #ifndef TM_SPARCLYNX_H
 #define TM_SPARCLYNX_H
diff --git a/gdb/config/sparc/tm-spc-em.h b/gdb/config/sparc/tm-spc-em.h
index 3a9b4572c53..2391f83f215 100644
--- a/gdb/config/sparc/tm-spc-em.h
+++ b/gdb/config/sparc/tm-spc-em.h
@@ -1,21 +1,22 @@
 /* Target machine definitions for GDB for an embedded SPARC.
    Copyright 1989, 1992, 1993 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.  */
+   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 "sparc/tm-sparc.h"
 
diff --git a/gdb/config/sparc/tm-sun4os4.h b/gdb/config/sparc/tm-sun4os4.h
index 985e18c45a9..5acc70fc845 100644
--- a/gdb/config/sparc/tm-sun4os4.h
+++ b/gdb/config/sparc/tm-sun4os4.h
@@ -1,21 +1,22 @@
 /* Macro definitions for GDB for a Sun 4 running sunos 4.
    Copyright 1989, 1992, 1994, 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.  */
+   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 "sparc/tm-sparc.h"
 #include "tm-sunos.h"
diff --git a/gdb/config/sparc/tm-sun4sol2.h b/gdb/config/sparc/tm-sun4sol2.h
index 7bab6e6778a..74c2d4ec21b 100644
--- a/gdb/config/sparc/tm-sun4sol2.h
+++ b/gdb/config/sparc/tm-sun4sol2.h
@@ -2,37 +2,38 @@
    Copyright 1989, 1992, 1993, 1994, 1995, 1997, 1998
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "sparc/tm-sparc.h"
 #include "tm-sysv4.h"
- 
+
 /* There are two different signal handler trampolines in Solaris2.  */
 #define IN_SIGTRAMP(pc, name) \
   ((name) \
    && (STREQ ("sigacthandler", name) || STREQ ("ucbsigvechandler", name)))
- 
+
 /* The signal handler gets a pointer to an ucontext as third argument
    if it is called from sigacthandler.  This is the offset to the saved
    PC within it.  sparc_frame_saved_pc knows how to deal with
-   ucbsigvechandler.  */  
+   ucbsigvechandler.  */
 #define SIGCONTEXT_PC_OFFSET 44
 
-#if 0	/* FIXME Setjmp/longjmp are not as well doc'd in SunOS 5.x yet */
+#if 0				/* FIXME Setjmp/longjmp are not as well doc'd in SunOS 5.x yet */
 
 /* Offsets into jmp_buf.  Not defined by Sun, but at least documented in a
    comment in <machine/setjmp.h>! */
@@ -59,7 +60,7 @@ extern int
 get_longjmp_target PARAMS ((CORE_ADDR *));
 
 #define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR)
-#endif  /* 0 */
+#endif /* 0 */
 
 /* The SunPRO compiler puts out 0 instead of the address in N_SO symbols,
    and for SunPRO 3.0, N_FUN symbols too.  */
diff --git a/gdb/config/sparc/tm-vxsparc.h b/gdb/config/sparc/tm-vxsparc.h
index 06a98fce661..b6529f75b7f 100644
--- a/gdb/config/sparc/tm-vxsparc.h
+++ b/gdb/config/sparc/tm-vxsparc.h
@@ -2,21 +2,22 @@
    Copyright 1993, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "sparc/tm-spc-em.h"
 #include "tm-vxworks.h"
@@ -30,4 +31,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Number of registers in a ptrace_getfpregs call. */
 
 /* #define VX_SIZE_FPREGS (don't know how many) */
-
diff --git a/gdb/config/sparc/xm-linux.h b/gdb/config/sparc/xm-linux.h
index 7d68b63b73c..87b2ee6d9f5 100644
--- a/gdb/config/sparc/xm-linux.h
+++ b/gdb/config/sparc/xm-linux.h
@@ -2,21 +2,22 @@
    Copyright (C) 1989, 1993, 1994, 1995, 1996, 1998
    Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef XM_SPARCLINUX_H
 #define XM_SPARCLINUX_H
@@ -42,7 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    is a kludge.
    FIXME:  Make this more automatic. */
 
-#define MMAP_BASE_ADDRESS      0xE0000000      /* First mapping here */
-#define MMAP_INCREMENT         0x01000000      /* Increment to next mapping */
+#define MMAP_BASE_ADDRESS      0xE0000000	/* First mapping here */
+#define MMAP_INCREMENT         0x01000000	/* Increment to next mapping */
 
 #endif /* _XM_SPARCLINUX_H */
diff --git a/gdb/config/sparc/xm-nbsd.h b/gdb/config/sparc/xm-nbsd.h
index 95fe8464c64..e469aabc1b4 100644
--- a/gdb/config/sparc/xm-nbsd.h
+++ b/gdb/config/sparc/xm-nbsd.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a Sparc running NetBSD, for GDB.
    Copyright 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Get generic NetBSD host definitions. */
 #include "xm-nbsd.h"
diff --git a/gdb/config/sparc/xm-sparc.h b/gdb/config/sparc/xm-sparc.h
index 06c247ea9c7..28f806f96be 100644
--- a/gdb/config/sparc/xm-sparc.h
+++ b/gdb/config/sparc/xm-sparc.h
@@ -3,20 +3,21 @@
    Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@mcc.com).
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
diff --git a/gdb/config/sparc/xm-sparclynx.h b/gdb/config/sparc/xm-sparclynx.h
index 7e62628e4e1..7777bc7f9e0 100644
--- a/gdb/config/sparc/xm-sparclynx.h
+++ b/gdb/config/sparc/xm-sparclynx.h
@@ -1,21 +1,22 @@
 /* Host-dependent definitions for Sparc running LynxOS, for GDB.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
diff --git a/gdb/config/sparc/xm-sun4os4.h b/gdb/config/sparc/xm-sun4os4.h
index e50a2132f8a..de781595a7d 100644
--- a/gdb/config/sparc/xm-sun4os4.h
+++ b/gdb/config/sparc/xm-sun4os4.h
@@ -2,21 +2,22 @@
    Copyright (C) 1989, 1993, 1994, 1995, 1996
    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.  */
+   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 "sparc/xm-sparc.h"
 
diff --git a/gdb/config/sparc/xm-sun4sol2.h b/gdb/config/sparc/xm-sun4sol2.h
index bc49ce418d4..01218fd2d23 100644
--- a/gdb/config/sparc/xm-sun4sol2.h
+++ b/gdb/config/sparc/xm-sun4sol2.h
@@ -1,21 +1,22 @@
 /* Macro definitions for running gdb on a Sun 4 running Solaris 2.
    Copyright 1989, 1992 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.  */
+   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.  */
 
 /* Most of what we know is generic to SPARC hosts.  */
 
diff --git a/gdb/config/tahoe/tm-tahoe.h b/gdb/config/tahoe/tm-tahoe.h
index 8711d2457a4..6028337cc9c 100644
--- a/gdb/config/tahoe/tm-tahoe.h
+++ b/gdb/config/tahoe/tm-tahoe.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB target for a tahoe running 4.3-Reno.
    Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /*
  * Ported by the State University of New York at Buffalo by the Distributed
@@ -189,7 +190,7 @@ extern CORE_ADDR tahoe_skip_prologue PARAMS ((CORE_ADDR));
 /* Return number of args passed to a frame.
    Can return -1, meaning no way to tell.  */
 
-extern int tahoe_frame_num_args PARAMS ((struct frame_info *fi));
+extern int tahoe_frame_num_args PARAMS ((struct frame_info * fi));
 #define FRAME_NUM_ARGS(fi) (tahoe_frame_num_args ((fi)))
 
 /* Return number of bytes at start of arglist that are not really args.  */
@@ -251,8 +252,8 @@ printf("POP_FRAME\n");							\
 }
 
 /* This sequence of words is the instructions
-     calls #69, @#32323232
-     bpt
+   calls #69, @#32323232
+   bpt
    Note this is 8 bytes.  */
 
 #define CALL_DUMMY {0xbf699f32, 0x32323230}
@@ -268,4 +269,3 @@ printf("POP_FRAME\n");							\
 { int temp = (int) fun;				\
   *((char *) dummyname + 1) = nargs;		\
   memcpy((char *)dummyname+3,&temp,4); }
-
diff --git a/gdb/config/tahoe/xm-tahoe.h b/gdb/config/tahoe/xm-tahoe.h
index 99af344c17c..c9e18d8c610 100644
--- a/gdb/config/tahoe/xm-tahoe.h
+++ b/gdb/config/tahoe/xm-tahoe.h
@@ -3,21 +3,22 @@
    Contributed by the State University of New York at Buffalo, by the
    Distributed Computer Systems Lab, Department of Computer Science, 1991.
 
-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.  */
+   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.  */
 
 /* Make sure the system include files define BIG_ENDIAN, UINT_MAX, const,
    etc, rather than GDB's files.  */
diff --git a/gdb/config/tic80/tm-tic80.h b/gdb/config/tic80/tm-tic80.h
index 89aab87e76a..0ec4887458a 100644
--- a/gdb/config/tic80/tm-tic80.h
+++ b/gdb/config/tic80/tm-tic80.h
@@ -2,26 +2,27 @@
    Copyright 1997
    Free Software Foundation, Inc. 
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #ifndef TM_TIC80_H
 #define TM_TIC80_H
 
-#ifdef __STDC__		/* Forward declare structs used in prototypes */
+#ifdef __STDC__			/* Forward declare structs used in prototypes */
 struct frame_info;
 struct type;
 struct value;
@@ -56,9 +57,9 @@ struct frame_saved_regs;
 #define A0_REGNUM 34		/* Accumulator register 0 */
 #define A3_REGNUM 37		/* Accumulator register 1 */
 
-#define R0_REGNUM 0             /* General Purpose Register 0 - for sim */
-#define Rn_REGNUM 31            /* Last General Purpose Register - for sim */
-#define An_REGNUM A3_REGNUM     /* Last Accumulator register - for sim */
+#define R0_REGNUM 0		/* General Purpose Register 0 - for sim */
+#define Rn_REGNUM 31		/* Last General Purpose Register - for sim */
+#define An_REGNUM A3_REGNUM	/* Last Accumulator register - for sim */
 
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.  */
@@ -116,12 +117,12 @@ struct frame_saved_regs;
    This is often the number of bytes in BREAKPOINT
    but not always.  */
 
-#define DECR_PC_AFTER_BREAK	0			/* FIXME! */
+#define DECR_PC_AFTER_BREAK	0	/* FIXME! */
 
 /* Discard from the stack the innermost frame, restoring all registers.  */
 
 #define POP_FRAME tic80_pop_frame(get_current_frame ())
-extern struct frame_info *tic80_pop_frame PARAMS ((struct frame_info *frame));
+extern struct frame_info *tic80_pop_frame PARAMS ((struct frame_info * frame));
 
 /* Return number of bytes at start of arglist that are not really args.  */
 
@@ -149,7 +150,7 @@ extern struct frame_info *tic80_pop_frame PARAMS ((struct frame_info *frame));
   int frameoffset;		\
   int framereg;
 
-extern void tic80_init_extra_frame_info PARAMS ((struct frame_info *fi));
+extern void tic80_init_extra_frame_info PARAMS ((struct frame_info * fi));
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) tic80_init_extra_frame_info (fi)
 #define INIT_FRAME_PC		/* Not necessary */
 
@@ -217,8 +218,8 @@ extern CORE_ADDR tic80_frame_saved_pc PARAMS ((struct frame_info *));
 
 
 /* PUSH_ARGUMENTS */
-extern CORE_ADDR tic80_push_arguments PARAMS ((int nargs, 
-					       struct value **args, 
+extern CORE_ADDR tic80_push_arguments PARAMS ((int nargs,
+					       struct value ** args,
 					       CORE_ADDR sp,
 					       unsigned char struct_return,
 					       CORE_ADDR struct_addr));
@@ -249,4 +250,4 @@ extern CORE_ADDR tic80_push_return_address PARAMS ((CORE_ADDR, CORE_ADDR));
 #define PUSH_DUMMY_FRAME             generic_push_dummy_frame ()
 #define PC_IN_CALL_DUMMY(PC, SP, FP) generic_pc_in_call_dummy (PC, SP, FP)
 
-#endif	/* TM_TIC80_H */
+#endif /* TM_TIC80_H */
diff --git a/gdb/config/tm-lynx.h b/gdb/config/tm-lynx.h
index 7107241420c..b990be65a0d 100644
--- a/gdb/config/tm-lynx.h
+++ b/gdb/config/tm-lynx.h
@@ -1,21 +1,22 @@
 /* Macro definitions for LynxOS targets.
    Copyright 1993 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.  */
+   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.  */
 
 #ifndef TM_LYNX_H
 #define TM_LYNX_H
diff --git a/gdb/config/tm-nbsd.h b/gdb/config/tm-nbsd.h
index e295d85ea2d..e8701be274a 100644
--- a/gdb/config/tm-nbsd.h
+++ b/gdb/config/tm-nbsd.h
@@ -2,18 +2,19 @@
    This is included by other tm-*.h files to specify NetBSD-specific stuff.
    Copyright 1993, 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
diff --git a/gdb/config/tm-sunos.h b/gdb/config/tm-sunos.h
index 26ec3cff866..c8db07e865e 100644
--- a/gdb/config/tm-sunos.h
+++ b/gdb/config/tm-sunos.h
@@ -2,23 +2,24 @@
    This is included by other tm-*.h files to specify SunOS-specific stuff.
    Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 "solib.h"	/* Support for shared libraries. */
+#include "solib.h"		/* Support for shared libraries. */
 
 /* Return non-zero if we are in a shared library trampoline code stub. */
 
diff --git a/gdb/config/tm-sysv4.h b/gdb/config/tm-sysv4.h
index 2c085410c09..61f2568f2a5 100644
--- a/gdb/config/tm-sysv4.h
+++ b/gdb/config/tm-sysv4.h
@@ -2,21 +2,22 @@
    Copyright 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygnus.com).
 
-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.  */
+   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.  */
 
 /* For SVR4 shared libraries, each call to a library routine goes through
    a small piece of trampoline code in the ".plt" section.
diff --git a/gdb/config/tm-vxworks.h b/gdb/config/tm-vxworks.h
index 8653f88911c..9afc0b4fc79 100644
--- a/gdb/config/tm-vxworks.h
+++ b/gdb/config/tm-vxworks.h
@@ -1,21 +1,22 @@
 /* Target machine description for VxWorks, for GDB, the GNU debugger.
    Copyright 1999 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define	GDBINIT_FILENAME	".vxgdbinit"
 
diff --git a/gdb/config/v850/tm-v850.h b/gdb/config/v850/tm-v850.h
index 05fa79db36a..ecea72d3ea6 100644
--- a/gdb/config/v850/tm-v850.h
+++ b/gdb/config/v850/tm-v850.h
@@ -2,21 +2,22 @@
    Copyright 1996
    Free Software Foundation, Inc. 
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define TARGET_BYTE_ORDER LITTLE_ENDIAN
 
@@ -81,7 +82,7 @@ extern char **v850_register_names;
 
 #define MAX_REGISTER_VIRTUAL_SIZE 4
 
-#define BREAKPOINT {0x40, 0xF8} /* little-ended */
+#define BREAKPOINT {0x40, 0xF8}	/* little-ended */
 
 #define FUNCTION_START_OFFSET 0
 
@@ -100,19 +101,19 @@ struct value;
 
 #define EXTRA_FRAME_INFO struct frame_saved_regs fsr;
 
-extern void v850_init_extra_frame_info PARAMS ((struct frame_info *fi));
+extern void v850_init_extra_frame_info PARAMS ((struct frame_info * fi));
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) v850_init_extra_frame_info (fi)
 #define INIT_FRAME_PC		/* Not necessary */
 
-extern void v850_frame_find_saved_regs PARAMS ((struct frame_info *fi, struct frame_saved_regs *regaddr));
+extern void v850_frame_find_saved_regs PARAMS ((struct frame_info * fi, struct frame_saved_regs * regaddr));
 #define FRAME_FIND_SAVED_REGS(fi, regaddr) regaddr = fi->fsr
 
-extern CORE_ADDR v850_frame_chain PARAMS ((struct frame_info *fi));
+extern CORE_ADDR v850_frame_chain PARAMS ((struct frame_info * fi));
 #define FRAME_CHAIN(fi) v850_frame_chain (fi)
 #define FRAME_CHAIN_VALID(FP, FI)	generic_frame_chain_valid (FP, FI)
 
-extern CORE_ADDR v850_find_callers_reg PARAMS ((struct frame_info *fi, int regnum));
-extern CORE_ADDR v850_frame_saved_pc   PARAMS ((struct frame_info *));
+extern CORE_ADDR v850_find_callers_reg PARAMS ((struct frame_info * fi, int regnum));
+extern CORE_ADDR v850_frame_saved_pc PARAMS ((struct frame_info *));
 #define FRAME_SAVED_PC(FI) (v850_frame_saved_pc (FI))
 
 #define EXTRACT_RETURN_VALUE(TYPE, REGBUF, VALBUF) \
@@ -134,7 +135,7 @@ extern CORE_ADDR v850_skip_prologue PARAMS ((CORE_ADDR pc));
 #define FRAME_LOCALS_ADDRESS(fi) ((fi)->frame)
 #define FRAME_NUM_ARGS(fi) (-1)
 
-extern void v850_pop_frame PARAMS ((struct frame_info *frame));
+extern void v850_pop_frame PARAMS ((struct frame_info * frame));
 #define POP_FRAME v850_pop_frame (get_current_frame ())
 
 #define USE_GENERIC_DUMMY_FRAMES 1
@@ -151,9 +152,9 @@ extern CORE_ADDR v850_push_return_address PARAMS ((CORE_ADDR, CORE_ADDR));
 #define PUSH_DUMMY_FRAME	generic_push_dummy_frame ()
 
 extern CORE_ADDR
-v850_push_arguments PARAMS ((int nargs, struct value **args, CORE_ADDR sp,
-			     unsigned char struct_return,
-			     CORE_ADDR struct_addr));
+  v850_push_arguments PARAMS ((int nargs, struct value ** args, CORE_ADDR sp,
+			       unsigned char struct_return,
+			       CORE_ADDR struct_addr));
 #define PUSH_ARGUMENTS(NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR) \
   (v850_push_arguments (NARGS, ARGS, SP, STRUCT_RETURN, STRUCT_ADDR))
 
diff --git a/gdb/config/vax/nm-vax.h b/gdb/config/vax/nm-vax.h
index 11f7dc9f64f..c2baef18fa6 100644
--- a/gdb/config/vax/nm-vax.h
+++ b/gdb/config/vax/nm-vax.h
@@ -1,21 +1,22 @@
 /* Common definitions for GDB native support on Vaxen under 4.2bsd and Ultrix.
    Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define REGISTER_U_ADDR(addr, blockend, regno)		\
 { addr = blockend - 0110 + regno * 4;			\
@@ -24,5 +25,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
   if (regno == FP_REGNUM) addr = blockend - 0120;	\
   if (regno == AP_REGNUM) addr = blockend - 0124;	\
   if (regno == SP_REGNUM) addr = blockend - 20; }
-
-
diff --git a/gdb/config/vax/tm-vax.h b/gdb/config/vax/tm-vax.h
index 277aa8b8a41..607ee746099 100644
--- a/gdb/config/vax/tm-vax.h
+++ b/gdb/config/vax/tm-vax.h
@@ -1,21 +1,22 @@
 /* Definitions to make GDB run on a vax under 4.2bsd.
    Copyright 1986, 1987, 1989, 1991, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 
 #define TARGET_BYTE_ORDER LITTLE_ENDIAN
@@ -151,8 +152,8 @@ extern CORE_ADDR vax_skip_prologue PARAMS ((CORE_ADDR));
    as a CORE_ADDR (or an expression that can be used as one).  */
 
 #define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) (*(int *)(REGBUF))
-
 
+
 /* Describe the pointer in each stack frame to the previous stack frame
    (its caller).  */
 
@@ -213,7 +214,7 @@ extern CORE_ADDR vax_skip_prologue PARAMS ((CORE_ADDR));
 /* Return number of args passed to a frame.
    Can return -1, meaning no way to tell.  */
 
-extern int vax_frame_num_args PARAMS ((struct frame_info *fi));
+extern int vax_frame_num_args PARAMS ((struct frame_info * fi));
 #define FRAME_NUM_ARGS(fi) (vax_frame_num_args ((fi)))
 
 /* Return number of bytes at start of arglist that are not really args.  */
@@ -290,13 +291,13 @@ extern int vax_frame_num_args PARAMS ((struct frame_info *fi));
 }
 
 /* This sequence of words is the instructions
-     calls #69, @#32323232
-     bpt
+   calls #69, @#32323232
+   bpt
    Note this is 8 bytes.  */
 
 #define CALL_DUMMY {0x329f69fb, 0x03323232}
 
-#define CALL_DUMMY_START_OFFSET 0  /* Start execution at beginning of dummy */
+#define CALL_DUMMY_START_OFFSET 0	/* Start execution at beginning of dummy */
 
 #define CALL_DUMMY_BREAKPOINT_OFFSET 7
 
diff --git a/gdb/config/vax/xm-vax.h b/gdb/config/vax/xm-vax.h
index fea11c715d5..3512d5b18aa 100644
--- a/gdb/config/vax/xm-vax.h
+++ b/gdb/config/vax/xm-vax.h
@@ -1,21 +1,22 @@
 /* Common definitions to make GDB run on Vaxen under 4.2bsd and Ultrix.
    Copyright (C) 1986, 1987, 1989, 1992 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.  */
+   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.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
 
diff --git a/gdb/config/vax/xm-vaxult.h b/gdb/config/vax/xm-vaxult.h
index 24c64370601..5b9020a5524 100644
--- a/gdb/config/vax/xm-vaxult.h
+++ b/gdb/config/vax/xm-vaxult.h
@@ -1,7 +1,7 @@
 /* Definitions to make GDB run on a vax under Ultrix. */
 
 #include "vax/xm-vax.h"
-extern char *strdup();
+extern char *strdup ();
 
 /* This is required for Ultrix 3.1b, not for later versions.  Ultrix
    3.1b can't just use xm-vaxult2.h because Ultrix 3.1b does define
diff --git a/gdb/config/vax/xm-vaxult2.h b/gdb/config/vax/xm-vaxult2.h
index d0d3d62c7aa..3d039ce95f6 100644
--- a/gdb/config/vax/xm-vaxult2.h
+++ b/gdb/config/vax/xm-vaxult2.h
@@ -1,7 +1,7 @@
 /* Definitions to make GDB run on a vax under Ultrix. */
 
 #include "vax/xm-vax.h"
-extern char *strdup();
+extern char *strdup ();
 
 #define NO_PTRACE_H
 
diff --git a/gdb/config/w65/tm-w65.h b/gdb/config/w65/tm-w65.h
index 412624dacc4..b1fe4eddceb 100644
--- a/gdb/config/w65/tm-w65.h
+++ b/gdb/config/w65/tm-w65.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a WDC 65816 machine.
    Copyright (C) 1995 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* Contributed by Steve Chamberlain sac@cygnus.com */
 
@@ -60,7 +61,7 @@ extern CORE_ADDR w65_skip_prologue ();
 /* Illegal instruction - used by the simulator for breakpoint
    detection */
 
-#define BREAKPOINT {0xcb} /* WAI */
+#define BREAKPOINT {0xcb}	/* WAI */
 
 /* If your kernel resets the pc after the trap happens you may need to
    define this before including this file.  */
@@ -68,13 +69,13 @@ extern CORE_ADDR w65_skip_prologue ();
 
 /* Return 1 if P points to an invalid floating point value.  */
 
-#define INVALID_FLOAT(p, len) 0   /* Just a first guess; not checked */
+#define INVALID_FLOAT(p, len) 0	/* Just a first guess; not checked */
 
 /* Say how long registers are.  */
-/*#define REGISTER_TYPE  int*/
+/*#define REGISTER_TYPE  int */
 
 /* Say how much memory is needed to store a copy of the register set */
-#define REGISTER_BYTES    (NUM_REGS*4) 
+#define REGISTER_BYTES    (NUM_REGS*4)
 
 /* Index within `registers' of the first byte of the space for
    register N.  */
diff --git a/gdb/config/xm-aix4.h b/gdb/config/xm-aix4.h
index 87062f77e5f..14d62448c65 100644
--- a/gdb/config/xm-aix4.h
+++ b/gdb/config/xm-aix4.h
@@ -2,21 +2,22 @@
    Copyright 1995, 1998 Free Software Foundation, Inc.
    Contributed by Cygnus Corporation.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* The following text is taken from config/rs6000.mh:
  * # The IBM version of /usr/include/rpc/rpc.h has a bug -- it says
@@ -67,7 +68,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define	vfork	fork
 
-char *termdef();
+char *termdef ();
 
 /* Signal handler for SIGWINCH `window size changed'. */
 
diff --git a/gdb/config/xm-lynx.h b/gdb/config/xm-lynx.h
index d73e2c10619..e85fb2b5e9a 100644
--- a/gdb/config/xm-lynx.h
+++ b/gdb/config/xm-lynx.h
@@ -1,20 +1,21 @@
 /* Host-dependent definitions for any CPU running LynxOS.
    Copyright 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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 <limits.h>	/* for INT_MIN */
+#include <limits.h>		/* for INT_MIN */
diff --git a/gdb/config/xm-mpw.h b/gdb/config/xm-mpw.h
index 0c473d75572..f6aa90ecc29 100644
--- a/gdb/config/xm-mpw.h
+++ b/gdb/config/xm-mpw.h
@@ -1,21 +1,22 @@
 /* Macro definitions for running GDB on Apple Macintoshes.
    Copyright (C) 1994, 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.  */
+   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 "mpw.h"
 
diff --git a/gdb/config/xm-nbsd.h b/gdb/config/xm-nbsd.h
index 2332bb520a4..18a668d3bf8 100644
--- a/gdb/config/xm-nbsd.h
+++ b/gdb/config/xm-nbsd.h
@@ -1,21 +1,22 @@
 /* Host-dependent definitions for any CPU running NetBSD.
    Copyright 1993, 1994, 1996 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* We have to include these files now, so that GDB will not make
    competing definitions in defs.h.  */
diff --git a/gdb/config/xm-sysv4.h b/gdb/config/xm-sysv4.h
index 06215e64057..e82e9289ceb 100644
--- a/gdb/config/xm-sysv4.h
+++ b/gdb/config/xm-sysv4.h
@@ -2,21 +2,22 @@
    Copyright 1991, 1992 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygnus.com).
 
-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.  */
+   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.  */
 
 /* SVR4 has termios facilities. */
 
diff --git a/gdb/config/z8k/tm-z8k.h b/gdb/config/z8k/tm-z8k.h
index 3b38d75f1b0..4f0ec94fe4f 100644
--- a/gdb/config/z8k/tm-z8k.h
+++ b/gdb/config/z8k/tm-z8k.h
@@ -1,21 +1,22 @@
 /* Parameters for execution on a z8000 series machine.
    Copyright 1992, 1993 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 #define IEEE_FLOAT 1
 
@@ -68,8 +69,8 @@ extern CORE_ADDR mz8k_skip_prologue PARAMS ((CORE_ADDR ip));
 
 #define REGISTER_TYPE unsigned int
 
-#define NUM_REGS 	23   /* 16 registers + 1 ccr + 1 pc + 3 debug
-				regs + fake fp + fake sp*/
+#define NUM_REGS 	23	/* 16 registers + 1 ccr + 1 pc + 3 debug
+				   regs + fake fp + fake sp */
 #define REGISTER_BYTES  (NUM_REGS *4)
 
 /* Index within `registers' of the first byte of the space for
@@ -87,7 +88,7 @@ extern CORE_ADDR mz8k_skip_prologue PARAMS ((CORE_ADDR ip));
 /* Number of bytes of storage in the program's representation
    for register N.  */
 
-#define REGISTER_VIRTUAL_SIZE(N) REGISTER_RAW_SIZE(N) 
+#define REGISTER_VIRTUAL_SIZE(N) REGISTER_RAW_SIZE(N)
 
 /* Largest value REGISTER_RAW_SIZE can have.  */
 
@@ -103,7 +104,7 @@ extern CORE_ADDR mz8k_skip_prologue PARAMS ((CORE_ADDR ip));
 #define REGISTER_VIRTUAL_TYPE(N) \
  (REGISTER_VIRTUAL_SIZE(N) == 2? builtin_type_unsigned_int : builtin_type_long)
 
-/*#define INIT_FRAME_PC(x,y) init_frame_pc(x,y)*/
+/*#define INIT_FRAME_PC(x,y) init_frame_pc(x,y) */
 /* Initializer for an array of names of registers.
    Entries beyond the first NUM_REGS are ignored.  */
 
@@ -202,8 +203,8 @@ struct frame_info;
 #endif
 extern void z8k_frame_init_saved_regs PARAMS ((struct frame_info *));
 #define FRAME_INIT_SAVED_REGS(fi) z8k_frame_init_saved_regs (fi)
-
 
+
 /* Things needed for making the inferior call functions.
    It seems like every m68k based machine has almost identical definitions
    in the individual machine's configuration files.  Most other cpu types
@@ -214,20 +215,20 @@ extern void z8k_frame_init_saved_regs PARAMS ((struct frame_info *));
 /* The CALL_DUMMY macro is the sequence of instructions, as disassembled
    by gdb itself:
 
-	fmovemx fp0-fp7,sp@-			0xf227 0xe0ff
-	moveml d0-a5,sp@-			0x48e7 0xfffc
-	clrw sp@-				0x4267
-	movew ccr,sp@-				0x42e7
+   fmovemx fp0-fp7,sp@-                 0xf227 0xe0ff
+   moveml d0-a5,sp@-                    0x48e7 0xfffc
+   clrw sp@-                            0x4267
+   movew ccr,sp@-                               0x42e7
 
-	/..* The arguments are pushed at this point by GDB;
-	no code is needed in the dummy for this.
-	The CALL_DUMMY_START_OFFSET gives the position of 
-	the following jsr instruction.  *../
+   /..* The arguments are pushed at this point by GDB;
+   no code is needed in the dummy for this.
+   The CALL_DUMMY_START_OFFSET gives the position of 
+   the following jsr instruction.  *../
 
-	jsr @#0x32323232			0x4eb9 0x3232 0x3232
-	addal #0x69696969,sp			0xdffc 0x6969 0x6969
-	trap #<your BPT_VECTOR number here>	0x4e4?
-	nop					0x4e71
+   jsr @#0x32323232                     0x4eb9 0x3232 0x3232
+   addal #0x69696969,sp                 0xdffc 0x6969 0x6969
+   trap #<your BPT_VECTOR number here>  0x4e4?
+   nop                                  0x4e71
 
    Note this is CALL_DUMMY_LENGTH bytes (28 for the above example).
    We actually start executing at the jsr, since the pushing of the
@@ -240,8 +241,8 @@ extern void z8k_frame_init_saved_regs PARAMS ((struct frame_info *));
 
 
 #define CALL_DUMMY { 0 }
-#define CALL_DUMMY_LENGTH 24		/* Size of CALL_DUMMY */
-#define CALL_DUMMY_START_OFFSET 8	/* Offset to jsr instruction*/
+#define CALL_DUMMY_LENGTH 24	/* Size of CALL_DUMMY */
+#define CALL_DUMMY_START_OFFSET 8	/* Offset to jsr instruction */
 
 
 /* Insert the specified number of args and function address
@@ -284,4 +285,3 @@ int sim_z8001_mode;
   z8k_set_pointer_size(objfile->obfd->arch_info->bits_per_address);
 
 #define REGISTER_SIZE 4
-
author	Jason Molenda <jsm@bugshack.cygnus.com>	1999-07-07 20:19:36 +0000
committer	Jason Molenda <jsm@bugshack.cygnus.com>	1999-07-07 20:19:36 +0000
commit	a87029ef15e59af2cc0b27cb4024b0db313fa88e (patch)
tree	a5cc2d6f8ebdbbd957642e72e0e88cc5fe5cd2e1 /gdb/config
parent	528824cc847e5a13831dd41e5aacb34679143c94 (diff)
download	gdb-a87029ef15e59af2cc0b27cb4024b0db313fa88e.tar.gz