diff --git a/ld/ChangeLog b/ld/ChangeLog
index d00724f93f..e84e3d51db 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-15  Nick Clifton  <nickc@redhat.com>
+
+	* ldlex.l (YY_NO_UNPUT): Define so that the yy_unput function is
+	not declared.  It is not used and its presence causes a compile
+	time warning.
+	
 2005-02-11  Zack Weinberg  <zack@codesourcery.com>
 
 	* emultempl/elf32.em (gld${EMULATION_NAME}_stat_needed):
diff --git a/ld/ldlex.l b/ld/ldlex.l
index 70059e1408..ea6fa9948a 100644
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -65,6 +65,8 @@ const char *lex_string = NULL;
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max_size) yy_input (buf, &result, max_size)
 
+#define YY_NO_UNPUT
+
 #define MAX_INCLUDE_DEPTH 10
 static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
 static const char *file_name_stack[MAX_INCLUDE_DEPTH];