From 26f4447a601f463a441b3513cd078c1b0532367c Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@cygnus>
Date: Wed, 14 Sep 1994 01:30:56 +0000
Subject: [PATCH] Some Vax and VMS bug fixes from Pat Rankin.

---
 gas/ChangeLog    | 18 ++++++++++++++++++
 gas/make-gas.com | 20 ++++++++++++++------
 gas/vmsconf.sh   | 14 ++++++++------
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4a7f3988af6..49ad594d3fc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,21 @@
+Tue Sep 13 21:15:36 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	VMS- and Vax-related changes from Pat Rankin:
+	* Makefile.in (VMS_OTHER_OBJS): add concat, getopt, and getopt1.
+	* vmsconf.sh: no longer have make-gas.com echo text about needing
+	to modify the gcc-vms driver when intending to use with gcc 1.x.
+	* as.c (parse_options): suppress 'v' from std_short_options and
+	eliminate VMS-specific conditional initialization;
+	[default case]: check for '-v' if md_parse_options doesn't recognize
+	an option;
+	[default case, #if VMS]: check for filename argument when '-v' seen;
+	[case 'v']: delete.
+	* config/tc-vax.c (md_assemble): don't rely on `this_add_number'
+	for O_big literal operands (double floats and long long ints);
+	[VMS, md_shortopts]: add second colon after 'v';
+	(md_parse_options) [VMS, case 'v']:  check for argument, so
+	caller can handle `-v' w/o arg.
+
 Tue Sep 13 16:45:08 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
 
 	* config/obj-coff.c (do_relocs_for):  If TC_KEEP_FX_OFFSET
diff --git a/gas/make-gas.com b/gas/make-gas.com
index 221e479a8fb..f62a20fddee 100644
--- a/gas/make-gas.com
+++ b/gas/make-gas.com
@@ -18,12 +18,14 @@ $!
 $!	Note: The version of gas shipped on the GCC VMS tapes has been patched
 $!	to fix the above mentioned bug.
 $!
-$ write sys$output "If this assembler is going to be used with GCC 1.n, you"
-$ write sys$Output "need to modify the driver to supply the -1 switch to gas."
-$ write sys$output "This is required because of a small change in how global"
-$ write sys$Output "constant variables are handled.  Failure to include this"
-$ write sys$output "will result in linker warning messages about mismatched
-$ write sys$output "psect attributes."
+$	!The gcc-vms driver was modified to use `-1' quite some time ago,
+$	!so don't echo this text any more...
+$ !write sys$output "If this assembler is going to be used with GCC 1.n, you"
+$ !write sys$output "need to modify the driver to supply the -1 switch to gas."
+$ !write sys$output "This is required because of a small change in how global"
+$ !write sys$output "constant variables are handled.  Failure to include this"
+$ !write sys$output "will result in linker warning messages about mismatched
+$ !write sys$output "psect attributes."
 $!
 $ C_DEFS :="""VMS"""
 $! C_DEFS :="""VMS""","""const="""
@@ -76,6 +78,9 @@ $ gcc 'c_flags'/define=('C_DEFS') xmalloc.c
 $ gcc 'c_flags'/define=('C_DEFS')/object=[]obstack.obj [-.libiberty]obstack.c
 $ gcc 'c_flags'/define=('C_DEFS')/object=[]strdup.obj [-.libiberty]strdup.c
 $ gcc 'c_flags'/define=('C_DEFS')/object=[]strncasecmp.obj [-.libiberty]strncasecmp.c
+$ gcc 'c_flags'/define=('C_DEFS')/object=[]concat.obj [-.libiberty]concat.c
+$ gcc 'c_flags'/define=('C_DEFS')/object=[]getopt.obj [-.libiberty]getopt.c
+$ gcc 'c_flags'/define=('C_DEFS')/object=[]getopt1.obj [-.libiberty]getopt1.c
 $ gcc 'c_flags'/define=('C_DEFS')/object=[]getruntime.obj [-.libiberty]getruntime.c
 $link:
 $ link/nomap/exec=gcc-as version.opt/opt+sys$input:/opt
@@ -113,6 +118,9 @@ xmalloc.obj,-
 obstack.obj,-
 strdup.obj,-
 strncasecmp.obj,-
+concat.obj,-
+getopt.obj,-
+getopt1.obj,-
 getruntime.obj,-
 gnu_cc:[000000]gcclib/lib,sys$share:vaxcrtl/lib
 ! Tell linker exactly what psect attributes we want -- match VAXCRTL.
diff --git a/gas/vmsconf.sh b/gas/vmsconf.sh
index eac8d84aad5..0b77e2fea65 100644
--- a/gas/vmsconf.sh
+++ b/gas/vmsconf.sh
@@ -21,12 +21,14 @@ $!
 $!	Note: The version of gas shipped on the GCC VMS tapes has been patched
 $!	to fix the above mentioned bug.
 $!
-$ write sys$output "If this assembler is going to be used with GCC 1.n, you"
-$ write sys$Output "need to modify the driver to supply the -1 switch to gas."
-$ write sys$output "This is required because of a small change in how global"
-$ write sys$Output "constant variables are handled.  Failure to include this"
-$ write sys$output "will result in linker warning messages about mismatched
-$ write sys$output "psect attributes."
+$	!The gcc-vms driver was modified to use `-1' quite some time ago,
+$	!so don't echo this text any more...
+$ !write sys$output "If this assembler is going to be used with GCC 1.n, you"
+$ !write sys$output "need to modify the driver to supply the -1 switch to gas."
+$ !write sys$output "This is required because of a small change in how global"
+$ !write sys$output "constant variables are handled.  Failure to include this"
+$ !write sys$output "will result in linker warning messages about mismatched
+$ !write sys$output "psect attributes."
 $!
 $ C_DEFS :="""VMS"""
 $! C_DEFS :="""VMS""","""const="""
-- 
2.30.2