aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <loewis@informatik.hu-berlin.de>1999-12-21 09:31:50 +0000
committerMartin v. Löwis <loewis@gcc.gnu.org>1999-12-21 09:31:50 +0000
commit1948c2d9d2f04c8decb72fb5bf5d351156ed2b65 (patch)
treea2d3219ca0a09989c1c5fef9d4ca658a4d74d43e
parent7768df81d290d0aea9994ca2c994fa65e412e285 (diff)
downloadgcc-1948c2d9d2f04c8decb72fb5bf5d351156ed2b65.zip
gcc-1948c2d9d2f04c8decb72fb5bf5d351156ed2b65.tar.gz
gcc-1948c2d9d2f04c8decb72fb5bf5d351156ed2b65.tar.bz2
dgux.c (struct option): Rename to lang_independent_option.
* config/i386/dgux.c (struct option): Rename to lang_independent_option. (struct m_options): Add description field. (output_options): Rename option type, add sep declaration, output ix86_cpu_string and ix86_arch_string only if set. (output_file_start): Rename option type. From-SVN: r31047
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/config/i386/dgux.c27
2 files changed, 27 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 362b658..6d18c49 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+1999-12-21 Martin v. Löwis <loewis@informatik.hu-berlin.de>
+
+ * config/i386/dgux.c (struct option): Rename to
+ lang_independent_option.
+ (struct m_options): Add description field.
+ (output_options): Rename option type, add sep declaration, output
+ ix86_cpu_string and ix86_arch_string only if set.
+ (output_file_start): Rename option type.
+
Mon Dec 20 23:15:36 1999 Mike Stump <mrs@wrs.com>
* Makefile.in (crtbegin.o, crtend.o, s-crtS): Depend on
diff --git a/gcc/config/i386/dgux.c b/gcc/config/i386/dgux.c
index 638d1e0..55ff824 100644
--- a/gcc/config/i386/dgux.c
+++ b/gcc/config/i386/dgux.c
@@ -1,5 +1,5 @@
/* Subroutines for GNU compiler for Intel 80x86 running DG/ux
- Copyright (C) 1993, 1995, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1995, 1997, 1999 Free Software Foundation, Inc.
Currently maintained by (gcc@dg-rtp.dg.com)
This file is part of GNU CC.
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA. */
extern char *version_string;
-struct option
+struct lang_independent_option
{
char *string;
int *variable;
@@ -51,17 +51,22 @@ output_option (file, sep, type, name, indent, pos, max)
return pos + fprintf (file, "%s%s%s", sep, type, name);
}
-static struct { char *name; int value; } m_options[] = TARGET_SWITCHES;
+static struct {
+ char *name;
+ int value;
+ const char * description;
+} m_options[] = TARGET_SWITCHES;
static void
output_options (file, f_options, f_len, W_options, W_len,
pos, max, sep, indent, term)
FILE *file;
- struct option *f_options;
- struct option *W_options;
+ struct lang_independent_option *f_options;
+ struct lang_independent_option *W_options;
int f_len, W_len;
int pos;
int max;
+ int sep;
char *indent;
char *term;
{
@@ -96,8 +101,12 @@ output_options (file, f_options, f_len, W_options, W_len,
pos = output_option (file, sep, "-m", m_options[j].name,
indent, pos, max);
- pos = output_option (file, sep, "-mcpu=", ix86_cpu_string, indent, pos, max);
- pos = output_option (file, sep, "-march=", ix86_arch_string, indent, pos, max);
+ if (ix86_cpu_string)
+ pos = output_option (file, sep, "-mcpu=", ix86_cpu_string,
+ indent, pos, max);
+ if (ix86_arch_string)
+ pos = output_option (file, sep, "-march=", ix86_arch_string,
+ indent, pos, max);
fprintf (file, term);
}
@@ -106,8 +115,8 @@ output_options (file, f_options, f_len, W_options, W_len,
void
output_file_start (file, f_options, f_len, W_options, W_len)
FILE *file;
- struct option *f_options;
- struct option *W_options;
+ struct lang_independent_option *f_options;
+ struct lang_independent_option *W_options;
int f_len, W_len;
{
register int pos;