aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2002-04-10 13:00:02 +0000
committerAlan Modra <amodra@gmail.com>2002-04-10 13:00:02 +0000
commitedde18a5779830b43398f9f658f1705c50924fdc (patch)
tree1e10469ba583529ee480b1a0e215857c750697e1
parent8cfda98c96e1f0ed4da4d3fc7f05ab62f80a1bca (diff)
downloadgdb-edde18a5779830b43398f9f658f1705c50924fdc.zip
gdb-edde18a5779830b43398f9f658f1705c50924fdc.tar.gz
gdb-edde18a5779830b43398f9f658f1705c50924fdc.tar.bz2
* as.c (parse_args <OPTION_VERSION>): Use VERSION is
BFD_VERSION_STRING unavailable. * config/tc-i386.c (INLINE): Define (for non-BFD assembler).
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/as.c4
-rw-r--r--gas/config/tc-i386.c8
3 files changed, 18 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 94abdd9..57da62d 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 dab04e9..1a46207 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 2567b4c..1d874af 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));