From 0c940099404991568c8b7c1a1c263befd553d3ce Mon Sep 17 00:00:00 2001
From: "Robert R. Henry" <henry@ucbvax.Berkeley.EDU>
Date: Thu, 6 Nov 1980 04:13:10 -0800
Subject: [PATCH] Fixing so that can compile with FLEXNAMES turned off

SCCS-vsn: old/as.vax/assyms.c 4.6
SCCS-vsn: old/as.vax/as.h 4.8
---
 usr/src/old/as.vax/as.h     | 9 ++++++---
 usr/src/old/as.vax/assyms.c | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/usr/src/old/as.vax/as.h b/usr/src/old/as.vax/as.h
index b1139c60af..70bcb1ae50 100644
--- a/usr/src/old/as.vax/as.h
+++ b/usr/src/old/as.vax/as.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 1980 Regents of the University of California */
-/* "@(#)as.h 4.7 %G%" */
+/* "@(#)as.h 4.8 %G%" */
 #ifdef VMS
 # define	vax	1
 # define	VAX	1
@@ -12,7 +12,8 @@
 #  include <a.out.h>
 #  include <stab.h>
 #else not FLEXNAMES
-#  include <olda.out.h>
+#  define ONLIST
+#  include "a.out.h"
 #  include <stab.h>
 #endif FLEXNAMES
 
@@ -247,6 +248,7 @@ struct symtab{
 struct	instab{
 	struct	nlist	s_nm;		/* instruction name, type (opcode) */
 	u_char	s_tag;			
+	char	s_pad[3];		/* round to 20 bytes */
 };
 /*
  *	The fields nm.n_desc and nm.n_value total 6 bytes; this is
@@ -255,7 +257,7 @@ struct	instab{
  *	they are allocated adjacently.
  *	IF THE FORMAT OF STRUCT nlist CHANGES, THESE MAY HAVE TO BE CHANGED.
  *
- *	Instab is cleverly declared to look very much the combination of
+ *	Instab is cleverly declared to look very much like the combination of
  *	a struct symtab and a struct nlist.
  */
 struct	Instab{
@@ -268,6 +270,7 @@ struct	Instab{
 	char	I_nargs;
 	char	I_args[6];
 	u_char	I_s_tag;
+	char	I_pad[3];		/* round to 20 bytes */
 };
 /*
  *	Redefinitions of fields in the struct nlist for instructions so that
diff --git a/usr/src/old/as.vax/assyms.c b/usr/src/old/as.vax/assyms.c
index e5a79d2a64..0a9965043d 100644
--- a/usr/src/old/as.vax/assyms.c
+++ b/usr/src/old/as.vax/assyms.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 1980 Regents of the University of California */
-static	char sccsid[] = "@(#)assyms.c 4.5 %G%";
+static	char sccsid[] = "@(#)assyms.c 4.6 %G%";
 #include <stdio.h>
 #include <ctype.h>
 #include "as.h"
@@ -460,6 +460,7 @@ struct symtab **lookup(instflg)
 	return(hp);
 }	/*end of lookup*/
 
+#ifdef FLEXNAMES
 char *savestr(str)
 	char *str;
 {
@@ -477,6 +478,7 @@ char *savestr(str)
 	strplhead->str_nalloc += len;
 	return (res);
 }
+#endif FLEXNAMES
 
 /*
  *	The relocation information is saved internally in an array of
-- 
2.20.1