* ldemul.c: Include getopt.h.

	* emultempl/elf32.em: Include getopt.h earlier.
	* emultempl/ticoff.em: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6c70294..73746d6 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-01  Alan Modra  <amodra@bigpond.net.au>
+
+       * ldemul.c: Include getopt.h.
+       * emultempl/elf32.em: Include getopt.h earlier.
+       * emultempl/ticoff.em: Likewise.
+

 2003-02-28  Alan Modra  <amodra@bigpond.net.au>
 
        * emultempl/elf32.em (gld${EMULATION_NAME}_get_script): Add combreloc
 2003-02-28  Alan Modra  <amodra@bigpond.net.au>
 
        * emultempl/elf32.em (gld${EMULATION_NAME}_get_script): Add combreloc

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 28bb8d8..3d94a66 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -39,6 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
 #include "sysdep.h"
 #include "libiberty.h"
 #include "safe-ctype.h"

+#include "getopt.h"

 
 #include "bfdlink.h"
 
 
 #include "bfdlink.h"
 


@@ -51,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "ldemul.h"
 #include <ldgram.h>
 #include "elf/common.h"
 #include "ldemul.h"
 #include <ldgram.h>
 #include "elf/common.h"

-#include "getopt.h"

 
 static void gld${EMULATION_NAME}_before_parse
   PARAMS ((void));
 
 static void gld${EMULATION_NAME}_before_parse
   PARAMS ((void));

diff --git a/ld/emultempl/ticoff.em b/ld/emultempl/ticoff.em
index 620877a..90c940e 100644 (file)
--- a/ld/emultempl/ticoff.em
+++ b/ld/emultempl/ticoff.em
@@ -27,18 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfdlink.h"
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfdlink.h"

+#include "getopt.h"

 
 #include "ld.h"
 #include "ldmain.h"
 #include "ldmisc.h"
 
 #include "ld.h"
 #include "ldmain.h"
 #include "ldmisc.h"

-

 #include "ldexp.h"
 #include "ldlang.h"
 #include "ldfile.h"
 #include "ldemul.h"
 
 #include "ldexp.h"
 #include "ldlang.h"
 #include "ldfile.h"
 #include "ldemul.h"
 

-#include "getopt.h"
-

 static int coff_version;
 
 static void gld_${EMULATION_NAME}_before_parse PARAMS ((void));
 static int coff_version;
 
 static void gld_${EMULATION_NAME}_before_parse PARAMS ((void));

diff --git a/ld/ldemul.c b/ld/ldemul.c
index dc08794..d189127 100644 (file)
--- a/ld/ldemul.c
+++ b/ld/ldemul.c
@@ -1,5 +1,5 @@
 /* ldemul.c -- clearing house for ld emulation states
 /* ldemul.c -- clearing house for ld emulation states

-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2002
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2002, 2003

    Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
    Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.


@@ -21,6 +21,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "bfd.h"
 #include "sysdep.h"
 
 #include "bfd.h"
 #include "sysdep.h"

+#include "getopt.h"

 
 #include "ld.h"
 #include "ldmisc.h"
 
 #include "ld.h"
 #include "ldmisc.h"