* as.c (show_usage): Break long string into shorter ones.

	(parse_args): Add -v, prints version id and continues.
	* config/tc-mips.c (md_show_usage): Break long string.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 50471a66fa998325a73443a198c6bb085c0f12e3..425cd95500d1ac50883b910e10baaa355be99db9 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,14 @@
+Wed Jun 29 17:30:46 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+       * as.c (show_usage): Break long string into shorter ones.
+       (parse_args): Add -v, prints version id and continues.
+       * config/tc-mips.c (md_show_usage): Break long string.
+
+Mon Jun 27 09:47:16 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+       *  config/tc-i386.c (md_parse_option): Handle "-V" and "-Q" if
+       OBJ_ELF is defined.
+
 Sun Jun 26 16:30:48 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * as.c (main) [HOST_SPECIAL_INIT]: New hook, for host-specific

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 6195e9c3a85ed69727d4b6db3be8f3e178bae0f4..c34cdf440acc64e13964442fa76b568a574b96a1 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -4620,9 +4620,10 @@ mips_ip (str, ip)
                 fashion is that the macro function doesn't expect to
                 see anything which can be handled in a single
                 constant instruction.  */
-             if ((offset_expr.X_op != O_constant
-                  || offset_expr.X_add_number >= 0x8000
-                  || offset_expr.X_add_number < -0x8000)
+             if (c == 0
+                 && (offset_expr.X_op != O_constant
+                     || offset_expr.X_add_number >= 0x8000
+                     || offset_expr.X_add_number < -0x8000)
                  && (mips_pic != EMBEDDED_PIC
                      || offset_expr.X_op != O_subtract
                      || ! S_IS_LOCAL (offset_expr.X_add_symbol)
@@ -5101,7 +5102,8 @@ MIPS options:\n\
 -EL                    generate little endian output\n\
 -g, -g2                        do not remove uneeded NOPs or swap branches\n\
 -G NUM                 allow referencing objects up to NUM bytes\n\
-                       implicitly with the gp register [default 8]\n\
+                       implicitly with the gp register [default 8]\n");
+  fprintf(stream, "\
 -mips1, -mcpu=r{2,3}000        generate code for r2000 and r3000\n\
 -mips2, -mcpu=r6000    generate code for r6000\n\
 -mips3, -mcpu=r4000    generate code for r4000\n\