CbC/CbC_gcc: gcc/gcc.c comparison

comparison gcc/gcc.c @ 63:b7f97abdc517 gcc-4.6-20100522

update gcc from gcc-4.5.0 to gcc-4.6

author	ryoma <e075725@ie.u-ryukyu.ac.jp>
date	Mon, 24 May 2010 12:47:05 +0900
parents	77e2b8dfacca
children	f6334be47118

comparison

equal deleted inserted replaced

-:3c8a44c06a95
+:b7f97abdc517
 /* Compiler driver program that can handle many languages.
 Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+2010
 Free Software Foundation, Inc.
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify it under
 /* The compiler version.  */
 static const char *compiler_version;
-/* The target version specified with -V */
+/* The target version.  */
 static const char *const spec_version = DEFAULT_TARGET_VERSION;
-/* The target machine specified with -b.  */
+/* The target machine.  */
 static const char *spec_machine = DEFAULT_TARGET_MACHINE;
 /* Nonzero if cross-compiling.
 When -b is used, the value comes from the `specs' file.  */
 static const char *if_exists_spec_function (int, const char **);
 static const char *if_exists_else_spec_function (int, const char **);
 static const char *replace_outfile_spec_function (int, const char **);
 static const char *version_compare_spec_function (int, const char **);
 static const char *include_spec_function (int, const char **);
+static const char *find_file_spec_function (int, const char **);
 static const char *print_asm_header_spec_function (int, const char **);
 static const char *compare_debug_dump_opt_spec_function (int, const char **);
 static const char *compare_debug_self_opt_spec_function (int, const char **);
 static const char *compare_debug_auxbase_opt_spec_function (int, const char **);
 %{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
 %(linker) \
 %{fuse-linker-plugin: \
 -plugin %(linker_plugin_file) \
 -plugin-opt=%(lto_wrapper) \
--plugin-opt=%(lto_gcc) \
+-plugin-opt=-fresolution=%u.res \
 %{static|static-libgcc:-plugin-opt=-pass-through=%(lto_libgcc)}	\
 %{static:-plugin-opt=-pass-through=-lc}	\
-%{O*:-plugin-opt=-O%*} \
-%{w:-plugin-opt=-w} \
-%{f*:-plugin-opt=-f%*} \
 } \
-%{flto} %{fwhopr} %l " LINK_PIE_SPEC \
+%{flto} %{fwhopr*} %l " LINK_PIE_SPEC \
 "%X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\
 %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
 %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
 %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)} %(mflib)\
 %{fprofile-arcs|fprofile-generate*|coverage:-lgcov}\
 %{MD:-MD %{!o:%b.d}%{o*:%.d%*}}\
 %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}}\
 %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*}\
 %{!E:%{!M:%{!MM:%{!MT:%{!MQ:%{MD|MMD:%{o*:-MQ %*}}}}}}}\
 %{remap} %{g3|ggdb3|gstabs3|gcoff3|gxcoff3|gvms3:-dD}\
+%{!iplugindir*:%{fplugin*:-iplugindir=%:find-file(plugin)}}\
 %{H} %C %{D*&U*&A*} %{i*} %Z %i\
 %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
 %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
 %{E|M|MM:%W{o*}}";
 static const char *cpp_debug_options = "%{d*}";
 /* NB: This is shared amongst all front-ends, except for Ada.  */
 static const char *cc1_options =
 "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
-%1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\
+%{!iplugindir*:%{fplugin*:-iplugindir=%:find-file(plugin)}}\
+%1 %{!Q:-quiet} %{!dumpbase:-dumpbase %B} %{d*} %{m*} %{a*}\
 %{fcompare-debug-second:%:compare-debug-auxbase-opt(%b)} \
 %{!fcompare-debug-second:%{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}}%{!c:%{!S:-auxbase %b}} \
 %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\
 %{v:-version} %{pg:-p} %{p} %{f*} %{undef}\
 %{Qn:-fno-ident} %{--help:--help}\
 {"--debug", "-g", "oj"},
 {"--define-macro", "-D", "aj"},
 {"--dependencies", "-M", 0},
 {"--dump", "-d", "a"},
 {"--dumpbase", "-dumpbase", "a"},
+{"--dumpdir", "-dumpdir", "a"},
 {"--encoding", "-fencoding=", "aj"},
 {"--entry", "-e", 0},
 {"--extra-warnings", "-W", 0},
 {"--extdirs", "-fextdirs=", "aj"},
 {"--for-assembler", "-Wa", "a"},
 { "if-exists",		if_exists_spec_function },
 { "if-exists-else",		if_exists_else_spec_function },
 { "replace-outfile",		replace_outfile_spec_function },
 { "version-compare",		version_compare_spec_function },
 { "include",			include_spec_function },
+{ "find-file",		find_file_spec_function },
 { "print-asm-header",		print_asm_header_spec_function },
 { "compare-debug-dump-opt",	compare_debug_dump_opt_spec_function },
 { "compare-debug-self-opt",	compare_debug_self_opt_spec_function },
 { "compare-debug-auxbase-opt", compare_debug_auxbase_opt_spec_function },
 #ifdef EXTRA_SPEC_FUNCTIONS
 argbuf[argbuf_index] = 0;
 if (strcmp (arg, "-o") == 0)
 have_o_argbuf_index = argbuf_index;
 if (delete_always || delete_failure)
-record_temp_file (arg, delete_always, delete_failure);
+{
+const char *p;
+/* If the temporary file we should delete is specified as
+	 part of a joined argument extract the filename.  */
+if (arg[0] == '-'
+	  && (p = strrchr (arg, '=')))
+	arg = p + 1;
+record_temp_file (arg, delete_always, delete_failure);
+}
 }
 /* Load specs from a file name named FILENAME, replacing occurrences of
 various different types of line-endings, \r\n, \n\r and just \r, with
 a single \n.  */
 	  if (verbose_only_flag)
 	    {
 	      for (j = commands[i].argv; *j; j++)
 		{
 		  const char *p;
-		  fprintf (stderr, " \"");
 		  for (p = *j; *p; ++p)
+		    if (!ISALNUM ((unsigned char) *p)
+			&& *p != '_' && *p != '/' && *p != '-' && *p != '.')
+		      break;
+		  if (*p || !*j)
 		    {
-		      if (*p == '"' || *p == '\\' || *p == '$')
+		      fprintf (stderr, " \"");
-			fputc ('\\', stderr);
+		      for (p = *j; *p; ++p)
-		      fputc (*p, stderr);
+			{
+			  if (*p == '"' || *p == '\\' || *p == '$')
+			    fputc ('\\', stderr);
+			  fputc (*p, stderr);
+			}
+		      fputc ('"', stderr);
 		    }
-		  fputc ('"', stderr);
+		  else
+		    fprintf (stderr, " %s", *j);
 		}
 	    }
 	  else
 	    for (j = commands[i].argv; *j; j++)
 	      fprintf (stderr, " %s", *j);
 is a null-terminated vector containing the following arguments.
 Bits in the `live_cond' field are:
 SWITCH_LIVE to indicate this switch is true in a conditional spec.
 SWITCH_FALSE to indicate this switch is overridden by a later switch.
 SWITCH_IGNORE to indicate this switch should be ignored (used in %<S).
+SWITCH_IGNORE_PERMANENTLY to indicate this switch should be ignored
+in all do_spec calls afterwards.  Used for %<S from self specs.
 The `validated' field is nonzero if any spec has looked at this switch;
 if it remains zero at the end of the run, it must be meaningless.  */
-#define SWITCH_LIVE    0x1
+#define SWITCH_LIVE    			0x1
-#define SWITCH_FALSE   0x2
+#define SWITCH_FALSE   			0x2
-#define SWITCH_IGNORE  0x4
+#define SWITCH_IGNORE			0x4
+#define SWITCH_IGNORE_PERMANENTLY	0x8
 struct switchstr
 {
 const char *part1;
 const char **args;
 fputs (_("  -std=<standard>          Assume that the input sources are for <standard>\n"), stdout);
 fputs (_("\
 --sysroot=<directory>    Use <directory> as the root directory for headers\n\
 and libraries\n"), stdout);
 fputs (_("  -B <directory>           Add <directory> to the compiler's search paths\n"), stdout);
-fputs (_("  -b <machine>             Run gcc for target <machine>, if installed\n"), stdout);
-fputs (_("  -V <version>             Run gcc version number <version>, if installed\n"), stdout);
 fputs (_("  -v                       Display the programs invoked by the compiler\n"), stdout);
 fputs (_("  -###                     Like -v but options quoted and commands not executed\n"), stdout);
 fputs (_("  -E                       Preprocess only; do not compile, assemble or link\n"), stdout);
 fputs (_("  -S                       Compile only; do not assemble or link\n"), stdout);
 fputs (_("  -c                       Compile and assemble, but do not link\n"), stdout);
 	  *temp1 = '\0';
 	  break;
 	}
 }
-/* If there is a -V or -b option (or both), process it now, before
-trying to interpret the rest of the command line.
-Use heuristic that all configuration names must have at least
-one dash '-'. This allows us to pass options starting with -b.  */
-if (argc > 1 && argv[1][0] == '-'
-&& (argv[1][1] == 'V'
-	  || (argv[1][1] == 'b'
-	      && (argv[1][2] == '\0'
-		  || NULL != strchr (argv[1] + 2, '-')))))
-{
-const char *new_version = DEFAULT_TARGET_VERSION;
-const char *new_machine = DEFAULT_TARGET_MACHINE;
-const char *progname = argv[0];
-char **new_argv;
-char *new_argv0;
-int baselen;
-int status = 0;
-int err = 0;
-const char *errmsg;
-while (argc > 1 && argv[1][0] == '-'
-	     && (argv[1][1] == 'V'
-		 || (argv[1][1] == 'b'
-		     && (argv[1][2] == '\0'
-			 || NULL != strchr (argv[1] + 2, '-')))))
-	{
-	  char opt = argv[1][1];
-	  const char *arg;
-	  if (argv[1][2] != '\0')
-	    {
-	      arg = argv[1] + 2;
-	      argc -= 1;
-	      argv += 1;
-	    }
-	  else if (argc > 2)
-	    {
-	      arg = argv[2];
-	      argc -= 2;
-	      argv += 2;
-	    }
-	  else
-	    fatal ("'-%c' option must have argument", opt);
-	  if (opt == 'V')
-	    new_version = arg;
-	  else
-	    new_machine = arg;
-	}
-for (baselen = strlen (progname); baselen > 0; baselen--)
-	if (IS_DIR_SEPARATOR (progname[baselen-1]))
-	  break;
-new_argv0 = XDUPVAR (char, progname, baselen,
-			   baselen + concat_length (new_version, new_machine,
-						    "-gcc-", NULL) + 1);
-strcpy (new_argv0 + baselen, new_machine);
-strcat (new_argv0, "-gcc-");
-strcat (new_argv0, new_version);
-new_argv = XDUPVEC (char *, argv, argc + 1);
-new_argv[0] = new_argv0;
-errmsg = pex_one (PEX_SEARCH, new_argv0, new_argv, progname, NULL,
-			NULL, &status, &err);
-if (errmsg)
-	{
-	  if (err == 0)
-	    fatal ("couldn't run '%s': %s", new_argv0, errmsg);
-	  else
-	    fatal ("couldn't run '%s': %s: %s", new_argv0, errmsg,
-		    xstrerror (err));
-}
-exit (status);
-}
 /* Convert new-style -- options to old-style.  */
 translate_options (&argc,
 		     CONST_CAST2 (const char *const **, const char ***,
 				  &argv));
-/* Do language-specific adjustment/addition of flags.  */
-lang_specific_driver (&argc,
-			CONST_CAST2 (const char *const **, const char ***,
-				     &argv),
-			&added_libraries);
 /* Handle any -no-canonical-prefixes flag early, to assign the function
 that builds relative prefixes.  This function creates default search
 paths that are needed later in normal option handling.  */
 #else
 #endif
 /* From this point onward, gcc_exec_prefix is non-null if the toolchain
 is relocated. The toolchain was either relocated using GCC_EXEC_PREFIX
 or an automatically created GCC_EXEC_PREFIX from argv[0].  */
+/* Do language-specific adjustment/addition of flags.  */
+lang_specific_driver (&argc,
+			CONST_CAST2 (const char *const **, const char ***,
+				     &argv),
+			&added_libraries);
 if (gcc_exec_prefix)
 {
 int len = strlen (gcc_exec_prefix);
 	  const char *p = &argv[i][1];
 	  int c = *p;
 	  switch (c)
 	    {
-	    case 'b':
-	      if (p[1] && NULL == strchr (argv[i] + 2, '-'))
-		goto normal_switch;
-	      /* Fall through.  */
-	    case 'V':
-	      fatal ("'-%c' must come at the start of the command line", c);
-	      break;
 	    case 'B':
 	      {
 		const char *value;
 		int len;
 	  switches[n_switches].live_cond = 0;
 	  switches[n_switches].validated = 0;
 	  switches[n_switches].ordering = 0;
 	  /* These are always valid, since gcc.c itself understands the
-	     first four and gfortranspec.c understands -static-libgfortran.  */
+	     first four, gfortranspec.c understands -static-libgfortran
+	     and g++spec.c understands -static-libstdc++ */
 	  if (!strcmp (p, "save-temps")
 	      || !strcmp (p, "static-libgcc")
 	      || !strcmp (p, "shared-libgcc")
 	      || !strcmp (p, "pipe")
-	      || !strcmp (p, "static-libgfortran"))
+	      || !strcmp (p, "static-libgfortran")
+	      || !strcmp (p, "static-libstdc++"))
 	    switches[n_switches].validated = 1;
 	  else
 	    {
 	      char ch = switches[n_switches].part1[0];
 	      if (ch == 'B')
 	    }
 	  n_switches++;
 	}
 else
 	{
-const char *p = strchr (argv[i], '@');
+const char *p = strrchr (argv[i], '@');
 char *fname;
+	  long offset;
+	  int consumed;
 #ifdef HAVE_TARGET_OBJECT_SUFFIX
 	  argv[i] = convert_filename (argv[i], 0, access (argv[i], F_OK));
 #endif
-if (!p)
+	  /* For LTO static archive support we handle input file
-fname = xstrdup (argv[i]);
+	     specifications that are composed of a filename and
-else
+	     an offset like FNAME@OFFSET.  */
-{
+	  if (p
+	      && p != argv[i]
+	      && sscanf (p, "@%li%n", &offset, &consumed) >= 1
+	      && strlen (p) == (unsigned int)consumed)
+	    {
 fname = (char *)xmalloc (p - argv[i] + 1);
 memcpy (fname, argv[i], p - argv[i]);
 fname[p - argv[i]] = '\0';
-}
+	      /* Only accept non-stdin and existing FNAME parts, otherwise
+		 try with the full name.  */
+	      if (strcmp (fname, "-") == 0 || access (fname, F_OK) < 0)
+		{
+		  free (fname);
+		  fname = xstrdup (argv[i]);
+		}
+	    }
+	  else
+	    fname = xstrdup (argv[i]);
 if (strcmp (fname, "-") != 0 && access (fname, F_OK) < 0)
 {
 perror_with_name (fname);
 error_count++;
 }
 of the switches/n_switches array.  */
 static void
 do_self_spec (const char *spec)
 {
+int i;
 do_spec_2 (spec);
 do_spec_1 (" ", 0, NULL);
+/* Mark %<S switches processed by do_self_spec to be ignored permanently.
+do_self_specs adds the replacements to switches array, so it shouldn't
+be processed afterwards.  */
+for (i = 0; i < n_switches; i++)
+if ((switches[i].live_cond & SWITCH_IGNORE))
+switches[i].live_cond |= SWITCH_IGNORE_PERMANENTLY;
 if (argbuf_index > 0)
 {
-int i;
 switches = XRESIZEVEC (struct switchstr, switches,
 			     n_switches + argbuf_index + 1);
 for (i = 0; i < argbuf_index; i++)
 	{
 	      while (*p != 0 && *p != '\n')
 		p++;
 	      buf = (char *) alloca (p - q + 1);
 	      strncpy (buf, q, p - q);
 	      buf[p - q] = 0;
-	      error ("%s", buf);
+	      error ("%s", _(buf));
 	      return -1;
 	    }
 	    break;
 	  case 'n':
 	    /* %nfoo means report a notice with `foo' on stderr.  */
 	      while (*p != 0 && *p != '\n')
 		p++;
 	      buf = (char *) alloca (p - q + 1);
 	      strncpy (buf, q, p - q);
 	      buf[p - q] = 0;
-	      notice ("%s\n", buf);
+	      notice ("%s\n", _(buf));
 	      if (*p)
 		p++;
 	    }
 	    break;
 /* If we already processed this switch and determined if it was
 live or not, return our past determination.  */
 if (switches[switchnum].live_cond != 0)
 return ((switches[switchnum].live_cond & SWITCH_LIVE) != 0
 	    && (switches[switchnum].live_cond & SWITCH_FALSE) == 0
-	    && (switches[switchnum].live_cond & SWITCH_IGNORE) == 0);
+	    && (switches[switchnum].live_cond & SWITCH_IGNORE_PERMANENTLY)
+	       == 0);
 /* In the common case of {<at-most-one-letter>*}, a negating
 switch would always match, so ignore that case.  We will just
 send the conflicting switches to the compiler phase.  */
 if (prefix_length >= 0 && prefix_length <= 1)
 if (print_version)
 {
 printf (_("%s %s%s\n"), programname, pkgversion_string,
 	      version_string);
-printf ("Copyright %s 2009 Free Software Foundation, Inc.\n",
+printf ("Copyright %s 2010 Free Software Foundation, Inc.\n",
 	      _("(C)"));
 fputs (_("This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"),
 	     stdout);
 if (! verbose_flag)
 if (switch_matches (fuse_linker_plugin,
 			  fuse_linker_plugin + strlen (fuse_linker_plugin), 0))
 	{
 	  linker_plugin_file_spec = find_a_file (&exec_prefixes,
-						 "liblto_plugin.so", X_OK,
+						 "liblto_plugin.so", R_OK,
 						 false);
 	  if (!linker_plugin_file_spec)
 	    fatal ("-fuse-linker-plugin, but liblto_plugin.so not found");
 	  lto_libgcc_spec = find_a_file (&startfile_prefixes, "libgcc.a",
 read_specs (file ? file : argv[0], FALSE);
 return NULL;
 }
+/* %:find-file spec function.  This function replace its argument by
+the file found thru find_file, that is the -print-file-name gcc
+program option. */
+static const char *
+find_file_spec_function (int argc, const char**argv)
+{
+const char *file;
+if (argc != 1)
+abort ();
+file = find_file (argv[0]);
+return file;
+}
 /* %:print-asm-header spec function.  Print a banner to say that the
 following output is from the assembler.  */
 static const char *
 print_asm_header_spec_function (int arg ATTRIBUTE_UNUSED,

Mercurial > hg > CbC > CbC_gcc

comparison gcc/gcc.c @ 63:b7f97abdc517 gcc-4.6-20100522