diff --git a/gcc/f/lang-specs.h b/gcc/f/lang-specs.h
index a51e2a6ba9a..c9419c33e20 100644
--- a/gcc/f/lang-specs.h
+++ b/gcc/f/lang-specs.h
@@ -33,8 +33,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define OO ".o"
 #endif
 
-  {".F", "@f77-cpp-input"},
-  {".fpp", "@f77-cpp-input"},
+  {".F", {"@f77-cpp-input"}},
+  {".fpp", {"@f77-cpp-input"}},
   {"@f77-cpp-input",
      /* For f77 we want -traditional to avoid errors with, for
 	instance, mismatched '.  Also, we avoid unpleasant surprises
@@ -43,7 +43,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 	Sun f77, at least) so you test `__unix' rather than `unix'.
 	-D_LANGUAGE_FORTRAN is used by some compilers like SGI and
 	might as well be in there. */
-   "cpp -lang-c %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
+   {"cpp -lang-c %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
 	%{C:%{!E:%eGNU C does not support -C without using -E}}\
 	%{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
 	-undef -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
@@ -52,7 +52,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 	%c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}} -traditional\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
 	%i %{!M:%{!MM:%{!E:%{!pipe:%g.i}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
-   "%{!M:%{!MM:%{!E:f771 %{!pipe:%g.i} -fset-g77-defaults %(f771) \
+    "%{!M:%{!MM:%{!E:f771 %{!pipe:%g.i} -fset-g77-defaults %(f771) \
 		   %{!Q:-quiet} -dumpbase %b.F %{d*} %{m*} %{a}\
 		   %{g*} %{O*} %{W*} %{w} %{pedantic*} \
 		   %{v:-version -fversion} %{pg:-p} %{p} %{f*} %{I*}\
@@ -61,13 +61,13 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
 	      %{!S:as %a %Y\
 		      %{c:%W{o*}%{!o*:-o %w%b" OO "}}%{!c:-o %d%w%u" OO "}\
-		      %{!pipe:%g.s} %A\n }}}}"},
-  {".r", "@ratfor"},
+		      %{!pipe:%g.s} %A\n }}}}"}},
+  {".r", {"@ratfor"}},
   {"@ratfor",
-   "ratfor %{C} %{v}\
+   {"ratfor %{C} %{v}\
            %{C:%{!E:%eGNU C does not support -C without using -E}}\
            %{!E:%{!pipe:-o %g.f}}%{E:%W{o*}} %i |\n",
-   "%{!E:f771 %{!pipe:%g.f} -fset-g77-defaults %(f771) \
+    "%{!E:f771 %{!pipe:%g.f} -fset-g77-defaults %(f771) \
 	   %{!Q:-quiet} -dumpbase %b.r %{d*} %{m*} %{a}\
 	   %{g*} %{O*} %{W*} %{w} %{pedantic*} \
 	   %{v:-version -fversion} %{pg:-p} %{p} %{f*} %{I*}\
@@ -76,11 +76,11 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 	   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
 	   %{!S:as %a %Y\
 	   %{c:%W{o*}%{!o*:-o %w%b" OO "}}%{!c:-o %d%w%u" OO "}\
-           %{!pipe:%g.s} %A\n }}"},
-  {".f", "@f77"},
-  {".for", "@f77"},
+           %{!pipe:%g.s} %A\n }}"}},
+  {".f", {"@f77"}},
+  {".for", {"@f77"}},
   {"@f77",
-   "%{!M:%{!MM:%{!E:f771 %i -fset-g77-defaults %(f771) \
+   {"%{!M:%{!MM:%{!E:f771 %i -fset-g77-defaults %(f771) \
 		   %{!Q:-quiet} -dumpbase %b.f %{d*} %{m*} %{a}\
 		   %{g*} %{O*} %{W*} %{w} %{pedantic*}\
 		   %{v:-version -fversion} %{pg:-p} %{p} %{f*} %{I*}\
@@ -89,7 +89,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
 	      %{!S:as %a %Y\
 		      %{c:%W{o*}%{!o*:-o %w%b" OO "}}%{!c:-o %d%w%u" OO "}\
-		      %{!pipe:%g.s} %A\n }}}}"},
+		      %{!pipe:%g.s} %A\n }}}}"}},
 
 #undef OO