From NetBSD: merge of 960317

9 files changed, 39 insertions, 20 deletions

diff --git a/gnu/usr.bin/gas/config/atof-ns32k.c b/gnu/usr.bin/gas/config/atof-ns32k.c
index cadeec08af7..658578406f4 100644
--- a/gnu/usr.bin/gas/config/atof-ns32k.c
+++ b/gnu/usr.bin/gas/config/atof-ns32k.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: atof-ns32k.c,v 1.2 1996/03/30 15:29:30 niklas Exp $	*/
+
 /* atof_ns32k.c - turn a Flonum into a ns32k floating point number
    Copyright (C) 1987 Free Software Foundation, Inc.
 
@@ -132,10 +134,11 @@ static void
 make_invalid_floating_point_number (words)
      LITTLENUM_TYPE *	words;
 {
-	words[0]= ((unsigned)-1)>>1;	/* Zero the leftmost bit */
-	words[1]= -1;
-	words[2]= -1;
-	words[3]= -1;
+	/* Zero the leftmost bit */
+	words[0]= (LITTLENUM_TYPE) ((unsigned)-1)>>1;
+	words[1]= (LITTLENUM_TYPE) -1;
+	words[2]= (LITTLENUM_TYPE) -1;
+	words[3]= (LITTLENUM_TYPE) -1;
 }
 
 /***********************************************************************\
diff --git a/gnu/usr.bin/gas/config/tc-a29k.c b/gnu/usr.bin/gas/config/tc-a29k.c
index 84ec97a6caa..96ca6e22722 100644
--- a/gnu/usr.bin/gas/config/tc-a29k.c
+++ b/gnu/usr.bin/gas/config/tc-a29k.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: tc-a29k.c,v 1.2 1996/03/30 15:29:32 niklas Exp $	*/
+
 /* tc-a29k.c -- Assemble for the AMD 29000.
    Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
    
@@ -86,12 +88,12 @@ int md_short_jump_size = 4;
 int md_long_jump_size = 4;
 #if defined(BFD_HEADERS)
 #ifdef RELSZ
-int md_reloc_size = RELSZ;	/* Coff headers */
+const int md_reloc_size = RELSZ;	/* Coff headers */
 #else
-int md_reloc_size = 12;		/* something else headers */
+const int md_reloc_size = 12;		/* something else headers */
 #endif
 #else
-int md_reloc_size = 12;		/* Not bfdized*/
+const int md_reloc_size = 12;		/* Not bfdized*/
 #endif
 
 /* This array holds the chars that always start a comment.  If the
diff --git a/gnu/usr.bin/gas/config/tc-h8300.c b/gnu/usr.bin/gas/config/tc-h8300.c
index db4786bbfac..26e42a3e1b5 100644
--- a/gnu/usr.bin/gas/config/tc-h8300.c
+++ b/gnu/usr.bin/gas/config/tc-h8300.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: tc-h8300.c,v 1.2 1996/03/30 15:29:34 niklas Exp $	*/
+
 /* tc-h8300.c -- Assemble code for the Hitachi H8/300
    Copyright (C) 1991, 1992 Free Software Foundation.
    
@@ -47,7 +49,7 @@ const pseudo_typeS md_pseudo_table[] = {
 	{ 0,0,0 }
 };
 
-int  md_reloc_size ;
+const int  md_reloc_size ;
 
 const char EXP_CHARS[] = "eE";
 
diff --git a/gnu/usr.bin/gas/config/tc-i386.c b/gnu/usr.bin/gas/config/tc-i386.c
index 7e16d7a8867..0eef54a9e73 100644
--- a/gnu/usr.bin/gas/config/tc-i386.c
+++ b/gnu/usr.bin/gas/config/tc-i386.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: tc-i386.c,v 1.3 1996/03/30 15:29:36 niklas Exp $	*/
+
 /* i386.c -- Assemble code for the Intel 80386
    Copyright (C) 1989, 1991, 1992 Free Software Foundation.
    
@@ -25,7 +27,11 @@
   */
 
 #ifndef lint
-static char rcsid[] = "$Id: tc-i386.c,v 1.2 1996/01/29 06:49:46 deraadt Exp $";
+#if 0
+static char rcsid[] = "$Id: tc-i386.c,v 1.3 1996/03/30 15:29:36 niklas Exp $";
+#else
+static char rcsid[] = "$OpenBSD: tc-i386.c,v 1.3 1996/03/30 15:29:36 niklas Exp $";
+#endif
 #endif
 
 #include "as.h"
@@ -1871,7 +1877,7 @@ register fragS *	fragP;
 
 int md_short_jump_size = 2;	/* size of byte displacement jmp */
 int md_long_jump_size  = 5;	/* size of dword displacement jmp */
-int md_reloc_size = 8;		/* Size of relocation record */
+const int md_reloc_size = 8;		/* Size of relocation record */
 
 void md_create_short_jump(ptr, from_addr, to_addr, frag, to_symbol)
 char	*ptr;
diff --git a/gnu/usr.bin/gas/config/tc-i860.c b/gnu/usr.bin/gas/config/tc-i860.c
index a4698f86601..cb7cd179728 100644
--- a/gnu/usr.bin/gas/config/tc-i860.c
+++ b/gnu/usr.bin/gas/config/tc-i860.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: tc-i860.c,v 1.3 1996/03/30 15:29:39 niklas Exp $	*/
+
 /* tc-i860.c -- Assemble for the I860
    Copyright (C) 1989, 1992 Free Software Foundation, Inc.
    
@@ -1157,7 +1159,7 @@ relax_addressT segment_address_in_file;
 
  */
 
-int md_reloc_size = 12;
+const int md_reloc_size = 12;
 
 void tc_aout_fix_to_chars(where, fixP, segment_address_in_file)
 char *where;
diff --git a/gnu/usr.bin/gas/config/tc-i960.c b/gnu/usr.bin/gas/config/tc-i960.c
index 8f9091ce5f0..09e39c13ae3 100644
--- a/gnu/usr.bin/gas/config/tc-i960.c
+++ b/gnu/usr.bin/gas/config/tc-i960.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: tc-i960.c,v 1.2 1996/03/30 15:29:42 niklas Exp $	*/
+
 /* tc-i960.c - All the i80960-specific stuff
    Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
    
@@ -87,9 +89,9 @@ extern struct hash_control *po_hash;
 extern char *next_object_file_charP;
 
 #ifdef OBJ_COFF
-int md_reloc_size = sizeof(struct reloc);
+const int md_reloc_size = sizeof(struct reloc);
 #else /* OBJ_COFF */
-int md_reloc_size = sizeof(struct relocation_info);
+const int md_reloc_size = sizeof(struct relocation_info);
 #endif /* OBJ_COFF */
 
 /***************************
diff --git a/gnu/usr.bin/gas/config/tc-m68k.c b/gnu/usr.bin/gas/config/tc-m68k.c
index 1aed016c7ee..1a1e56e88ee 100644
--- a/gnu/usr.bin/gas/config/tc-m68k.c
+++ b/gnu/usr.bin/gas/config/tc-m68k.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: tc-m68k.c,v 1.2 1996/03/30 15:29:47 niklas Exp $	*/
+
 /* tc-m68k.c  All the m68020 specific stuff in one convenient, huge,
    slow to compile, easy to find file.
    
@@ -64,7 +66,7 @@ const char FLT_CHARS[] = "rRsSfFdDxXeEpP";
    but nothing is ideal around here.
    */
 
-int md_reloc_size = 8;		/* Size of relocation record */
+const int md_reloc_size = 8;		/* Size of relocation record */
 
 /* Its an arbitrary name:  This means I don't approve of it */
 /* See flames below */
diff --git a/gnu/usr.bin/gas/config/tc-ns32k.c b/gnu/usr.bin/gas/config/tc-ns32k.c
index 5843fe594a2..17390ab402b 100644
--- a/gnu/usr.bin/gas/config/tc-ns32k.c
+++ b/gnu/usr.bin/gas/config/tc-ns32k.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: tc-ns32k.c,v 1.2 1996/03/30 15:29:50 niklas Exp $	*/
+
 /* ns32k.c  -- Assemble on the National Semiconductor 32k series
    Copyright (C) 1987, 1992 Free Software Foundation, Inc.
    
@@ -1824,7 +1826,7 @@ segT segment;
 
 int md_short_jump_size = 3;
 int md_long_jump_size  = 5;
-int md_reloc_size = 8;		/* Size of relocation record */
+const int md_reloc_size = 8;		/* Size of relocation record */
 
 void
     md_create_short_jump(ptr,from_addr,to_addr,frag,to_symbol)
diff --git a/gnu/usr.bin/gas/tc.h b/gnu/usr.bin/gas/tc.h
index 2c3a60df4b2..771e76a00c4 100644
--- a/gnu/usr.bin/gas/tc.h
+++ b/gnu/usr.bin/gas/tc.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: tc.h,v 1.2 1996/03/30 15:29:27 niklas Exp $	*/
+
 /* tc.h - target cpu dependent
 
    Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc.
@@ -17,10 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-/*
- * $Id: tc.h,v 1.1 1995/10/18 08:39:00 deraadt Exp $
- */
-
 
 /* In theory (mine, at least!) the machine dependent part of the assembler
    should only have to include one file.  This one.  -- JF */
@@ -42,7 +40,7 @@ relax_typeS;
 
 extern const relax_typeS md_relax_table[]; /* Define it in MACHINE.c */
 
-extern int md_reloc_size; /* Size of a relocation record */
+extern const int md_reloc_size; /* Size of a relocation record */
 
 extern void (*md_emit_relocations)();