This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Some ld cleanups
- To: Nick Clifton <nickc at cygnus dot com>
- Subject: Some ld cleanups
- From: Alan Modra <alan at linuxcare dot com dot au>
- Date: Tue, 11 Jul 2000 04:05:02 +1000 (EST)
- cc: binutils at sourceware dot cygnus dot com
I wouldn't have tackled this if I knew in advance just how much editing
was required to get rid of some forward declarations. :)
Oh well, caught a couple of compilation errors in the process of verifying
I didn't add any myself.
OK to install, Nick?
Regards, Alan.
--
Linuxcare. Support for the Revolution.
ld/ChangeLog
* ldemul.h (struct lang_input_statement_struct): Remove forward
declaration.
(struct search_dirs): Likewise.
* ldfile.h (struct lang_input_statement_struct): Likewise.
Protect file from multiple inclusion.
* ldlang.h (LANG_FOR_EACH_INPUT_STATEMENT): Move file_chain
declaration from macro to file scope.
* ldemul.c: ldexp.h,ldlang.h,ldfile.h,ldemul.h go in this order.
* ldgram.y: Likewise here.
* ldlang.c: And here.
* ldmain.c: And here.
* mpw-elfmips.c: And here.
* mpw-eppcmac.c: And here.
* emultempl/aix.em: And here.
* emultempl/armcoff.em: And here.
* emultempl/armelf.em: And here.
* emultempl/armelf_oabi.em: And here.
* emultempl/beos.em: And here.
* emultempl/elf32.em: And here.
* emultempl/hppaelf.em: And here.
* emultempl/linux.em: And here.
* emultempl/lnk960.em: And here.
* emultempl/pe.em: And here.
* emultempl/sunos.em: And here.
* mpw-esh.c: And here. Include ldexp.h and ldlang.h too.
* mpw-idtmips.c: Ditto.
* emultempl/generic.em: Ditto.
* emultempl/gld960.em: Ditto.
* emultempl/gld960c.em: Ditto.
* emultempl/mipsecoff.em: Ditto.
* emultempl/ticoff.em: Ditto.
* emultempl/vanilla.em: Ditto.
* pe-dll.c: Include ldfile.h
* ldver.c: Include ldexp.h, ldlang.h, ldfile.h
* mpw-elfmips.c: (gldelf32ebmip_before_allocation): Add missing
arguments to bfd_elf32_size_dynamic_sections call.
(gldelf32ebmip_place_orphan): Add missing arguments to
lang_leave_output_section_statement call.
Index: ldemul.c
===================================================================
RCS file: /cvs/src/src/ld/ldemul.c,v
retrieving revision 1.3
diff -u -p -r1.3 ldemul.c
--- ldemul.c 2000/02/24 17:53:11 1.3
+++ ldemul.c 2000/07/10 17:53:45
@@ -1,5 +1,5 @@
/* ldemul.c -- clearing house for ld emulation states
- Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 1999
+ Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000
Free Software Foundation, Inc.
This file is part of GLD, the Gnu Linker.
@@ -22,11 +22,11 @@ the Free Software Foundation, 59 Temple
#include "sysdep.h"
#include "ld.h"
-#include "ldemul.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
#include "ldfile.h"
+#include "ldemul.h"
#include "ldmain.h"
#include "ldemul-list.h"
Index: ldemul.h
===================================================================
RCS file: /cvs/src/src/ld/ldemul.h,v
retrieving revision 1.2
diff -u -p -r1.2 ldemul.h
--- ldemul.h 2000/02/24 17:53:11 1.2
+++ ldemul.h 2000/07/10 17:53:46
@@ -16,11 +16,6 @@
#ifndef LDEMUL_H
#define LDEMUL_H
-#if ANSI_PROTOTYPES
-struct lang_input_statement_struct;
-struct search_dirs;
-#endif
-
extern void ldemul_hll PARAMS ((char *));
extern void ldemul_syslib PARAMS ((char *));
extern void ldemul_after_parse PARAMS ((void));
Index: ldfile.h
===================================================================
RCS file: /cvs/src/src/ld/ldfile.h,v
retrieving revision 1.3
diff -u -p -r1.3 ldfile.h
--- ldfile.h 2000/02/24 21:49:15 1.3
+++ ldfile.h 2000/07/10 17:53:46
@@ -1,5 +1,5 @@
/* ldfile.h -
- Copyright 1991, 1992 Free Software Foundation, Inc.
+ Copyright 1991, 92, 93, 94, 95, 2000 Free Software Foundation, Inc.
This file is part of GLD, the Gnu Linker.
@@ -17,6 +17,9 @@
along with GLD; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+#ifndef LDFILE_H
+#define LDFILE_H
+
extern const char *ldfile_input_filename;
extern boolean ldfile_assumed_script;
extern unsigned long ldfile_output_machine;
@@ -38,10 +41,6 @@ typedef struct search_dirs
extern search_dirs_type *search_head;
-#if ANSI_PROTOTYPES
-struct lang_input_statement_struct;
-#endif
-
extern void ldfile_add_arch PARAMS ((CONST char *));
extern void ldfile_add_library_path PARAMS ((const char *, boolean cmdline));
extern void ldfile_open_command_file PARAMS ((const char *name));
@@ -54,3 +53,5 @@ extern void ldfile_set_output_arch PARAM
extern boolean ldfile_open_file_search
PARAMS ((const char *arch, struct lang_input_statement_struct *,
const char *lib, const char *suffix));
+
+#endif
Index: ldgram.y
===================================================================
RCS file: /cvs/src/src/ld/ldgram.y,v
retrieving revision 1.7
diff -u -p -r1.7 ldgram.y
--- ldgram.y 2000/06/20 13:29:06 1.7
+++ ldgram.y 2000/07/10 17:53:48
@@ -33,8 +33,8 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ldexp.h"
#include "ldver.h"
#include "ldlang.h"
-#include "ldemul.h"
#include "ldfile.h"
+#include "ldemul.h"
#include "ldmisc.h"
#include "ldmain.h"
#include "mri.h"
Index: ldlang.c
===================================================================
RCS file: /cvs/src/src/ld/ldlang.c,v
retrieving revision 1.27
diff -u -p -r1.27 ldlang.c
--- ldlang.c 2000/06/20 13:29:06 1.27
+++ ldlang.c 2000/07/10 17:54:03
@@ -30,11 +30,11 @@ Software Foundation, 59 Temple Place - S
#include "ldgram.h"
#include "ldexp.h"
#include "ldlang.h"
-#include "ldemul.h"
#include "ldlex.h"
#include "ldmisc.h"
#include "ldctor.h"
#include "ldfile.h"
+#include "ldemul.h"
#include "fnmatch.h"
#include "demangle.h"
Index: ldlang.h
===================================================================
RCS file: /cvs/src/src/ld/ldlang.h,v
retrieving revision 1.5
diff -u -p -r1.5 ldlang.h
--- ldlang.h 2000/04/25 05:14:16 1.5
+++ ldlang.h 2000/07/10 17:54:04
@@ -379,6 +379,7 @@ extern boolean delete_output_file_on_fai
extern const char *entry_symbol;
extern boolean entry_from_cmdline;
+extern lang_statement_list_type file_chain;
extern void lang_init PARAMS ((void));
extern struct memory_region_struct *lang_memory_region_lookup
@@ -430,7 +431,6 @@ extern bfd_vma lang_do_assignments
bfd_vma dot));
#define LANG_FOR_EACH_INPUT_STATEMENT(statement) \
- extern lang_statement_list_type file_chain; \
lang_input_statement_type *statement; \
for (statement = (lang_input_statement_type *)file_chain.head;\
statement != (lang_input_statement_type *)NULL; \
Index: ldmain.c
===================================================================
RCS file: /cvs/src/src/ld/ldmain.c,v
retrieving revision 1.9
diff -u -p -r1.9 ldmain.c
--- ldmain.c 2000/06/20 12:33:21 1.9
+++ ldmain.c 2000/07/10 17:54:07
@@ -36,9 +36,9 @@ Software Foundation, 59 Temple Place - S
#include "ldgram.h"
#include "ldexp.h"
#include "ldlang.h"
-#include "ldemul.h"
#include "ldlex.h"
#include "ldfile.h"
+#include "ldemul.h"
#include "ldctor.h"
/* Somewhere above, sys/stat.h got included . . . . */
Index: ldver.c
===================================================================
RCS file: /cvs/src/src/ld/ldver.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 ldver.c
--- ldver.c 1999/05/03 07:29:07 1.1.1.1
+++ ldver.c 2000/07/10 17:54:07
@@ -1,5 +1,6 @@
/* ldver.c -- Print linker version.
- Copyright (C) 1991, 92, 93, 94, 95, 1996, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 2000
+ Free Software Foundation, Inc.
This file is part of GLD, the Gnu Linker.
@@ -23,6 +24,9 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldver.h"
+#include "ldexp.h"
+#include "ldlang.h"
+#include "ldfile.h"
#include "ldemul.h"
#include "ldmain.h"
Index: mpw-elfmips.c
===================================================================
RCS file: /cvs/src/src/ld/mpw-elfmips.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mpw-elfmips.c
--- mpw-elfmips.c 1999/05/03 07:29:07 1.1.1.1
+++ mpw-elfmips.c 2000/07/10 17:54:10
@@ -1,7 +1,8 @@
/* This file is is generated by a shell script. DO NOT EDIT! */
/* 32 bit ELF emulation code for elf32ebmip
- Copyright (C) 1991, 93, 94, 95, 1996, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1991, 93, 94, 95, 96, 98, 2000
+ Free Software Foundation, Inc.
Written by Steve Chamberlain <sac@cygnus.com>
ELF support by Ian Lance Taylor <ian@cygnus.com>
@@ -32,12 +33,12 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
#include "ldgram.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void gldelf32ebmip_before_parse PARAMS ((void));
static boolean gldelf32ebmip_open_dynamic_archive
@@ -442,12 +443,11 @@ gldelf32ebmip_before_allocation ()
rpath = command_line.rpath;
if (rpath == NULL)
rpath = (const char *) getenv ("LD_RUN_PATH");
- if (! bfd_elf32_size_dynamic_sections (output_bfd,
- command_line.soname,
- rpath,
- command_line.export_dynamic,
- &link_info,
- &sinterp))
+ if (! (bfd_elf32_size_dynamic_sections
+ (output_bfd, command_line.soname, rpath,
+ command_line.export_dynamic, command_line.filter_shlib,
+ (const char * const *) command_line.auxiliary_filters,
+ &link_info, &sinterp, lang_elf_version_info)))
einfo (_("%P%F: failed to set dynamic section sizes: %E\n"));
/* Let the user override the dynamic linker we are using. */
@@ -694,7 +694,9 @@ gldelf32ebmip_place_orphan (file, s)
os = lang_output_section_statement_lookup (secname);
wild_doit (&os->children, s, os, file);
- lang_leave_output_section_statement ((bfd_vma) 0, "*default*");
+ lang_leave_output_section_statement
+ ((bfd_vma) 0, "*default*",
+ (struct lang_output_section_phdr_list *) NULL, "*default*");
stat_ptr = &add;
if (*ps == '\0' && config.build_constructors)
Index: mpw-eppcmac.c
===================================================================
RCS file: /cvs/src/src/ld/mpw-eppcmac.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mpw-eppcmac.c
--- mpw-eppcmac.c 1999/05/03 07:29:07 1.1.1.1
+++ mpw-eppcmac.c 2000/07/10 17:54:12
@@ -1,7 +1,7 @@
/* This file is is generated by a shell script. DO NOT EDIT! */
/* AIX emulation code for ppcmacos
- Copyright (C) 1991, 1993, 1995, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1991, 93, 95, 98, 2000 Free Software Foundation, Inc.
Written by Steve Chamberlain <sac@cygnus.com>
AIX support by Ian Lance Taylor <ian@cygnus.com>
@@ -33,13 +33,13 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
#include "ldctor.h"
#include "ldgram.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void gldppcmacos_before_parse PARAMS ((void));
static int gldppcmacos_parse_args PARAMS ((int, char **));
Index: mpw-esh.c
===================================================================
RCS file: /cvs/src/src/ld/mpw-esh.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mpw-esh.c
--- mpw-esh.c 1999/05/03 07:29:07 1.1.1.1
+++ mpw-esh.c 2000/07/10 17:54:12
@@ -1,7 +1,7 @@
/* This file is is generated by a shell script. DO NOT EDIT! */
/* emulate the original gld for the given sh
- Copyright (C) 1991, 1993 Free Software Foundation, Inc.
+ Copyright (C) 1991, 1993, 2000 Free Software Foundation, Inc.
Written by Steve Chamberlain steve@cygnus.com
This file is part of GLD, the Gnu Linker.
@@ -29,9 +29,12 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
+
+#include "ldexp.h"
+#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void gldsh_before_parse PARAMS ((void));
static char *gldsh_get_script PARAMS ((int *isfile));
Index: mpw-idtmips.c
===================================================================
RCS file: /cvs/src/src/ld/mpw-idtmips.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mpw-idtmips.c
--- mpw-idtmips.c 1999/05/03 07:29:07 1.1.1.1
+++ mpw-idtmips.c 2000/07/10 17:54:12
@@ -1,7 +1,7 @@
/* This file is is generated by a shell script. DO NOT EDIT! */
/* Handle embedded relocs for MIPS.
- Copyright 1994 Free Software Foundation, Inc.
+ Copyright 1994, 2000 Free Software Foundation, Inc.
Written by Ian Lance Taylor <ian@cygnus.com> based on generic.em.
This file is part of GLD, the Gnu Linker.
@@ -29,9 +29,12 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
+
+#include "ldexp.h"
+#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void gldmipsidt_before_parse PARAMS ((void));
static void gldmipsidt_after_open PARAMS ((void));
Index: pe-dll.c
===================================================================
RCS file: /cvs/src/src/ld/pe-dll.c,v
retrieving revision 1.10
diff -u -p -r1.10 pe-dll.c
--- pe-dll.c 2000/03/01 20:54:37 1.10
+++ pe-dll.c 2000/07/10 17:54:17
@@ -34,6 +34,7 @@
#include "ldmisc.h"
#include "ldgram.h"
#include "ldmain.h"
+#include "ldfile.h"
#include "ldemul.h"
#include "coff/internal.h"
#include "../bfd/libcoff.h"
Index: emultempl/aix.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/aix.em,v
retrieving revision 1.3
diff -u -p -r1.3 aix.em
--- aix.em 2000/02/29 05:53:53 1.3
+++ aix.em 2000/07/10 17:54:20
@@ -4,7 +4,8 @@ cat >e${EMULATION_NAME}.c <<EOF
/* This file is is generated by a shell script. DO NOT EDIT! */
/* AIX emulation code for ${EMULATION_NAME}
- Copyright (C) 1991, 93, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1991, 93, 95, 96, 97, 98, 99, 2000
+ Free Software Foundation, Inc.
Written by Steve Chamberlain <sac@cygnus.com>
AIX support by Ian Lance Taylor <ian@cygnus.com>
@@ -37,11 +38,11 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
#include "ldctor.h"
#include "ldgram.h"
Index: emultempl/armcoff.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/armcoff.em,v
retrieving revision 1.8
diff -u -p -r1.8 armcoff.em
--- armcoff.em 2000/02/29 05:53:53 1.8
+++ armcoff.em 2000/07/10 17:54:21
@@ -4,7 +4,8 @@ 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 (C) 1991, 93, 96, 97, 98, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1991, 93, 96, 97, 98, 99, 2000
+ Free Software Foundation, Inc.
Written by Steve Chamberlain steve@cygnus.com
This file is part of GLD, the Gnu Linker.
@@ -32,12 +33,12 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
static void gld${EMULATION_NAME}_before_allocation PARAMS ((void));
Index: emultempl/armelf.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/armelf.em,v
retrieving revision 1.19
diff -u -p -r1.19 armelf.em
--- armelf.em 2000/04/25 05:14:16 1.19
+++ armelf.em 2000/07/10 17:54:35
@@ -5,7 +5,8 @@ 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 (C) 1991, 93, 96, 97, 98, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1991, 93, 96, 97, 98, 99, 2000
+ Free Software Foundation, Inc.
Written by Steve Chamberlain steve@cygnus.com
This file is part of GLD, the Gnu Linker.
@@ -36,12 +37,12 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
#include "ldgram.h"
static boolean gld${EMULATION_NAME}_open_dynamic_archive
Index: emultempl/armelf_oabi.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/armelf_oabi.em,v
retrieving revision 1.5
diff -u -p -r1.5 armelf_oabi.em
--- armelf_oabi.em 2000/02/29 05:53:53 1.5
+++ armelf_oabi.em 2000/07/10 17:54:35
@@ -4,7 +4,8 @@ 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 (C) 1991, 93, 96, 97, 98, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1991, 93, 96, 97, 98, 99, 2000
+ Free Software Foundation, Inc.
Written by Steve Chamberlain steve@cygnus.com
This file is part of GLD, the Gnu Linker.
@@ -39,12 +40,12 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
static void gld${EMULATION_NAME}_before_allocation PARAMS ((void));
Index: emultempl/beos.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/beos.em,v
retrieving revision 1.4
diff -u -p -r1.4 beos.em
--- beos.em 2000/02/29 05:53:53 1.4
+++ beos.em 2000/07/10 17:54:39
@@ -2,7 +2,7 @@
# It does some substitutions.
cat >e${EMULATION_NAME}.c <<EOF
/* This file is part of GLD, the Gnu Linker.
- Copyright 1995, 96, 97, 98, 1999 Free Software Foundation, Inc.
+ Copyright 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -35,11 +35,11 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ldgram.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
#include "ldemul.h"
#include "ldlex.h"
#include "ldmisc.h"
#include "ldctor.h"
-#include "ldfile.h"
#include "coff/internal.h"
#include "../bfd/libcoff.h"
Index: emultempl/elf32.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/elf32.em,v
retrieving revision 1.18
diff -u -p -r1.18 elf32.em
--- elf32.em 2000/06/19 01:22:43 1.18
+++ elf32.em 2000/07/10 17:54:42
@@ -7,7 +7,7 @@ cat >e${EMULATION_NAME}.c <<EOF
/* This file is is generated by a shell script. DO NOT EDIT! */
/* ${ELFSIZE} bit ELF emulation code for ${EMULATION_NAME}
- Copyright (C) 1991, 93, 94, 95, 96, 97, 98, 1999
+ Copyright (C) 1991, 93, 94, 95, 96, 97, 98, 99, 2000
Free Software Foundation, Inc.
Written by Steve Chamberlain <sac@cygnus.com>
ELF support by Ian Lance Taylor <ian@cygnus.com>
@@ -39,11 +39,11 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
#include "ldgram.h"
static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
Index: emultempl/generic.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/generic.em,v
retrieving revision 1.4
diff -u -p -r1.4 generic.em
--- generic.em 2000/02/29 05:53:53 1.4
+++ generic.em 2000/07/10 17:54:42
@@ -4,7 +4,8 @@ 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 (C) 1991, 93, 94, 95, 96, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1991, 93, 94, 95, 96, 99, 2000
+ Free Software Foundation, Inc.
Written by Steve Chamberlain steve@cygnus.com
This file is part of GLD, the Gnu Linker.
@@ -31,9 +32,12 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
+
+#include "ldexp.h"
+#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
static char *gld${EMULATION_NAME}_get_script PARAMS ((int *isfile));
Index: emultempl/gld960.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/gld960.em,v
retrieving revision 1.4
diff -u -p -r1.4 gld960.em
--- gld960.em 2000/02/29 05:53:53 1.4
+++ gld960.em 2000/07/10 17:54:42
@@ -1,7 +1,7 @@
# This shell script emits a C file. -*- C -*-
# It does some substitutions.
cat >e${EMULATION_NAME}.c <<EOF
-/* Copyright (C) 1991, 93, 94, 95, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 93, 94, 95, 99, 2000 Free Software Foundation, Inc.
This file is part of GLD, the Gnu Linker.
@@ -30,10 +30,13 @@ the Free Software Foundation, 59 Temple
#include "bfdlink.h"
#include "ld.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldmain.h"
+
+#include "ldexp.h"
+#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
#ifdef GNU960
Index: emultempl/gld960c.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/gld960c.em,v
retrieving revision 1.4
diff -u -p -r1.4 gld960c.em
--- gld960c.em 2000/02/29 05:53:53 1.4
+++ gld960c.em 2000/07/10 17:54:42
@@ -1,7 +1,8 @@
# This shell script emits a C file. -*- C -*-
# It does some substitutions.
cat >e${EMULATION_NAME}.c <<EOF
-/* Copyright (C) 1991, 93, 94, 95, 96, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 93, 94, 95, 96, 99, 2000
+ Free Software Foundation, Inc.
This file is part of GLD, the Gnu Linker.
@@ -32,10 +33,13 @@ Software Foundation, 59 Temple Place - S
#include "bfdlink.h"
#include "ld.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldmain.h"
+
+#include "ldexp.h"
+#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
#ifdef GNU960
Index: emultempl/hppaelf.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/hppaelf.em,v
retrieving revision 1.5
diff -u -p -r1.5 hppaelf.em
--- hppaelf.em 2000/07/09 08:45:29 1.5
+++ hppaelf.em 2000/07/10 17:54:43
@@ -31,11 +31,11 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
#include "ldgram.h"
#include "ldctor.h"
#include "elf32-hppa.h"
Index: emultempl/linux.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/linux.em,v
retrieving revision 1.5
diff -u -p -r1.5 linux.em
--- linux.em 2000/02/29 05:53:53 1.5
+++ linux.em 2000/07/10 17:54:43
@@ -4,7 +4,8 @@ cat >e${EMULATION_NAME}.c <<EOF
/* This file is is generated by a shell script. DO NOT EDIT! */
/* Linux a.out emulation code for ${EMULATION_NAME}
- Copyright (C) 1991, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1991, 93, 94, 95, 96, 98, 99, 2000
+ Free Software Foundation, Inc.
Written by Steve Chamberlain <sac@cygnus.com>
Linux support by Eric Youngdale <ericy@cais.cais.com>
@@ -32,11 +33,11 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
static boolean gld${EMULATION_NAME}_open_dynamic_archive
Index: emultempl/lnk960.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/lnk960.em,v
retrieving revision 1.4
diff -u -p -r1.4 lnk960.em
--- lnk960.em 2000/02/29 05:53:53 1.4
+++ lnk960.em 2000/07/10 17:54:45
@@ -2,7 +2,8 @@
# It does some substitutions.
cat >e${EMULATION_NAME}.c <<EOF
/* intel coff loader emulation specific stuff
- Copyright (C) 1991, 93, 94, 95, 96, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1991, 93, 94, 95, 96, 99, 2000
+ Free Software Foundation, Inc.
Written by Steve Chamberlain steve@cygnus.com
This file is part of GLD, the Gnu Linker.
@@ -28,12 +29,12 @@ the Free Software Foundation, 59 Temple
/*#include "archures.h"*/
#include "ld.h"
-#include "ldemul.h"
+#include "ldmain.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
#include "ldfile.h"
-#include "ldmain.h"
+#include "ldemul.h"
typedef struct lib_list {
char *name;
Index: emultempl/mipsecoff.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/mipsecoff.em,v
retrieving revision 1.5
diff -u -p -r1.5 mipsecoff.em
--- mipsecoff.em 2000/06/08 18:39:43 1.5
+++ mipsecoff.em 2000/07/10 17:54:45
@@ -4,7 +4,7 @@ cat >e${EMULATION_NAME}.c <<EOF
/* This file is is generated by a shell script. DO NOT EDIT! */
/* Handle embedded relocs for MIPS.
- Copyright 1994, 95, 97, 1999 Free Software Foundation, Inc.
+ Copyright 1994, 95, 97, 99, 2000 Free Software Foundation, Inc.
Written by Ian Lance Taylor <ian@cygnus.com> based on generic.em.
This file is part of GLD, the Gnu Linker.
@@ -31,9 +31,12 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
+
+#include "ldexp.h"
+#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
static void gld${EMULATION_NAME}_after_open PARAMS ((void));
Index: emultempl/pe.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/pe.em,v
retrieving revision 1.28
diff -u -p -r1.28 pe.em
--- pe.em 2000/07/10 17:20:35 1.28
+++ pe.em 2000/07/10 17:54:49
@@ -37,11 +37,11 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ldgram.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
#include "ldemul.h"
#include "ldlex.h"
#include "ldmisc.h"
#include "ldctor.h"
-#include "ldfile.h"
#include "coff/internal.h"
/* FIXME: This is a BFD internal header file, and we should not be
Index: emultempl/sunos.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/sunos.em,v
retrieving revision 1.5
diff -u -p -r1.5 sunos.em
--- sunos.em 2000/02/29 05:53:53 1.5
+++ sunos.em 2000/07/10 17:54:50
@@ -4,7 +4,7 @@ cat >e${EMULATION_NAME}.c <<EOF
/* This file is is generated by a shell script. DO NOT EDIT! */
/* SunOS emulation code for ${EMULATION_NAME}
- Copyright (C) 1991, 93, 94, 95, 96, 97, 98, 1999
+ Copyright (C) 1991, 93, 94, 95, 96, 97, 98, 99, 2000
Free Software Foundation, Inc.
Written by Steve Chamberlain <sac@cygnus.com>
SunOS shared library support by Ian Lance Taylor <ian@cygnus.com>
@@ -36,11 +36,11 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldexp.h"
#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
#ifdef HAVE_DIRENT_H
# include <dirent.h>
Index: emultempl/ticoff.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/ticoff.em,v
retrieving revision 1.1
diff -u -p -r1.1 ticoff.em
--- ticoff.em 2000/06/20 13:29:07 1.1
+++ ticoff.em 2000/07/10 17:54:51
@@ -30,9 +30,12 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
#include "ldmain.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
+
+#include "ldexp.h"
+#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
#include "getopt.h"
Index: emultempl/vanilla.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/vanilla.em,v
retrieving revision 1.3
diff -u -p -r1.3 vanilla.em
--- vanilla.em 2000/02/29 05:53:53 1.3
+++ vanilla.em 2000/07/10 17:54:51
@@ -2,7 +2,7 @@
# It does some substitutions.
cat >e${EMULATION_NAME}.c <<EOF
/* A vanilla emulation with no defaults
- Copyright (C) 1991, 1993 Free Software Foundation, Inc.
+ Copyright (C) 1991, 92, 93, 94, 2000 Free Software Foundation, Inc.
Written by Steve Chamberlain steve@cygnus.com
This file is part of GLD, the Gnu Linker.
@@ -26,10 +26,13 @@ Foundation, Inc., 59 Temple Place - Suit
#include "ld.h"
-#include "ldemul.h"
-#include "ldfile.h"
#include "ldmisc.h"
#include "ldmain.h"
+
+#include "ldexp.h"
+#include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
static void vanilla_before_parse()
{