re PR fortran/18428 (No preprocessing option -cpp for gfortran)

gcc:
2008-05-26  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/18428
	* c.opt: Removed undocumented option '-lang-fortran'.
	* c-common.h: Removed global variable 'lang_fortran'.
	* c-opts.c (c_common_handle_option): Removed code to handle
	option '-lang-fortran'. Updated includes.
	* c-cppbuiltin.c (c_cpp_builtins): Removed conditional
	definition of '__GFORTRAN__'.
	(define__GNUC__): Reimplemented to use BASEVER and
	cpp_define_formatted.
	(builtin_define_with_value_n): Removed.
	* c-incpath.h: Renamed to ...
	* incpath.h: ... this.
	* c-incpath.c: Renamed to ...
	* incpath.c: ... this. Updated includes.
	* fix-header.c: Updated includes.
	* Makefile.in: Replaced c-incpath.[ch] by incpath.[ch].
	(c-cppbuiltin.o): Added dependency on and definition of BASEVER.
	(OBJ-archive): Added cppdefault.o, incpath.o and prefix.o.


gcc/cp:
2008-05-26  Daniel Franke  <franke.daniel@gmail.com>

	* Makefile.in: Adjusted dependencies on c-incpath.o.


gcc/fortran:
2008-05-26  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/18428
	* lang.opt (A, C, CC, D, E, H, P, U, cpp, d, fworking-directory,
	imultilib, iprefix, iquote, isysroot, isystem, nocpp, nostdinc,
	o, undef, v): New options.
	* options.c (gfc_init_options): Also initialize preprocessor
	options.
	(gfc_post_options): Also handle post-initialization of preprocessor
	options.
	(gfc_handle_option): Check if option is a preprocessor option.
	If yes, let gfc_cpp_handle_option() handle the option.
	* lang-specs.h: Reorganized to handle new options.
	* scanner.c (gfc_new_file): Read temporary file instead of
	input source if preprocessing is enabled.
	* f95-lang.c (gfc_init): Initialize preprocessor.
	(gfc_finish): Clean up preprocessor.
	* cpp.c: New.
	* cpp.h: New.
	* Make-lang.in: Added new objects and dependencies.
	* gfortran.texi: Updated section "Preprocessing and
	conditional compilation".
	* invoke.texi: Added new section "Preprocessing Options",
	listed and documented the preprocessing options handled by gfortran.

From-SVN: r135882

1 files changed, 0 insertions, 473 deletions

diff --git a/gcc/c-incpath.c b/gcc/c-incpath.c
deleted file mode 100644
index 4d055542..0000000
--- a/gcc/c-incpath.c
+++ /dev/null
@@ -1,473 +0,0 @@
-/* Set up combined include path chain for the preprocessor.
-   Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
-
-   Broken out of cppinit.c and cppfiles.c and rewritten Mar 2003.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING3.  If not see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "machmode.h"
-#include "target.h"
-#include "tm.h"
-#include "cpplib.h"
-#include "prefix.h"
-#include "intl.h"
-#include "c-incpath.h"
-#include "cppdefault.h"
-
-/* Windows does not natively support inodes, and neither does MSDOS.
-   Cygwin's emulation can generate non-unique inodes, so don't use it.
-   VMS has non-numeric inodes.  */
-#ifdef VMS
-# define INO_T_EQ(A, B) (!memcmp (&(A), &(B), sizeof (A)))
-# define INO_T_COPY(DEST, SRC) memcpy(&(DEST), &(SRC), sizeof (SRC))
-#elif !((defined _WIN32 && !defined (_UWIN)) || defined __MSDOS__)
-# define INO_T_EQ(A, B) ((A) == (B))
-# define INO_T_COPY(DEST, SRC) (DEST) = (SRC)
-#endif
-
-#if defined INO_T_EQ
-#define DIRS_EQ(A, B) ((A)->dev == (B)->dev \
-	&& INO_T_EQ((A)->ino, (B)->ino))
-#else
-#define DIRS_EQ(A, B) (!strcasecmp ((A)->name, (B)->name))
-#endif
-
-static const char dir_separator_str[] = { DIR_SEPARATOR, 0 };
-
-static void add_env_var_paths (const char *, int);
-static void add_standard_paths (const char *, const char *, const char *, int);
-static void free_path (struct cpp_dir *, int);
-static void merge_include_chains (const char *, cpp_reader *, int);
-static void add_sysroot_to_chain (const char *, int);
-static struct cpp_dir *remove_duplicates (cpp_reader *, struct cpp_dir *,
-					   struct cpp_dir *,
-					   struct cpp_dir *, int);
-
-/* Include chains heads and tails.  */
-static struct cpp_dir *heads[4];
-static struct cpp_dir *tails[4];
-static bool quote_ignores_source_dir;
-enum { REASON_QUIET = 0, REASON_NOENT, REASON_DUP, REASON_DUP_SYS };
-
-/* Free an element of the include chain, possibly giving a reason.  */
-static void
-free_path (struct cpp_dir *path, int reason)
-{
-  switch (reason)
-    {
-    case REASON_DUP:
-    case REASON_DUP_SYS:
-      fprintf (stderr, _("ignoring duplicate directory \"%s\"\n"), path->name);
-      if (reason == REASON_DUP_SYS)
-	fprintf (stderr,
- _("  as it is a non-system directory that duplicates a system directory\n"));
-      break;
-
-    case REASON_NOENT:
-      fprintf (stderr, _("ignoring nonexistent directory \"%s\"\n"),
-	       path->name);
-      break;
-
-    case REASON_QUIET:
-    default:
-      break;
-    }
-
-  free (path->name);
-  free (path);
-}
-
-/* Read ENV_VAR for a PATH_SEPARATOR-separated list of file names; and
-   append all the names to the search path CHAIN.  */
-static void
-add_env_var_paths (const char *env_var, int chain)
-{
-  char *p, *q, *path;
-
-  GET_ENVIRONMENT (q, env_var);
-
-  if (!q)
-    return;
-
-  for (p = q; *q; p = q + 1)
-    {
-      q = p;
-      while (*q != 0 && *q != PATH_SEPARATOR)
-	q++;
-
-      if (p == q)
-	path = xstrdup (".");
-      else
-	{
-	  path = XNEWVEC (char, q - p + 1);
-	  memcpy (path, p, q - p);
-	  path[q - p] = '\0';
-	}
-
-      add_path (path, chain, chain == SYSTEM, false);
-    }
-}
-
-/* Append the standard include chain defined in cppdefault.c.  */
-static void
-add_standard_paths (const char *sysroot, const char *iprefix,
-		    const char *imultilib, int cxx_stdinc)
-{
-  const struct default_include *p;
-  int relocated = cpp_relocated();
-  size_t len;
-
-  if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
-    {
-      /* Look for directories that start with the standard prefix.
-	 "Translate" them, i.e. replace /usr/local/lib/gcc... with
-	 IPREFIX and search them first.  */
-      for (p = cpp_include_defaults; p->fname; p++)
-	{
-	  if (!p->cplusplus || cxx_stdinc)
-	    {
-	      /* Should we be translating sysrooted dirs too?  Assume
-		 that iprefix and sysroot are mutually exclusive, for
-		 now.  */
-	      if (sysroot && p->add_sysroot)
-		continue;
-	      if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
-		{
-		  char *str = concat (iprefix, p->fname + len, NULL);
-		  if (p->multilib && imultilib)
-		    str = concat (str, dir_separator_str, imultilib, NULL);
-		  add_path (str, SYSTEM, p->cxx_aware, false);
-		}
-	    }
-	}
-    }
-
-  for (p = cpp_include_defaults; p->fname; p++)
-    {
-      if (!p->cplusplus || cxx_stdinc)
-	{
-	  char *str;
-
-	  /* Should this directory start with the sysroot?  */
-	  if (sysroot && p->add_sysroot)
-	    str = concat (sysroot, p->fname, NULL);
-	  else if (!p->add_sysroot && relocated
-		   && strncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len) == 0)
-	    {
- 	      static const char *relocated_prefix;
-	      /* If this path starts with the configure-time prefix, 
-		 but the compiler has been relocated, replace it 
-		 with the run-time prefix.  The run-time exec prefix
-		 is GCC_EXEC_PREFIX.  Compute the path from there back
-		 to the toplevel prefix.  */
-	      if (!relocated_prefix)
-		{
-		  char *dummy;
-		  /* Make relative prefix expects the first argument
-		     to be a program, not a directory.  */
-		  dummy = concat (gcc_exec_prefix, "dummy", NULL);
-		  relocated_prefix 
-		    = make_relative_prefix (dummy,
-					    cpp_EXEC_PREFIX,
-					    cpp_PREFIX);
-		}
-	      str = concat (relocated_prefix,
-			    p->fname + cpp_PREFIX_len, 
-			    NULL);
-	      str = update_path (str, p->component);
-	    }
-	  else
-	    str = update_path (p->fname, p->component);
-
-	  if (p->multilib && imultilib)
-	    str = concat (str, dir_separator_str, imultilib, NULL);
-
-	  add_path (str, SYSTEM, p->cxx_aware, false);
-	}
-    }
-}
-
-/* For each duplicate path in chain HEAD, keep just the first one.
-   Remove each path in chain HEAD that also exists in chain SYSTEM.
-   Set the NEXT pointer of the last path in the resulting chain to
-   JOIN, unless it duplicates JOIN in which case the last path is
-   removed.  Return the head of the resulting chain.  Any of HEAD,
-   JOIN and SYSTEM can be NULL.  */
-
-static struct cpp_dir *
-remove_duplicates (cpp_reader *pfile, struct cpp_dir *head,
-		   struct cpp_dir *system, struct cpp_dir *join,
-		   int verbose)
-{
-  struct cpp_dir **pcur, *tmp, *cur;
-  struct stat st;
-
-  for (pcur = &head; *pcur; )
-    {
-      int reason = REASON_QUIET;
-
-      cur = *pcur;
-
-      if (stat (cur->name, &st))
-	{
-	  /* Dirs that don't exist are silently ignored, unless verbose.  */
-	  if (errno != ENOENT)
-	    cpp_errno (pfile, CPP_DL_ERROR, cur->name);
-	  else
-	    {
-	      /* If -Wmissing-include-dirs is given, warn.  */
-	      cpp_options *opts = cpp_get_options (pfile);
-	      if (opts->warn_missing_include_dirs && cur->user_supplied_p)
-		cpp_errno (pfile, CPP_DL_WARNING, cur->name);
-	      reason = REASON_NOENT;
-	    }
-	}
-      else if (!S_ISDIR (st.st_mode))
-	cpp_error_with_line (pfile, CPP_DL_ERROR, 0, 0,
-			     "%s: not a directory", cur->name);
-      else
-	{
-#if defined (INO_T_COPY)
-	  INO_T_COPY (cur->ino, st.st_ino);
-	  cur->dev  = st.st_dev;
-#endif
-
-	  /* Remove this one if it is in the system chain.  */
-	  reason = REASON_DUP_SYS;
-	  for (tmp = system; tmp; tmp = tmp->next)
-	   if (DIRS_EQ (tmp, cur) && cur->construct == tmp->construct)
-	      break;
-
-	  if (!tmp)
-	    {
-	      /* Duplicate of something earlier in the same chain?  */
-	      reason = REASON_DUP;
-	      for (tmp = head; tmp != cur; tmp = tmp->next)
-	       if (DIRS_EQ (cur, tmp) && cur->construct == tmp->construct)
-		  break;
-
-	      if (tmp == cur
-		  /* Last in the chain and duplicate of JOIN?  */
-		  && !(cur->next == NULL && join
-		       && DIRS_EQ (cur, join)
-		       && cur->construct == join->construct))
-		{
-		  /* Unique, so keep this directory.  */
-		  pcur = &cur->next;
-		  continue;
-		}
-	    }
-	}
-
-      /* Remove this entry from the chain.  */
-      *pcur = cur->next;
-      free_path (cur, verbose ? reason: REASON_QUIET);
-    }
-
-  *pcur = join;
-  return head;
-}
-
-/* Add SYSROOT to any user-supplied paths in CHAIN starting with
-   "=".  */
-
-static void
-add_sysroot_to_chain (const char *sysroot, int chain)
-{
-  struct cpp_dir *p;
-
-  for (p = heads[chain]; p != NULL; p = p->next)
-    if (p->name[0] == '=' && p->user_supplied_p)
-      p->name = concat (sysroot, p->name + 1, NULL);
-}
-
-/* Merge the four include chains together in the order quote, bracket,
-   system, after.  Remove duplicate dirs (determined in
-   system-specific manner).
-
-   We can't just merge the lists and then uniquify them because then
-   we may lose directories from the <> search path that should be
-   there; consider -iquote foo -iquote bar -Ifoo -Iquux.  It is
-   however safe to treat -iquote bar -iquote foo -Ifoo -Iquux as if
-   written -iquote bar -Ifoo -Iquux.  */
-
-static void
-merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
-{
-  /* Add the sysroot to user-supplied paths starting with "=".  */
-  if (sysroot)
-    {
-      add_sysroot_to_chain (sysroot, QUOTE);
-      add_sysroot_to_chain (sysroot, BRACKET);
-      add_sysroot_to_chain (sysroot, SYSTEM);
-      add_sysroot_to_chain (sysroot, AFTER);
-    }
-
-  /* Join the SYSTEM and AFTER chains.  Remove duplicates in the
-     resulting SYSTEM chain.  */
-  if (heads[SYSTEM])
-    tails[SYSTEM]->next = heads[AFTER];
-  else
-    heads[SYSTEM] = heads[AFTER];
-  heads[SYSTEM] = remove_duplicates (pfile, heads[SYSTEM], 0, 0, verbose);
-
-  /* Remove duplicates from BRACKET that are in itself or SYSTEM, and
-     join it to SYSTEM.  */
-  heads[BRACKET] = remove_duplicates (pfile, heads[BRACKET], heads[SYSTEM],
-				      heads[SYSTEM], verbose);
-
-  /* Remove duplicates from QUOTE that are in itself or SYSTEM, and
-     join it to BRACKET.  */
-  heads[QUOTE] = remove_duplicates (pfile, heads[QUOTE], heads[SYSTEM],
-				    heads[BRACKET], verbose);
-
-  /* If verbose, print the list of dirs to search.  */
-  if (verbose)
-    {
-      struct cpp_dir *p;
-
-      fprintf (stderr, _("#include \"...\" search starts here:\n"));
-      for (p = heads[QUOTE];; p = p->next)
-	{
-	  if (p == heads[BRACKET])
-	    fprintf (stderr, _("#include <...> search starts here:\n"));
-	  if (!p)
-	    break;
-	  fprintf (stderr, " %s\n", p->name);
-	}
-      fprintf (stderr, _("End of search list.\n"));
-    }
-}
-
-/* Use given -I paths for #include "..." but not #include <...>, and
-   don't search the directory of the present file for #include "...".
-   (Note that -I. -I- is not the same as the default setup; -I. uses
-   the compiler's working dir.)  */
-void
-split_quote_chain (void)
-{
-  heads[QUOTE] = heads[BRACKET];
-  tails[QUOTE] = tails[BRACKET];
-  heads[BRACKET] = NULL;
-  tails[BRACKET] = NULL;
-  /* This is NOT redundant.  */
-  quote_ignores_source_dir = true;
-}
-
-/* Add P to the chain specified by CHAIN.  */
-
-void
-add_cpp_dir_path (cpp_dir *p, int chain)
-{
-  if (tails[chain])
-    tails[chain]->next = p;
-  else
-    heads[chain] = p;
-  tails[chain] = p;
-}
-
-/* Add PATH to the include chain CHAIN. PATH must be malloc-ed and
-   NUL-terminated.  */
-void
-add_path (char *path, int chain, int cxx_aware, bool user_supplied_p)
-{
-  cpp_dir *p;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Remove unnecessary trailing slashes.  On some versions of MS
-     Windows, trailing  _forward_ slashes cause no problems for stat().
-     On newer versions, stat() does not recognize a directory that ends
-     in a '\\' or '/', unless it is a drive root dir, such as "c:/",
-     where it is obligatory.  */
-  int pathlen = strlen (path);
-  char* end = path + pathlen - 1;
-  /* Preserve the lead '/' or lead "c:/".  */
-  char* start = path + (pathlen > 2 && path[1] == ':' ? 3 : 1);
-  
-  for (; end > start && IS_DIR_SEPARATOR (*end); end--)
-    *end = 0;
-#endif
-
-  p = XNEW (cpp_dir);
-  p->next = NULL;
-  p->name = path;
-  if (chain == SYSTEM || chain == AFTER)
-    p->sysp = 1 + !cxx_aware;
-  else
-    p->sysp = 0;
-  p->construct = 0;
-  p->user_supplied_p = user_supplied_p;
-
-  add_cpp_dir_path (p, chain);
-}
-
-/* Exported function to handle include chain merging, duplicate
-   removal, and registration with cpplib.  */
-void
-register_include_chains (cpp_reader *pfile, const char *sysroot,
-			 const char *iprefix, const char *imultilib,
-			 int stdinc, int cxx_stdinc, int verbose)
-{
-  static const char *const lang_env_vars[] =
-    { "C_INCLUDE_PATH", "CPLUS_INCLUDE_PATH",
-      "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH" };
-  cpp_options *cpp_opts = cpp_get_options (pfile);
-  size_t idx = (cpp_opts->objc ? 2: 0);
-
-  if (cpp_opts->cplusplus)
-    idx++;
-  else
-    cxx_stdinc = false;
-
-  /* CPATH and language-dependent environment variables may add to the
-     include chain.  */
-  add_env_var_paths ("CPATH", BRACKET);
-  add_env_var_paths (lang_env_vars[idx], SYSTEM);
-
-  target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc);
-
-  /* Finally chain on the standard directories.  */
-  if (stdinc)
-    add_standard_paths (sysroot, iprefix, imultilib, cxx_stdinc);
-
-  target_c_incpath.extra_includes (sysroot, iprefix, stdinc);
-
-  merge_include_chains (sysroot, pfile, verbose);
-
-  cpp_set_include_chains (pfile, heads[QUOTE], heads[BRACKET],
-			  quote_ignores_source_dir);
-}
-#if !(defined TARGET_EXTRA_INCLUDES) || !(defined TARGET_EXTRA_PRE_INCLUDES)
-static void hook_void_charptr_charptr_int (const char *sysroot ATTRIBUTE_UNUSED,
-					   const char *iprefix ATTRIBUTE_UNUSED,
-					   int stdinc ATTRIBUTE_UNUSED)
-{
-}
-#endif
-
-#ifndef TARGET_EXTRA_INCLUDES
-#define TARGET_EXTRA_INCLUDES hook_void_charptr_charptr_int
-#endif
-#ifndef TARGET_EXTRA_PRE_INCLUDES
-#define TARGET_EXTRA_PRE_INCLUDES hook_void_charptr_charptr_int
-#endif
-
-struct target_c_incpath_s target_c_incpath = { TARGET_EXTRA_PRE_INCLUDES, TARGET_EXTRA_INCLUDES };
-