* ldgram.y: Include ldlex.h after %token decls, for byacc.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 50ba5e24e5c49887535b7fd694b18027d93cbb6a..901ad4bb5ddb2c2539457f3da76100773041a39e 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 25 18:13:46 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+       * ldgram.y: Include ldlex.h after %token decls, for byacc.
+
 Fri Feb 25 10:47:25 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
         * emultempl/hppaelf.em: First attempt to clean this file up.

diff --git a/ld/ldgram.y b/ld/ldgram.y
index e3504f1ac5717a95cfa929fa43ebf0f73dd2a317..fe248cada01d0df7edbe2fd1c26b4c57abc61457 100644 (file)
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -37,7 +37,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "ldmisc.h"
 #include "ldmain.h"
 #include "mri.h"
-#include "ldlex.h"
 
 #define YYDEBUG 1
 
@@ -114,6 +113,10 @@ static int error_index;
 %token FORMAT PUBLIC DEFSYMEND BASE ALIAS TRUNCATE REL
 %token INPUT_SCRIPT INPUT_MRI_SCRIPT INPUT_DEFSYM
 
+%{
+/* For byacc, this has to come after INPUT_SCRIPT et al. are defined.  */
+#include "ldlex.h"
+%}
 %%
 
 file: