This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: NLS vs. rtl.c
- To: Mark Mitchell <mark at codesourcery dot com>
- Subject: Re: NLS vs. rtl.c
- From: Philipp Thomas <pthomas at suse dot de>
- Date: Thu, 29 Jun 2000 12:32:36 +0200
- Cc: gcc-bugs at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- References: <20000628225525Y.mitchell@codesourcery.com> <20000629115147.A10933@Jeffreys.suse.de>
* Philipp Thomas (pthomas@suse.de) [20000629 11:55]:
> 1) I'll revert the changes to rtl.c . It's only used for the gen* programs
> and thus should not use NLS.
>
> 2) I'll only commit changes after doing the required bootstrap.
OK, I didn't bootstrap, but stage1 compiler builds.
Commit like this:
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.
Index: rtl.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/rtl.c,v
retrieving revision 1.71
diff -u -p -r1.71 rtl.c
--- rtl.c 2000/06/28 23:46:27 1.71
+++ rtl.c 2000/06/29 10:22:48
@@ -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
#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
}
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);
Index: gcc.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/gcc.c,v
retrieving revision 1.149
diff -u -p -r1.149 gcc.c
--- gcc.c 2000/06/28 23:46:27 1.149
+++ gcc.c 2000/06/29 10:22:49
@@ -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. */
--
Philipp Thomas <pthomas@suse.de>
Development, SuSE GmbH, Schanzaecker Str. 10, D-90443 Nuremberg, Germany
#define NINODE 50 /* number of in core inodes */
#define NPROC 30 /* max number of processes */
-- Version 7 UNIX for PDP 11, /usr/include/sys/param.h