diff options
-rw-r--r-- | ld/ChangeLog | 5 | ||||
-rw-r--r-- | ld/emultempl/mmo.em | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 73d23577c9..836a73b1c6 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2006-06-21 Hans-Peter Nilsson <hp@bitrange.com> + + * emultempl/mmo.em: Improve comments. Explain why there's + ELF-stuff here. + 2006-06-21 Alan Modra <amodra@bigpond.net.au> * emultempl/elf-generic.em (gld${EMULATION_NAME}_map_segments): Limit diff --git a/ld/emultempl/mmo.em b/ld/emultempl/mmo.em index 3bf1c5b8a8..11475751da 100644 --- a/ld/emultempl/mmo.em +++ b/ld/emultempl/mmo.em @@ -1,5 +1,5 @@ # This shell script emits a C file. -*- C -*- -# Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. # # This file is part of GLD, the Gnu Linker. # @@ -18,14 +18,20 @@ # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # -# This file is sourced from generic.em +# This file is sourced from generic.em. cat >>e${EMULATION_NAME}.c <<EOF -/* Need to have this define before mmix-elfnmmo, which includes - needrelax.em which uses this name for the before_allocation function, - normally defined in elf32.em. */ +/* Need to have this macro defined before mmix-elfnmmo, which uses the + name for the before_allocation function, defined in ldemul.c (for + the mmo "emulation") or in elf32.em (for the elf64mmix + "emulation"). */ #define gldmmo_before_allocation before_allocation_default +/* We include this header *not* because we expect to handle ELF here + but because we re-use the map_segments function in elf-generic.em, + a file which is rightly somewhat ELF-centric. But this is only to + get a weird testcase right; ld-mmix/bpo-22, forcing ELF to be + output from the mmo emulation: -m mmo --oformat elf64-mmix! */ #include "elf-bfd.h" EOF |