From d158303227fdca143db5decf983978f635be2ba9 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 3 Sep 2010 22:00:05 +0100
Subject: options.texi (SeparateAlias): Document.

	* doc/options.texi (SeparateAlias): Document.
	* opt-functions.awk (switch_flags): Handle SeparateAlias.
	* opth-gen.awk: Generate enumeration names for options marked
	SeparateAlias, but not for those marked Ignore.
	* opts-common.c (generate_canonical_option): Don't output separate
	argument for options marked CL_SEPARATE_ALIAS.
	(decode_cmdline_option): Handle CL_SEPARATE_ALIAS.
	* opts.h (CL_SEPARATE_ALIAS): New.
	(CL_PARAMS, CL_WARNING, CL_OPTIMIZATION, CL_DRIVER, CL_TARGET,
	CL_COMMON): Adjust definitions.
	* config/i386/darwin.opt, config/mips/sde.opt: New.
	* common.opt (fdump-final-insns): New.
	* config.gcc (i[34567]86-*-darwin*, x86_64-*-darwin*): Add
	i386/darwin.opt.
	(mips*-sde-elf*): Add mips/sde.opt.
	* config/mips/sde.h (DRIVER_SELF_SPECS): Don't handle
	-mno-data-in-code and -mcode-xonly here.
	* defaults.h (DEFAULT_SWITCH_TAKES_ARG): Add 'd'.
	* gcc.c (option_map): Add "j" to --dump entry.
	(translate_options): Don't translate -d to -foutput-class-dir=
	here.

java:
	* lang.opt (d): New.

testsuite:
	* gcc.dg/opts-4.c: New test.

From-SVN: r163844
---
 gcc/gcc.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'gcc/gcc.c')

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 61afb74..479d7da 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1085,7 +1085,7 @@ static const struct option_map option_map[] =
    {"--debug", "-g", "oj"},
    {"--define-macro", "-D", "aj"},
    {"--dependencies", "-M", 0},
-   {"--dump", "-d", "a"},
+   {"--dump", "-d", "aj"},
    {"--dumpbase", "-dumpbase", "a"},
    {"--dumpdir", "-dumpdir", "a"},
    {"--encoding", "-fencoding=", "aj"},
@@ -1368,16 +1368,6 @@ translate_options (int *argcp, const char *const **argvp)
 	  if (nskip + i > argc)
 	    nskip = argc - i;
 
-	  /* Convert -d with a separate argument to
-	     -foutput-class-dir= for Java.  */
-	  if (c == 'd' && p[1] == 0 && argv[i + 1] != NULL)
-	    {
-	      newv[newindex++] = concat ("-foutput-class-dir=", argv[i + 1],
-					 NULL);
-	      nskip = 0;
-	      i += 2;
-	    }
-
 	  while (nskip > 0)
 	    {
 	      newv[newindex++] = argv[i++];
-- 
cgit v1.1