From 0c386769d0bd1caf4df1d48262ebb90488f61d29 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pthomas@suse.de>
Date: Thu, 29 Jun 2000 10:24:19 +0000
Subject: [PATCH] rtl.c: Revert NLS changes.
2000-06-29 Philipp Thomas <pthomas@suse.de>
* rtl.c : Revert NLS changes.
* gcc.c : Fix bug in display_help introced by my last changes.
From-SVN: r34778
---
gcc/ChangeLog | 5 +++++
gcc/gcc.c | 7 ++++---
gcc/rtl.c | 10 +++++-----
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 60cfda039ea2..a3d44c87b085 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-29 Philipp Thomas <pthomas@suse.de>
+
+ * rtl.c : Revert NLS changes.
+ * gcc.c : Fix bug in display_help introced by my last changes.
+
Wed Jun 28 21:09:33 2000 Raja R Harinath <harinath@cs.umn.edu>
* dbxout.c (dbxout_symbol, case RESULT_DECL, VAR_DECL): Use
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 696dbd0eb791..894a40510ec1 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -2846,10 +2846,11 @@ display_help ()
guessing the language based on the file's extension\n\
"), stdout);
- printf (_("\n\
-Options starting with -g, -f, -m, -O or -W are automatically passed on to\n\
+ printf (_("\
+\nOptions starting with -g, -f, -m, -O or -W are automatically passed on to\n\
the various sub-processes invoked by %s. In order to pass other options\n\
-on to these processes the -W<letter> options must be used.\n\"), programname);
+on to these processes the -W<letter> options must be used.\n\
+"), programname);
/* The rest of the options are displayed by invocations of the various
sub-processes. */
diff --git a/gcc/rtl.c b/gcc/rtl.c
index cf889640c052..6c771f695e44 100644
--- a/gcc/rtl.c
+++ b/gcc/rtl.c
@@ -684,18 +684,18 @@ int read_rtx_lineno = 1;
const char *read_rtx_filename = "<unknown>";
static void
-fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msgid, ...))
+fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msg, ...))
{
#ifndef ANSI_PROTOTYPES
FILE *infile;
- const char *msgid;
+ const char *msg;
#endif
va_list ap;
char context[64];
size_t i;
int c;
- VA_START (ap, msgid);
+ VA_START (ap, msg);
#ifndef ANSI_PROTOTYPES
infile = va_arg (ap, FILE *);
@@ -703,7 +703,7 @@ fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msgid, ...))
#endif
fprintf (stderr, "%s:%d: ", read_rtx_filename, read_rtx_lineno);
- vfprintf (stderr, _(msgid), ap);
+ vfprintf (stderr, msg, ap);
putc ('\n', stderr);
/* Gather some following context. */
@@ -718,7 +718,7 @@ fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msgid, ...))
}
context[i] = '\0';
- fprintf (stderr, _("%s:%d: following context is `%s'\n"),
+ fprintf (stderr, "%s:%d: following context is `%s'\n",
read_rtx_filename, read_rtx_lineno, context);
va_end (ap);
--
GitLab