From 9d34368f3af66588ee555e99ef63d86a073217fa Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 22 Feb 2002 04:52:00 +0000
Subject: [PATCH] Merge rev 1.2 (teach `ld' how to access FreeBSD's ld ELF
 hints) into Binutils 2.12_20020221_snap.

---
 contrib/binutils/ld/emultempl/elf32.em | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/binutils/ld/emultempl/elf32.em b/contrib/binutils/ld/emultempl/elf32.em
index 7642337a75d..387f55afc99 100644
--- a/contrib/binutils/ld/emultempl/elf32.em
+++ b/contrib/binutils/ld/emultempl/elf32.em
@@ -15,8 +15,8 @@ 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 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002 Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    ELF support by Ian Lance Taylor <ian@cygnus.com>
 
@@ -1401,6 +1401,8 @@ gld${EMULATION_NAME}_finish ()
 {
   if (bfd_elf${ELFSIZE}_discard_info (output_bfd, &link_info))
     {
+      lang_reset_memory_regions ();
+
       /* Resize the sections.  */
       lang_size_sections (stat_ptr->head, abs_output_section,
 			  &stat_ptr->head, 0, (bfd_vma) 0, NULL);