* windres.c (usage): Report -r option.

(main): Ignore the -r option.
* doc/binutils.texi: Add -r to the list of options.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 14fac0126afd4ca20cd1806d901fe02834808a59..5e436a4312398aac025df323d04fee79fe9e4c49 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-01  Dimitrie O. Paun <dpaun@rogers.com>
+
+       * windres.c (usage): Report -r option.
+       (main): Ignore the -r option.
+       * doc/binutils.texi: Add -r to the list of options.
+
 2003-04-01  Bob Wilson  <bob.wilson@acm.org>
 
        * MAINTAINERS: Add myself as Xtensa maintainer.

diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 4afcb6d45bbeecf367d0334dd2a7ca6a0665fde5..8807eb0bc878d3a2c2656e9b3bdd737d0cbf58d9 100644 (file)
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -2614,6 +2614,9 @@ files named in the @code{rc} file.
 Specify a @option{-D} option to pass to the preprocessor when reading an
 @code{rc} file.
 
+@item -r
+Ignored for compatibility with rc.
+
 @item -v
 Enable verbose mode.  This tells you what the preprocessor is if you
 didn't specify one.

diff --git a/binutils/windres.c b/binutils/windres.c
index 27cc0f0e48575bc68da3371312e0003ab74b6fd4..224a744077e4cf8242e6ec0971f1713b9d3c1e1d 100644 (file)
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -720,6 +720,7 @@ usage (stream, status)
      --yydebug                 Turn on parser debugging\n"));
 #endif
   fprintf (stream, _("\
+  -r                           Ignored for compatibility with rc\n\
   -h --help                    Print this help message\n\
   -V --version                 Print version information\n"));
   fprintf (stream, _("\
@@ -815,7 +816,7 @@ main (argc, argv)
   language = 0x409;   /* LANG_ENGLISH, SUBLANG_ENGLISH_US.  */
   use_temp_file = 0;
 
-  while ((c = getopt_long (argc, argv, "i:o:I:O:F:D:hHvV", long_options,
+  while ((c = getopt_long (argc, argv, "i:o:I:O:F:D:rhHvV", long_options,
                           (int *) 0)) != EOF)
     {
       switch (c)
@@ -864,6 +865,10 @@ main (argc, argv)
            }
          break;
 
+       case 'r':
+         /* Ignored for compatibility with rc */
+         break;
+
        case 'v':
          verbose ++;
          break;