From 93b63cd3a0d3f63988196f8989c8e9bff7b13d56 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Wed, 6 Dec 2000 16:39:51 +0000
Subject: [PATCH] * scripttempl/i386go32.sc: Use PROVIDE with _etext, _edata,
 _end. Set DWARF2 sections to a VMA of zero.

---
 ld/ChangeLog               |  5 +++++
 ld/scripttempl/i386go32.sc | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6624b00a634..d09924c1299 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-06  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* scripttempl/i386go32.sc: Use PROVIDE with _etext, _edata, _end.
+	Set DWARF2 sections to a VMA of zero.
+
 2000-12-01      Joel Sherrill <joel@OARcorp.com>
 
         * configure.tgt (arm-*-rtems*, a29k-*rtems*, h8300-*-rtems*):
diff --git a/ld/scripttempl/i386go32.sc b/ld/scripttempl/i386go32.sc
index 330e4d3acd4..ac67b92296c 100644
--- a/ld/scripttempl/i386go32.sc
+++ b/ld/scripttempl/i386go32.sc
@@ -27,7 +27,7 @@ SECTIONS
     *(.const*)
     *(.ro*)
     ${RELOCATING+*(.gnu.linkonce.r*)}
-    ${RELOCATING+etext  =  . ; _etext = . ;}
+    ${RELOCATING+etext  =  . ; PROVIDE(_etext = .) ;}
     ${RELOCATING+. = ALIGN(${SEGMENT_SIZE});}
   }
   .data ${RELOCATING+ ${DATA_ALIGNMENT}} : {
@@ -48,7 +48,7 @@ SECTIONS
     ${RELOCATING+LONG(0);}
 
     ${RELOCATING+*(.gnu.linkonce.d*)}
-    ${RELOCATING+edata  =  . ; _edata = . ;}
+    ${RELOCATING+edata  =  . ; PROVIDE(_edata = .) ;}
     ${RELOCATING+. = ALIGN(${SEGMENT_SIZE});}
   }
   ${CONSTRUCTING+${RELOCATING-$CTOR}}
@@ -57,8 +57,18 @@ SECTIONS
   { 					
     *(.bss)
     *(COMMON)
-    ${RELOCATING+ end = . ; _end = . ;}
+    ${RELOCATING+ end = . ; PROVIDE(_end = .) ;}
     ${RELOCATING+ . = ALIGN(${SEGMENT_SIZE});}
   }
+  /* DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
 }
 EOF
-- 
2.30.2