aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2003-04-03 13:40:51 +0000
committerNick Clifton <nickc@redhat.com>2003-04-03 13:40:51 +0000
commit29b058f1b4ae3e45a4c62c94981bdfe7ddb117bc (patch)
tree47181c35e971c3015a5c5a7246844367482fe0f9
parentff0c9faf3be91184df2cd4cd2ebefc23cd08382c (diff)
downloadgdb-29b058f1b4ae3e45a4c62c94981bdfe7ddb117bc.zip
gdb-29b058f1b4ae3e45a4c62c94981bdfe7ddb117bc.tar.gz
gdb-29b058f1b4ae3e45a4c62c94981bdfe7ddb117bc.tar.bz2
Add -U for compatibility with wrc, rc, and cpp. Just pass the -U option down
to the preprocessor.
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/doc/binutils.texi5
-rw-r--r--binutils/windres.c44
3 files changed, 31 insertions, 24 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5e436a4..5fd0fe8 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-03 Dimitrie O. Paun <dpaun@rogers.com>
+
+ * windres.c: Add -U for compatibility with wrc, rc, and cpp.
+ (main): Just pass the -U option down to the preprocessor.
+ * doc/binutils.texi: Added -U to the list of options.
+
2003-04-01 Dimitrie O. Paun <dpaun@rogers.com>
* windres.c (usage): Report -r option.
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 8807eb0..91277a0 100644
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -2614,6 +2614,11 @@ files named in the @code{rc} file.
Specify a @option{-D} option to pass to the preprocessor when reading an
@code{rc} file.
+@item -U @var{target}
+@itemx --undefine @var{sym}
+Specify a @option{-U} option to pass to the preprocessor when reading an
+@code{rc} file.
+
@item -r
Ignored for compatibility with rc.
diff --git a/binutils/windres.c b/binutils/windres.c
index 224a744..2e84617 100644
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -1,5 +1,6 @@
/* windres.c -- a program to manipulate Windows resources
- Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003
+ Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support.
This file is part of GNU Binutils.
@@ -31,9 +32,7 @@
* The rcl program, written by Gunther Ebert
<gunther.ebert@ixos-leipzig.de>.
- * The res2coff program, written by Pedro A. Aranda <paag@tid.es>.
-
- */
+ * The res2coff program, written by Pedro A. Aranda <paag@tid.es>. */
#include "bfd.h"
#include "getopt.h"
@@ -42,11 +41,10 @@
#include "safe-ctype.h"
#include "obstack.h"
#include "windres.h"
-
#include <assert.h>
#include <time.h>
-/* used by resrc.c at least */
+/* Used by resrc.c at least. */
int verbose = 0;
@@ -108,19 +106,18 @@ static struct include_dir *include_dirs;
/* 150 isn't special; it's just an arbitrary non-ASCII char value. */
-#define OPTION_DEFINE 150
-#define OPTION_HELP (OPTION_DEFINE + 1)
-#define OPTION_INCLUDE_DIR (OPTION_HELP + 1)
-#define OPTION_LANGUAGE (OPTION_INCLUDE_DIR + 1)
-#define OPTION_PREPROCESSOR (OPTION_LANGUAGE + 1)
-#define OPTION_USE_TEMP_FILE (OPTION_PREPROCESSOR + 1)
-#define OPTION_NO_USE_TEMP_FILE (OPTION_USE_TEMP_FILE + 1)
-#define OPTION_VERSION (OPTION_NO_USE_TEMP_FILE + 1)
-#define OPTION_YYDEBUG (OPTION_VERSION + 1)
+#define OPTION_HELP 150
+#define OPTION_INCLUDE_DIR (OPTION_HELP + 1)
+#define OPTION_LANGUAGE (OPTION_INCLUDE_DIR + 1)
+#define OPTION_PREPROCESSOR (OPTION_LANGUAGE + 1)
+#define OPTION_USE_TEMP_FILE (OPTION_PREPROCESSOR + 1)
+#define OPTION_NO_USE_TEMP_FILE (OPTION_USE_TEMP_FILE + 1)
+#define OPTION_VERSION (OPTION_NO_USE_TEMP_FILE + 1)
+#define OPTION_YYDEBUG (OPTION_VERSION + 1)
static const struct option long_options[] =
{
- {"define", required_argument, 0, OPTION_DEFINE},
+ {"define", required_argument, 0, 'D'},
{"help", no_argument, 0, OPTION_HELP},
{"include-dir", required_argument, 0, OPTION_INCLUDE_DIR},
{"input-format", required_argument, 0, 'I'},
@@ -128,6 +125,7 @@ static const struct option long_options[] =
{"output-format", required_argument, 0, 'O'},
{"preprocessor", required_argument, 0, OPTION_PREPROCESSOR},
{"target", required_argument, 0, 'F'},
+ {"undefine", required_argument, 0, 'U'},
{"use-temp-file", no_argument, 0, OPTION_USE_TEMP_FILE},
{"no-use-temp-file", no_argument, 0, OPTION_NO_USE_TEMP_FILE},
{"verbose", no_argument, 0, 'v'},
@@ -710,6 +708,7 @@ usage (stream, status)
--preprocessor=<program> Program to use to preprocess rc file\n\
--include-dir=<dir> Include directory when preprocessing rc file\n\
-D --define <sym>[=<val>] Define SYM when preprocessing rc file\n\
+ -U --undefine <sym> Undefine SYM when preprocessing rc file\n\
-v --verbose Verbose - tells you what it's doing\n\
--language=<val> Set language when reading rc file\n\
--use-temp-file Use a temporary file instead of popen to read\n\
@@ -816,7 +815,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:rhHvV", long_options,
+ while ((c = getopt_long (argc, argv, "i:o:I:O:F:D:U:rhHvV", long_options,
(int *) 0)) != EOF)
{
switch (c)
@@ -846,12 +845,12 @@ main (argc, argv)
break;
case 'D':
- case OPTION_DEFINE:
+ case 'U':
if (preprocargs == NULL)
{
quotedarg = quot (optarg);
preprocargs = xmalloc (strlen (quotedarg) + 3);
- sprintf (preprocargs, "-D%s", quotedarg);
+ sprintf (preprocargs, "-%c%s", c, quotedarg);
}
else
{
@@ -859,14 +858,14 @@ main (argc, argv)
quotedarg = quot (optarg);
n = xmalloc (strlen (preprocargs) + strlen (quotedarg) + 4);
- sprintf (n, "%s -D%s", preprocargs, quotedarg);
+ sprintf (n, "%s -%c%s", preprocargs, c, quotedarg);
free (preprocargs);
preprocargs = n;
}
break;
case 'r':
- /* Ignored for compatibility with rc */
+ /* Ignored for compatibility with rc. */
break;
case 'v':
@@ -972,7 +971,6 @@ main (argc, argv)
}
/* Read the input file. */
-
switch (input_format)
{
default:
@@ -994,11 +992,9 @@ main (argc, argv)
/* Sort the resources. This is required for COFF, convenient for
rc, and unimportant for res. */
-
resources = sort_resources (resources);
/* Write the output file. */
-
reswr_init ();
switch (output_format)