* Makefile.in (gccspec.o, cppspec.o): Update dependencies.

	* common.opt (L, nodefaultlibs, nostdlib, pg, static): New
	options.
	* config/avr/avr.h (LIBSTDCXX): Remove initial "-l".
	* config/freebsd.h (MATH_LIBRARY_PROFILE): Remove initial "-l".
	* config/i386/djgpp.h (LIBSTDCXX): Remove initial "-l".
	* config/rs6000/aix.h (LIBSTDCXX_STATIC): Remove initial "-l".
	* config/s390/tpf.h (MATH_LIBRARY, LIBSTDCXX): Remove initial
	"-l".
	* cppspec.c: Include opts.h.
	(lang_specific_driver): Use cl_decoded_option structures.
	* doc/tm.texi.in (MATH_LIBRARY): Update documentation.
	* doc/tm.texi: Regenerate.
	* gcc.c (translate_options): Translate -d to -foutput-class-dir=.
	(driver_handle_option): Allow driver options needing no special
	processing.
	(process_command): Decode options before call to
	lang_specific_driver.  Pass decoded options to
	lang_specific_driver.
	* gcc.h (lang_specific_driver): Update prototype.
	* gccspec.c: Include opts.h.
	(lang_specific_driver): Use cl_decoded_option structures.
	* opts-common.c (option_ok_for_language, generate_option,
	generate_option_input_file): New.
	(decode_cmdline_option): Use option_ok_for_language.
	(decode_cmdline_options_to_array): Use generate_option_input_file.
	(handle_generated_option): Use generate_option.
	* opts.h (generate_option, generate_option_input_file): Declare.

cp:
	* Make-lang.in (g++spec.o): Update dependencies.
	* g++spec.c: Include opts.h
	(MATH_LIBRARY, LIBSTDCXX): Remove initial "-l".
	(lang_specific_driver): Use cl_decoded_option structures.

fortran:
	* Make-lang.in (gfortranspec.o): Update dependencies.
	* gfortranspec.c: Include coretypes.h before gcc.h.  Include
	opts.h.
	(MATH_LIBRARY, FORTRAN_LIBRARY): Remove initial "-l".
	(ADD_ARG_LIBGFORTRAN, Option, lookup_option): Remove.
	(g77_xargc): Make unsigned.
	(g77_xargv): Change to g77_x_decoded_options.
	(g77_newargc): Make unsigned.
	(g77_newargv): Change to g77_new_decoded_options.
	(strings_same, options_same): New.
	(append_arg): Use cl_decoded_option structures.
	(append_option): New.
	(add_arg_libgfortran): New.
	(lang_specific_driver): Use cl_decoded_option structures.

java:
	* Make-lang.in (jvspec.o): Update dependencies.
	* jvspec.c: Include opts.h.
	(PARAM_ARG): Remove.
	(find_spec_file): Do not add leading -specs=.
	(lang_specific_driver): Use cl_decoded_option structures.
	* lang.opt (C, CLASSPATH, D, bootclasspath, classpath, encoding,
	extdirs, fmain=, s-bc-abi): New options.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163459 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 168 insertions, 173 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 719658db523..f485d6ff910 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* Make-lang.in (g++spec.o): Update dependencies.
+	* g++spec.c: Include opts.h
+	(MATH_LIBRARY, LIBSTDCXX): Remove initial "-l".
+	(lang_specific_driver): Use cl_decoded_option structures.
+
 2010-08-20  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* call.c: Use FOR_EACH_VEC_ELT.
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 7a605b743aa..a2d34e3c3f3 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -53,7 +53,8 @@ c++: cc1plus$(exeext)
 # Tell GNU make to ignore these if they exist.
 .PHONY: c++
 
-g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) $(CONFIG_H)
+g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) \
+    $(CONFIG_H) opts.h
 	(SHLIB_LINK='$(SHLIB_LINK)'; \
 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
 		$(INCLUDES) $(srcdir)/cp/g++spec.c)
diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c
index 2b8081d9141..9ebf6bc2eae 100644
--- a/gcc/cp/g++spec.c
+++ b/gcc/cp/g++spec.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "gcc.h"
+#include "opts.h"
 
 /* This bit is set if we saw a `-xfoo' language specification.  */
 #define LANGSPEC	(1<<1)
@@ -34,14 +35,14 @@ along with GCC; see the file COPYING3.  If not see
 #define SKIPOPT		(1<<4)
 
 #ifndef MATH_LIBRARY
-#define MATH_LIBRARY "-lm"
+#define MATH_LIBRARY "m"
 #endif
 #ifndef MATH_LIBRARY_PROFILE
 #define MATH_LIBRARY_PROFILE MATH_LIBRARY
 #endif
 
 #ifndef LIBSTDCXX
-#define LIBSTDCXX "-lstdc++"
+#define LIBSTDCXX "stdc++"
 #endif
 #ifndef LIBSTDCXX_PROFILE
 #define LIBSTDCXX_PROFILE LIBSTDCXX
@@ -51,10 +52,11 @@ along with GCC; see the file COPYING3.  If not see
 #endif
 
 void
-lang_specific_driver (int *in_argc, const char *const **in_argv,
+lang_specific_driver (struct cl_decoded_option **in_decoded_options,
+		      unsigned int *in_decoded_options_count,
 		      int *in_added_libraries)
 {
-  int i, j;
+  unsigned int i, j;
 
   /* If nonzero, the user gave us the `-p' or `-pg' flag.  */
   int saw_profile_flag = 0;
@@ -71,12 +73,8 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
      -xc++/-xnone.  */
   int added = 0;
 
-  /* Used to track options that take arguments, so we don't go wrapping
-     those with -xc++/-xnone.  */
-  const char *quote = NULL;
-
   /* The new argument list will be contained in this.  */
-  const char **arglist;
+  struct cl_decoded_option *new_decoded_options;
 
   /* Nonzero if we saw a `-xfoo' language specification on the
      command line.  Used to avoid adding our own -xc++ if the user
@@ -84,10 +82,10 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
   int saw_speclang = 0;
 
   /* "-lm" or "-lmath" if it appears on the command line.  */
-  const char *saw_math = 0;
+  const struct cl_decoded_option *saw_math = NULL;
 
   /* "-lc" if it appears on the command line.  */
-  const char *saw_libc = 0;
+  const struct cl_decoded_option *saw_libc = NULL;
 
   /* An array used to flag each argument that needs a bit set for
      LANGSPEC, MATHLIB, or WITHLIBC.  */
@@ -103,220 +101,206 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
   int shared_libgcc = 1;
 
   /* The total number of arguments with the new stuff.  */
-  int argc;
+  unsigned int argc;
 
   /* The argument list.  */
-  const char *const *argv;
+  struct cl_decoded_option *decoded_options;
 
   /* The number of libraries added in.  */
   int added_libraries;
 
   /* The total number of arguments with the new stuff.  */
-  int num_args = 1;
+  unsigned int num_args = 1;
 
-  argc = *in_argc;
-  argv = *in_argv;
+  argc = *in_decoded_options_count;
+  decoded_options = *in_decoded_options;
   added_libraries = *in_added_libraries;
 
   args = XCNEWVEC (int, argc);
 
   for (i = 1; i < argc; i++)
     {
-      /* If the previous option took an argument, we swallow it here.  */
-      if (quote)
-	{
-	  quote = NULL;
-	  continue;
-	}
+      const char *arg = decoded_options[i].arg;
+      if (decoded_options[i].errors & CL_ERR_MISSING_ARG)
+	continue; /* Avoid examining arguments of options missing them.  */
 
-      /* We don't do this anymore, since we don't get them with minus
-	 signs on them.  */
-      if (argv[i][0] == '\0' || argv[i][1] == '\0')
-	continue;
-
-      if (argv[i][0] == '-')
+      switch (decoded_options[i].opt_index)
 	{
-	  if (strcmp (argv[i], "-nostdlib") == 0
-	      || strcmp (argv[i], "-nodefaultlibs") == 0)
-	    {
-	      library = -1;
-	    }
-	  else if (strcmp (argv[i], MATH_LIBRARY) == 0)
+	case OPT_nostdlib:
+	case OPT_nodefaultlibs:
+	  library = -1;
+	  break;
+
+	case OPT_l:
+	  if (strcmp (arg, MATH_LIBRARY) == 0)
 	    {
 	      args[i] |= MATHLIB;
 	      need_math = 0;
 	    }
-	  else if (strcmp (argv[i], "-lc") == 0)
+	  else if (strcmp (arg, "c") == 0)
 	    args[i] |= WITHLIBC;
-	  else if (strcmp (argv[i], "-pg") == 0 || strcmp (argv[i], "-p") == 0)
-	    saw_profile_flag++;
-	  else if (strncmp (argv[i], "-x", 2) == 0)
-	    {
-	      const char * arg;
-	      if (argv[i][2] != '\0')
-		arg = argv[i]+2;
-	      else if ((argv[i+1]) != NULL)
-		/* We need to swallow arg on next loop.  */
-		quote = arg = argv[i+1];
-  	      else  /* Error condition, message will be printed later.  */
-		arg = "";
-	      if (library == 0
-		  && (strcmp (arg, "c++") == 0
-		      || strcmp (arg, "c++-cpp-output") == 0
-		      || strcmp (arg, "objective-c++") == 0
-		      || strcmp (arg, "objective-c++-cpp-output") == 0))
-		library = 1;
+	  else
+	    /* Unrecognized libraries (e.g. -lfoo) may require libstdc++.  */
+	    library = (library == 0) ? 1 : library;
+	  break;
+
+	case OPT_pg:
+	case OPT_p:
+	  saw_profile_flag++;
+	  break;
+
+	case OPT_x:
+	  if (library == 0
+	      && (strcmp (arg, "c++") == 0
+		  || strcmp (arg, "c++-cpp-output") == 0
+		  || strcmp (arg, "objective-c++") == 0
+		  || strcmp (arg, "objective-c++-cpp-output") == 0))
+	    library = 1;
 		
-	      saw_speclang = 1;
-	    }
-	  else if (strcmp (argv[i], "-ObjC++") == 0)
-	    {
-	      if (library == 0)
-		library = 1;
-	      saw_speclang = 1;
-	    }
+	  saw_speclang = 1;
+	  break;
+
+	case OPT_Xlinker:
+	case OPT_Wl_:
 	  /* Arguments that go directly to the linker might be .o files,
 	     or something, and so might cause libstdc++ to be needed.  */
-	  else if (strcmp (argv[i], "-Xlinker") == 0)
-	    {
-	      quote = argv[i];
-	      if (library == 0)
-		library = 1;
-	    }
-	  else if (strncmp (argv[i], "-Wl,", 4) == 0)
-	    library = (library == 0) ? 1 : library;
-	  /* Unrecognized libraries (e.g. -lfoo) may require libstdc++.  */
-	  else if (strncmp (argv[i], "-l", 2) == 0)
-	    library = (library == 0) ? 1 : library;
-	  else if (((argv[i][2] == '\0'
-		     && strchr ("bBVDUoeTuIYmLiA", argv[i][1]) != NULL)
-		    || strcmp (argv[i], "-Tdata") == 0))
-	    quote = argv[i];
-	  else if ((argv[i][2] == '\0'
-		    && strchr ("cSEM", argv[i][1]) != NULL)
-		   || strcmp (argv[i], "-MM") == 0
-		   || strcmp (argv[i], "-fsyntax-only") == 0)
-	    {
-	      /* Don't specify libraries if we won't link, since that would
-		 cause a warning.  */
-	      library = -1;
-	    }
-	  else if (strcmp (argv[i], "-static") == 0)
-	    static_link = 1;
-	  else if (strcmp (argv[i], "-static-libgcc") == 0)
-	    shared_libgcc = 0;
-	  else if (strcmp (argv[i], "-static-libstdc++") == 0)
-	    {
-	      library = library >= 0 ? 2 : library;
-	      args[i] |= SKIPOPT;
-	    }
-	  else if (DEFAULT_WORD_SWITCH_TAKES_ARG (&argv[i][1]))
-	    i++;
-	  else
-	    /* Pass other options through.  */
-	    continue;
-	}
-      else
-	{
-	  int len;
-
-	  if (saw_speclang)
-	    {
-	      saw_speclang = 0;
+	  if (library == 0)
+	    library = 1;
+	  break;
+
+	case OPT_c:
+	case OPT_S:
+	case OPT_E:
+	case OPT_M:
+	case OPT_MM:
+	case OPT_fsyntax_only:
+	  /* Don't specify libraries if we won't link, since that would
+	     cause a warning.  */
+	  library = -1;
+	  break;
+
+	case OPT_static:
+	  static_link = 1;
+	  break;
+
+	case OPT_static_libgcc:
+	  shared_libgcc = 0;
+	  break;
+
+	case OPT_static_libstdc__:
+	  library = library >= 0 ? 2 : library;
+	  args[i] |= SKIPOPT;
+	  break;
+
+	case OPT_SPECIAL_input_file:
+	  {
+	    int len;
+
+	    /* We don't do this anymore, since we don't get them with minus
+	       signs on them.  */
+	    if (arg[0] == '\0' || arg[1] == '\0')
 	      continue;
-	    }
 
-	  /* If the filename ends in .[chi], put options around it.
-	     But not if a specified -x option is currently active.  */
-	  len = strlen (argv[i]);
-	  if (len > 2
-	      && (argv[i][len - 1] == 'c'
-		  || argv[i][len - 1] == 'i'
-		  || argv[i][len - 1] == 'h')
-	      && argv[i][len - 2] == '.')
-	    {
-	      args[i] |= LANGSPEC;
-	      added += 2;
-	    }
-
-	  /* If we don't know that this is a header file, we might
-	     need to be linking in the libraries.  */
-	  if (library == 0)
-	    {
-	      if ((len <= 2 || strcmp (argv[i] + (len - 2), ".H") != 0)
-		  && (len <= 2 || strcmp (argv[i] + (len - 2), ".h") != 0)
-		  && (len <= 4 || strcmp (argv[i] + (len - 4), ".hpp") != 0)
-		  && (len <= 3 || strcmp (argv[i] + (len - 3), ".hp") != 0)
-		  && (len <= 4 || strcmp (argv[i] + (len - 4), ".hxx") != 0)
-		  && (len <= 4 || strcmp (argv[i] + (len - 4), ".h++") != 0)
-		  && (len <= 4 || strcmp (argv[i] + (len - 4), ".HPP") != 0)
-		  && (len <= 4 || strcmp (argv[i] + (len - 4), ".tcc") != 0)
-		  && (len <= 3 || strcmp (argv[i] + (len - 3), ".hh") != 0))
-		library = 1;
-	    }
+	    if (saw_speclang)
+	      {
+		saw_speclang = 0;
+		continue;
+	      }
+
+	    /* If the filename ends in .[chi], put options around it.
+	       But not if a specified -x option is currently active.  */
+	    len = strlen (arg);
+	    if (len > 2
+		&& (arg[len - 1] == 'c'
+		    || arg[len - 1] == 'i'
+		    || arg[len - 1] == 'h')
+		&& arg[len - 2] == '.')
+	      {
+		args[i] |= LANGSPEC;
+		added += 2;
+	      }
+
+	    /* If we don't know that this is a header file, we might
+	       need to be linking in the libraries.  */
+	    if (library == 0)
+	      {
+		if ((len <= 2 || strcmp (arg + (len - 2), ".H") != 0)
+		    && (len <= 2 || strcmp (arg + (len - 2), ".h") != 0)
+		    && (len <= 4 || strcmp (arg + (len - 4), ".hpp") != 0)
+		    && (len <= 3 || strcmp (arg + (len - 3), ".hp") != 0)
+		    && (len <= 4 || strcmp (arg + (len - 4), ".hxx") != 0)
+		    && (len <= 4 || strcmp (arg + (len - 4), ".h++") != 0)
+		    && (len <= 4 || strcmp (arg + (len - 4), ".HPP") != 0)
+		    && (len <= 4 || strcmp (arg + (len - 4), ".tcc") != 0)
+		    && (len <= 3 || strcmp (arg + (len - 3), ".hh") != 0))
+		  library = 1;
+	      }
+	  }
+	  break;
 	}
     }
 
-  if (quote)
-    fatal_error ("argument to %qs missing", quote);
-
   /* There's no point adding -shared-libgcc if we don't have a shared
      libgcc.  */
 #ifndef ENABLE_SHARED_LIBGCC
   shared_libgcc = 0;
 #endif
 
-  /* Make sure to have room for the trailing NULL argument.
-     Add one for shared_libgcc or extra static library.  */
-  num_args = argc + added + need_math + (library > 0) * 4 + 2;
-  arglist = XNEWVEC (const char *, num_args);
+  /* Add one for shared_libgcc or extra static library.  */
+  num_args = argc + added + need_math + (library > 0) * 4 + 1;
+  new_decoded_options = XNEWVEC (struct cl_decoded_option, num_args);
 
   i = 0;
   j = 0;
 
   /* Copy the 0th argument, i.e., the name of the program itself.  */
-  arglist[i++] = argv[j++];
+  new_decoded_options[j++] = decoded_options[i++];
 
   /* NOTE: We start at 1 now, not 0.  */
   while (i < argc)
     {
-      arglist[j] = argv[i];
+      new_decoded_options[j] = decoded_options[i];
 
       /* Make sure -lstdc++ is before the math library, since libstdc++
 	 itself uses those math routines.  */
       if (!saw_math && (args[i] & MATHLIB) && library > 0)
 	{
 	  --j;
-	  saw_math = argv[i];
+	  saw_math = &decoded_options[i];
 	}
 
       if (!saw_libc && (args[i] & WITHLIBC) && library > 0)
 	{
 	  --j;
-	  saw_libc = argv[i];
+	  saw_libc = &decoded_options[i];
 	}
 
       /* Wrap foo.[chi] files in a language specification to
 	 force the gcc compiler driver to run cc1plus on them.  */
       if (args[i] & LANGSPEC)
 	{
-	  int len = strlen (argv[i]);
-	  switch (argv[i][len - 1])
+	  const char *arg = decoded_options[i].arg;
+	  int len = strlen (arg);
+	  switch (arg[len - 1])
 	    {
 	    case 'c':
-	      arglist[j++] = "-xc++";
+	      generate_option (OPT_x, "c++", 1, CL_DRIVER,
+			       &new_decoded_options[j++]);
 	      break;
 	    case 'i':
-	      arglist[j++] = "-xc++-cpp-output";
+	      generate_option (OPT_x, "c++-cpp-output", 1, CL_DRIVER,
+			       &new_decoded_options[j++]);
 	      break;
 	    case 'h':
-	      arglist[j++] = "-xc++-header";
+	      generate_option (OPT_x, "c++-header", 1, CL_DRIVER,
+			       &new_decoded_options[j++]);
 	      break;
 	    default:
 	      gcc_unreachable ();
 	    }
-	  arglist[j++] = argv[i];
-	  arglist[j] = "-xnone";
+	  new_decoded_options[j++] = decoded_options[i];
+	  generate_option (OPT_x, "none", 1, CL_DRIVER,
+			   &new_decoded_options[j]);
 	}
 
       if ((args[i] & SKIPOPT) != 0)
@@ -332,48 +316,51 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
 #ifdef HAVE_LD_STATIC_DYNAMIC
       if (library > 1 && !static_link)
 	{
-	  arglist[j] = "-Wl,-Bstatic";
+	  generate_option (OPT_Wl_, "-Bstatic", 1, CL_DRIVER,
+			   &new_decoded_options[j]);
 	  j++;
 	}
 #endif
-      arglist[j] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX;
-      if (arglist[j][0] != '-' || arglist[j][1] == 'l')
-	added_libraries++;
+      generate_option (OPT_l,
+		       saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX, 1,
+		       CL_DRIVER, &new_decoded_options[j]);
+      added_libraries++;
       j++;
       /* Add target-dependent static library, if necessary.  */
       if ((static_link || library > 1) && LIBSTDCXX_STATIC != NULL)
 	{
-	  arglist[j] = LIBSTDCXX_STATIC;
-	  if (arglist[j][0] != '-' || arglist[j][1] == 'l')
-	    added_libraries++;
+	  generate_option (OPT_l, LIBSTDCXX_STATIC, 1,
+			   CL_DRIVER, &new_decoded_options[j]);
+	  added_libraries++;
 	  j++;
 	}
 #ifdef HAVE_LD_STATIC_DYNAMIC
       if (library > 1 && !static_link)
 	{
-	  arglist[j] = "-Wl,-Bdynamic";
+	  generate_option (OPT_Wl_, "-Bdynamic", 1, CL_DRIVER,
+			   &new_decoded_options[j]);
 	  j++;
 	}
 #endif
     }
   if (saw_math)
-    arglist[j++] = saw_math;
+    new_decoded_options[j++] = *saw_math;
   else if (library > 0 && need_math)
     {
-      arglist[j] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY;
-      if (arglist[j][0] != '-' || arglist[j][1] == 'l')
-	added_libraries++;
+      generate_option (OPT_l,
+		       saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY,
+		       1, CL_DRIVER, &new_decoded_options[j]);
+      added_libraries++;
       j++;
     }
   if (saw_libc)
-    arglist[j++] = saw_libc;
+    new_decoded_options[j++] = *saw_libc;
   if (shared_libgcc && !static_link)
-    arglist[j++] = "-shared-libgcc";
-
-  arglist[j] = NULL;
+    generate_option (OPT_shared_libgcc, NULL, 1, CL_DRIVER,
+		     &new_decoded_options[j++]);
 
-  *in_argc = j;
-  *in_argv = arglist;
+  *in_decoded_options_count = j;
+  *in_decoded_options = new_decoded_options;
   *in_added_libraries = added_libraries;
 }