* gfortranspec.c (library): New global, moved from ...

	(lang_specific_driver): ... here.
	(lang_specific_pre_link): Test it here before including
	libgfortran.spec.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index db4380f..aa90bcb 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-22  Michael Matz  <matz@suse.de>
+
+       * gfortranspec.c (library): New global, moved from ...
+       (lang_specific_driver): ... here.
+       (lang_specific_pre_link): Test it here before including
+       libgfortran.spec.
+
 2010-11-21  Michael Matz  <matz@suse.de>
            Tobias Burnus  <burnus@net-b.de>
 

diff --git a/gcc/fortran/gfortranspec.c b/gcc/fortran/gfortranspec.c
index d8d9fc2..4bf9bf1 100644 (file)
--- a/gcc/fortran/gfortranspec.c
+++ b/gcc/fortran/gfortranspec.c
@@ -76,7 +76,11 @@ static unsigned int g77_newargc;
 static struct cl_decoded_option *g77_new_decoded_options;
 
 /* The path to the spec file.  */
-char *spec_file = NULL;
+static char *spec_file = NULL;
+
+/* This will be NULL if we encounter a situation where we should not
+   link in the fortran libraries.  */
+static const char *library = NULL;
 
 
 /* Return full path name of spec file if it is in DIR, or NULL if
@@ -207,10 +211,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
   unsigned int i;
   int verbose = 0;
 
-  /* This will be NULL if we encounter a situation where we should not
-     link in libf2c.  */
-  const char *library = FORTRAN_LIBRARY;
-
   /* 0 => -xnone in effect.
      1 => -xfoo in effect.  */
   int saw_speclang = 0;
@@ -233,6 +233,8 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
   int n_infiles = 0;
   int n_outfiles = 0;
 
+  library = FORTRAN_LIBRARY;
+
 #if 0
   fprintf (stderr, "Incoming:");
   for (i = 0; i < argc; i++)
@@ -472,7 +474,7 @@ lang_specific_pre_link (void)
 {
   if (spec_file)
     free (spec_file);
-  else
+  else if (library)
     do_spec ("%:include(libgfortran.spec)");
 
   return 0;