From: Alan Modra <amodra@gmail.com>
Date: Wed, 10 Apr 2002 13:00:02 +0000 (+0000)
Subject: 	* as.c (parse_args <OPTION_VERSION>): Use VERSION is
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=edde18a5779830b43398f9f658f1705c50924fdc;p=binutils-gdb.git

	* 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 94abdd96612..57da62d387f 100644
--- 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 dab04e947ef..1a46207258d 100644
--- 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 2567b4c2247..1d874af00cc 100644
--- 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));