diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4d305cb15e..4366d847c4 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-02  Andreas Jaeger  <aj@suse.de>
+
+	* emultempl/aix.em: Add missing prototype.
+	* emultempl/lnk960.em: Likewise.
+	* emultempl/vanilla.em: Likewise.
+	* emultempl/armcoff.em: Likewise.
+	* emultempl/armelf_oabi.em: Likewise.
+	* emultempl/beos.em: Likewise.
+	* emultempl/gld960c.em: Likewise.
+	* emultempl/gld960.em: Likewise.
+
+	* emulparams/elf64alpha.sh (PARSE_AND_LIST_PROLOGUE): Add parameter
+	for prototype declaration.
+
 2001-08-31  Eric Christopher  <echristo@redhat.com>
 	    Jason Eckhardt  <jle@redhat.com>
 
diff --git a/ld/emulparams/elf64alpha.sh b/ld/emulparams/elf64alpha.sh
index 5c69816b2b..f31a38c883 100644
--- a/ld/emulparams/elf64alpha.sh
+++ b/ld/emulparams/elf64alpha.sh
@@ -24,7 +24,7 @@ PARSE_AND_LIST_PROLOGUE='
 static int elf64alpha_32bit = 0;
 
 struct ld_emulation_xfer_struct ld_elf64alpha_emulation;
-static void gld_elf64alpha_finish ();
+static void gld_elf64alpha_finish PARAMS ((void));
 '
 
 PARSE_AND_LIST_LONGOPTS='
diff --git a/ld/emultempl/aix.em b/ld/emultempl/aix.em
index db3ea4c824..3d1c018658 100644
--- a/ld/emultempl/aix.em
+++ b/ld/emultempl/aix.em
@@ -65,6 +65,8 @@ static void gld${EMULATION_NAME}_find_relocs
   PARAMS ((lang_statement_union_type *));
 static void gld${EMULATION_NAME}_find_exp_assignment PARAMS ((etree_type *));
 static char *gld${EMULATION_NAME}_get_script PARAMS ((int *isfile));
+static boolean gld${EMULATION_NAME}_unrecognized_file
+  PARAMS ((lang_input_statement_type *));
 
 /* The file alignment required for each section.  */
 static unsigned long file_align;
diff --git a/ld/emultempl/armcoff.em b/ld/emultempl/armcoff.em
index ab7084351c..783efa9245 100644
--- a/ld/emultempl/armcoff.em
+++ b/ld/emultempl/armcoff.em
@@ -4,7 +4,7 @@ cat >e${EMULATION_NAME}.c <<EOF
 /* This file is is generated by a shell script.  DO NOT EDIT! */
 
 /* emulate the original gld for the given ${EMULATION_NAME}
-   Copyright 1991, 1993, 1996, 1997, 1998, 1999, 2000
+   Copyright 1991, 1993, 1996, 1997, 1998, 1999, 2000, 2001
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -46,6 +46,7 @@ static char *gld${EMULATION_NAME}_get_script PARAMS ((int *isfile));
 static int  gld${EMULATION_NAME}_parse_args PARAMS((int, char **));
 static void gld${EMULATION_NAME}_list_options PARAMS ((FILE *));
 static void gld${EMULATION_NAME}_finish PARAMS ((void));
+static void gld${EMULATION_NAME}_after_open PARAMS ((void));
 
 /* If true, then interworking stubs which support calls to old, non-interworking
    aware ARM code should be generated.  */
diff --git a/ld/emultempl/armelf_oabi.em b/ld/emultempl/armelf_oabi.em
index 1f2deb385d..b0c56698f9 100644
--- a/ld/emultempl/armelf_oabi.em
+++ b/ld/emultempl/armelf_oabi.em
@@ -4,7 +4,7 @@ cat >e${EMULATION_NAME}.c <<EOF
 /* This file is is generated by a shell script.  DO NOT EDIT! */
 
 /* emulate the original gld for the given ${EMULATION_NAME}
-   Copyright 1991, 1993, 1996, 1997, 1998, 1999, 2000
+   Copyright 1991, 1993, 1996, 1997, 1998, 1999, 2000, 2001
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -50,6 +50,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
 static void gld${EMULATION_NAME}_before_allocation PARAMS ((void));
 static char *gld${EMULATION_NAME}_get_script PARAMS ((int *isfile));
+static void gld${EMULATION_NAME}_after_open PARAMS ((void));
 
 static void
 gld${EMULATION_NAME}_before_parse ()
diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
index e11974b81c..922202f5bd 100644
--- a/ld/emultempl/beos.em
+++ b/ld/emultempl/beos.em
@@ -69,6 +69,11 @@ static lang_statement_union_type **sort_sections_1
 	   int (*)()));
 static void sort_sections PARAMS ((lang_statement_union_type *));
 
+static void set_pe_name PARAMS ((char *, long int));
+static void set_pe_subsystem PARAMS ((void));
+static void set_pe_value PARAMS ((char *));
+static void set_pe_stack_heap PARAMS ((char *, char *));
+
 static struct internal_extra_pe_aouthdr pe;
 static int dll;
 
diff --git a/ld/emultempl/gld960.em b/ld/emultempl/gld960.em
index 8d98355cb1..c61a0619c8 100644
--- a/ld/emultempl/gld960.em
+++ b/ld/emultempl/gld960.em
@@ -1,7 +1,8 @@
 # This shell script emits a C file. -*- C -*-
 # It does some substitutions.
 cat >e${EMULATION_NAME}.c <<EOF
-/* Copyright 1991, 1992, 1994, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright 1991, 1992, 1994, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
 
@@ -38,6 +39,11 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307
 #include "ldfile.h"
 #include "ldemul.h"
 
+static void gld960_before_parse PARAMS ((void));
+static char *gld960_choose_target PARAMS ((void));
+static void gld960_set_output_arch PARAMS ((void));
+static char *gld960_get_script PARAMS ((int *));
+
 #ifdef GNU960
 
 static void
diff --git a/ld/emultempl/gld960c.em b/ld/emultempl/gld960c.em
index 48fd95dafb..46d6e87d5e 100644
--- a/ld/emultempl/gld960c.em
+++ b/ld/emultempl/gld960c.em
@@ -1,7 +1,7 @@
 # This shell script emits a C file. -*- C -*-
 # It does some substitutions.
 cat >e${EMULATION_NAME}.c <<EOF
-/* Copyright 1991, 1993, 1994, 1996, 1999, 2000
+/* Copyright 1991, 1993, 1994, 1996, 1999, 2000, 2001
    Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
@@ -41,6 +41,11 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "ldfile.h"
 #include "ldemul.h"
 
+static void gld960_before_parse PARAMS ((void));
+static void gld960_set_output_arch PARAMS ((void));
+static char *gld960_choose_target PARAMS ((void));
+static char *gld960_get_script PARAMS ((int *));
+
 #ifdef GNU960
 
 static void
diff --git a/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em
index ec69b45c74..6d90da9717 100644
--- a/ld/emultempl/lnk960.em
+++ b/ld/emultempl/lnk960.em
@@ -2,7 +2,7 @@
 # It does some substitutions.
 cat >e${EMULATION_NAME}.c <<EOF
 /* intel coff loader emulation specific stuff
-   Copyright 1991, 1992, 1994, 1995, 1996, 1999, 2000
+   Copyright 1991, 1992, 1994, 1995, 1996, 1999, 2000, 2001
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -47,6 +47,18 @@ static lib_list_type **hll_list_tail = &hll_list;
 static lib_list_type *syslib_list;
 static lib_list_type **syslib_list_tail = &syslib_list;
 
+static void append PARAMS ((lib_list_type ***, char *));
+static void lnk960_hll PARAMS ((char *));
+static void lnk960_syslib PARAMS ((char *));
+static void lnk960_before_parse PARAMS ((void));
+static void add_on PARAMS ((lib_list_type *, lang_input_file_enum_type));
+static void lnk960_after_parse PARAMS ((void));
+static void lnk960_before_allocation PARAMS ((void));
+static void lnk960_after_allocation PARAMS ((void));
+static void lnk960_set_output_arch PARAMS ((void));
+static char *lnk960_choose_target PARAMS ((void));
+static char *lnk960_get_script PARAMS ((int *));
+
 
 static void
 append(list, name)
diff --git a/ld/emultempl/vanilla.em b/ld/emultempl/vanilla.em
index 3e6aed92e3..96ee34c8ae 100644
--- a/ld/emultempl/vanilla.em
+++ b/ld/emultempl/vanilla.em
@@ -2,7 +2,7 @@
 # It does some substitutions.
 cat >e${EMULATION_NAME}.c <<EOF
 /* A vanilla emulation with no defaults
-   Copyright 1991, 1992, 1994, 2000 Free Software Foundation, Inc.
+   Copyright 1991, 1992, 1994, 2000, 2001 Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
 This file is part of GLD, the Gnu Linker.
@@ -34,6 +34,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "ldfile.h"
 #include "ldemul.h"
 
+static void vanilla_before_parse PARAMS ((void));
+static void vanilla_set_output_arch PARAMS ((void));
+static char *vanilla_get_script PARAMS ((int *));
+
+
 static void vanilla_before_parse()
 {
 }