ldemul options

[Alan Modra]

On Fri, Feb 28, 2003 at 04:07:44PM +0300, Dmitry wrote:
> It seems to me, that 'ldemul.h' lacks "getopt.h" included.
> (...at least under FreeBSD 4.X)

Thanks for the bug report.  On linux we pick up getopt.h via
unistd.h so I didn't see this problem.

ld/ChangeLog
	* ldemul.c: Include getopt.h.
	* emultempl/elf32.em: Include getopt.h earlier.
	* emultempl/ticoff.em: Likewise.

Index: ld/ldemul.c
===================================================================
RCS file: /cvs/src/src/ld/ldemul.c,v
retrieving revision 1.13
diff -u -p -r1.13 ldemul.c
--- ld/ldemul.c	28 Feb 2003 02:10:06 -0000	1.13
+++ ld/ldemul.c	28 Feb 2003 22:41:37 -0000
@@ -1,5 +1,5 @@
 /* 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.
@@ -21,6 +21,7 @@ Software Foundation, 59 Temple Place - S
 
 #include "bfd.h"
 #include "sysdep.h"
+#include "getopt.h"
 
 #include "ld.h"
 #include "ldmisc.h"
Index: ld/emultempl/elf32.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/elf32.em,v
retrieving revision 1.94
diff -u -p -r1.94 elf32.em
--- ld/emultempl/elf32.em	28 Feb 2003 04:46:04 -0000	1.94
+++ ld/emultempl/elf32.em	28 Feb 2003 22:41:37 -0000
@@ -39,6 +39,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "sysdep.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
+#include "getopt.h"
 
 #include "bfdlink.h"
 
@@ -51,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "ldemul.h"
 #include <ldgram.h>
 #include "elf/common.h"
-#include "getopt.h"
 
 static void gld${EMULATION_NAME}_before_parse
   PARAMS ((void));
Index: ld/emultempl/ticoff.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/ticoff.em,v
retrieving revision 1.6
diff -u -p -r1.6 ticoff.em
--- ld/emultempl/ticoff.em	28 Feb 2003 01:32:31 -0000	1.6
+++ ld/emultempl/ticoff.em	28 Feb 2003 22:41:38 -0000
@@ -27,17 +27,15 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfdlink.h"
+#include "getopt.h"
 
 #include "ld.h"
 #include "ldmain.h"
 #include "ldmisc.h"
-
 #include "ldexp.h"
 #include "ldlang.h"
 #include "ldfile.h"
 #include "ldemul.h"
-
-#include "getopt.h"
 
 static int coff_version;
 

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre