aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog4
-rw-r--r--ld/ldgram.y5
2 files changed, 8 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 50ba5e2..901ad4b 100644
--- 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 e3504f1..fe248ca 100644
--- 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: