From: iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 13 Apr 2010 11:37:34 +0000 (+0000)
Subject: gcc/fortran:
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=ae66030b2bce09379f0b0d6365277a90d9228aa4

gcc/fortran:
2010-04-13  Iain Sandoe  <iains@gcc.gnu.org>

	PR bootstrap/31400
	* gfortranspec.c (lookup_option): Check for -static and return
	OPTION_static.
	(lang_specific_driver): Break when OPTION_static is discovered.



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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4ef8eb97c39..e90da6f627f 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-13  Iain Sandoe  <iains@gcc.gnu.org>
+
+	PR bootstrap/31400
+	* gfortranspec.c (lookup_option): Check for -static and return
+	OPTION_static.
+	(lang_specific_driver): Break when OPTION_static is discovered.
+
 2010-04-12  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	* array.c (extract_element): Restore function from trunk.
diff --git a/gcc/fortran/gfortranspec.c b/gcc/fortran/gfortranspec.c
index b7eccc335fd..413da7b606a 100644
--- a/gcc/fortran/gfortranspec.c
+++ b/gcc/fortran/gfortranspec.c
@@ -186,6 +186,8 @@ lookup_option (Option *xopt, int *xskip, const char **xarg, const char *text)
 	opt = OPTION_syntax_only;
       else if (!strcmp (text, "-static-libgfortran"))
 	opt = OPTION_static_libgfortran;
+      else if (!strcmp (text, "-static"))
+	opt = OPTION_static;
       else if (!strcmp (text, "-fversion"))	/* Really --version!! */
 	opt = OPTION_version;
       else if (!strcmp (text, "-Xlinker") || !strcmp (text, "-specs"))
@@ -351,8 +353,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
 #ifdef HAVE_LD_STATIC_DYNAMIC
 	  static_linking = 1;
 #endif
-	  /* Fall through, count OPTION_static as an item included in
-	     the rewritten command line. */
+	  break;
 
 	case OPTION_l:
 	  ++n_infiles;