* as.c (parse_args <OPTION_VERSION>): Use VERSION is

	BFD_VERSION_STRING unavailable.
	* config/tc-i386.c (INLINE): Define (for non-BFD assembler).

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 94abdd966129d02581d27871b98515b2651cf42a..57da62d387f221705b6a30ca2b587e47b524b174 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-10  Alan Modra  <amodra@bigpond.net.au>
+
+       * as.c (parse_args <OPTION_VERSION>): Use VERSION is
+       BFD_VERSION_STRING unavailable.
+       * config/tc-i386.c (INLINE): Define (for non-BFD assembler).
+
 Tue Apr  9 16:45:48 2002  J"orn Rennecke <joern.rennecke@superh.com>
 
        * config/tc-sh.h (TC_FIX_ADJUSTABLE): Disable adjusting if

diff --git a/gas/as.c b/gas/as.c
index dab04e947ef4cc34d7c0ddddcbb88f3f90b1a9b8..1a46207258dfa5e3958f82c232476d3a8432899c 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -524,7 +524,11 @@ parse_args (pargc, pargv)
 
        case OPTION_VERSION:
          /* This output is intended to follow the GNU standards document.  */
+#ifdef BFD_ASSEMBLER
          printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
+#else
+         printf (_("GNU assembler %s\n"), VERSION);
+#endif
          printf (_("Copyright 2002 Free Software Foundation, Inc.\n"));
          printf (_("\
 This program is free software; you may redistribute it under the terms of\n\

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 2567b4c2247f213cbe036764f0febf07e1e7f1a6..1d874af00ccef9e064a9a3402784141a108c8135 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -58,6 +58,14 @@
 #define DEFAULT_ARCH "i386"
 #endif
 
+#ifndef INLINE
+#if __GNUC__ >= 2
+#define INLINE __inline__
+#else
+#define INLINE
+#endif
+#endif
+
 static INLINE unsigned int mode_from_disp_size PARAMS ((unsigned int));
 static INLINE int fits_in_signed_byte PARAMS ((offsetT));
 static INLINE int fits_in_unsigned_byte PARAMS ((offsetT));