* ldgram.y (section): Reverse the order of memspec_opt and

	fill_opt to avoid an ambiguity when both are used.
	* ld.texinfo: Changed accordingly.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b6667f4144a744e14d6875b8688572e80b04896f..9970d9dd147459d6a4138709363ad4e2e9fa203d 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,9 @@
 Fri Feb 25 19:12:03 1994  Ian Lance Taylor  (ian@cygnus.com)
 
+       * ldgram.y (section): Reverse the order of memspec_opt and
+       fill_opt to avoid an ambiguity when both are used.
+       * ld.texinfo: Changed accordingly.
+
        * ldgram.y: Move include of ldlex.h back with other includes.
        * ldlex.h (input_type): Don't initialize enum constants to
        particular values.

diff --git a/ld/ldgram.y b/ld/ldgram.y
index c4b83b3274daaeb8110b0f8f5303ced32897e49e..0640afee315a879555805ab8e4d9dc3ec84d103b 100644 (file)
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -585,10 +585,10 @@ section:  NAME            { ldlex_expression(); }
                        lang_enter_output_section_statement($1,$3,typebits,0,0,0,$4);
                        }
                statement_list_opt      
-               '}' {ldlex_expression();} fill_opt memspec_opt
+               '}' {ldlex_expression();} memspec_opt fill_opt
                {
                  ldlex_popstate();
-                 lang_leave_output_section_statement($11, $12);
+                 lang_leave_output_section_statement($12, $11);
                }
 opt_comma