aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.9/gcc/fortran/gfortranspec.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc-4.9/gcc/fortran/gfortranspec.c')
-rw-r--r--gcc-4.9/gcc/fortran/gfortranspec.c38
1 files changed, 1 insertions, 37 deletions
diff --git a/gcc-4.9/gcc/fortran/gfortranspec.c b/gcc-4.9/gcc/fortran/gfortranspec.c
index a6296efbf..cceee6d2d 100644
--- a/gcc-4.9/gcc/fortran/gfortranspec.c
+++ b/gcc-4.9/gcc/fortran/gfortranspec.c
@@ -73,34 +73,11 @@ static void append_arg (const struct cl_decoded_option *);
static unsigned int g77_newargc;
static struct cl_decoded_option *g77_new_decoded_options;
-/* The path to the spec file. */
-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
- not. */
-static char *
-find_spec_file (const char *dir)
-{
- const char dirsep_string[] = { DIR_SEPARATOR, '\0' };
- char *spec;
- struct stat sb;
-
- spec = XNEWVEC (char, strlen (dir) + sizeof (SPEC_FILE) + 4);
- strcpy (spec, dir);
- strcat (spec, dirsep_string);
- strcat (spec, SPEC_FILE);
- if (!stat (spec, &sb))
- return spec;
- free (spec);
- return NULL;
-}
-
-
/* Return whether strings S1 and S2 are both NULL or both the same
string. */
@@ -313,12 +290,6 @@ For more information about these matters, see the file named COPYING\n\n"));
cool facility for handling --help and --verbose --help. */
return;
- case OPT_L:
- if (!spec_file)
- spec_file = find_spec_file (decoded_options[i].arg);
- break;
-
-
default:
break;
}
@@ -449,12 +420,6 @@ For more information about these matters, see the file named COPYING\n\n"));
#endif
- /* Read the specs file corresponding to libgfortran.
- If we didn't find the spec file on the -L path, we load it
- via lang_specific_pre_link. */
- if (spec_file)
- append_option (OPT_specs_, spec_file, 1);
-
if (verbose && g77_new_decoded_options != g77_x_decoded_options)
{
fprintf (stderr, _("Driving:"));
@@ -473,8 +438,7 @@ For more information about these matters, see the file named COPYING\n\n"));
int
lang_specific_pre_link (void)
{
- free (spec_file);
- if (spec_file == NULL && library)
+ if (library)
do_spec ("%:include(libgfortran.spec)");
return 0;