From ebe9c501ffc2363e7b5ab00ff42f7acaae9ded6b Mon Sep 17 00:00:00 2001
From: Kai Tietz <kai.tietz@onevision.com>
Date: Tue, 27 Sep 2011 15:59:55 +0000
Subject: [PATCH]         * scripttempl/pe.sc (.text): Add support for        
 .gnu.linkonce.t.* section.         (.debug_info): Only use .gnu.linkonce.wi.*
 for         relocating.         * scripttempl/pep.sc: Likewise.

---
 ld/ChangeLog          | 8 ++++++++
 ld/scripttempl/pe.sc  | 5 +++--
 ld/scripttempl/pep.sc | 5 +++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2b3caad..428fc5fa 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-27  Kai Tietz  <ktietz@redhat.com>
+
+	* scripttempl/pe.sc (.text): Add support for
+	.gnu.linkonce.t.* section.
+	(.debug_info): Only use .gnu.linkonce.wi.* for
+	relocating.
+	* scripttempl/pep.sc: Likewise.
+
 2011-09-22  Tristan Gingold  <gingold@adacore.com>
 
 	* NEWS: Add marker for 2.22.
diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc
index 3cb77ab..3a27952 100644
--- a/ld/scripttempl/pe.sc
+++ b/ld/scripttempl/pe.sc
@@ -73,6 +73,7 @@ SECTIONS
     *(.text)
     ${R_TEXT}
     ${RELOCATING+ *(.text.*)}
+    ${RELOCATING+ *(.gnu.linkonce.t.*)}
     *(.glue_7t)
     *(.glue_7)
     ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; 
@@ -238,7 +239,7 @@ SECTIONS
   /* DWARF 2.  */
   .debug_info ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
-    *(.debug_info) *(.gnu.linkonce.wi.*)
+    *(.debug_info${RELOCATING+ .gnu.linkonce.wi.*})
   }
 
   .debug_abbrev ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
@@ -306,7 +307,7 @@ SECTIONS
   /* DWARF 4.  */
   .debug_types ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
-    *(.debug_types) *(.gnu.linkonce.wt.*)
+    *(.debug_types${RELOCATING+ .gnu.linkonce.wt.*})
   }
 }
 EOF
diff --git a/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc
index 60515ef..b2113fe 100644
--- a/ld/scripttempl/pep.sc
+++ b/ld/scripttempl/pep.sc
@@ -73,6 +73,7 @@ SECTIONS
     *(.text)
     ${R_TEXT}
     ${RELOCATING+ *(.text.*)}
+    ${RELOCATING+ *(.gnu.linkonce.t.*)}
     *(.glue_7t)
     *(.glue_7)
     ${CONSTRUCTING+. = ALIGN(8);}
@@ -244,7 +245,7 @@ SECTIONS
   /* DWARF 2.  */
   .debug_info ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
-    *(.debug_info) *(.gnu.linkonce.wi.*)
+    *(.debug_info${RELOCATING+ .gnu.linkonce.wi.*})
   }
 
   .debug_abbrev ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
@@ -312,7 +313,7 @@ SECTIONS
   /* DWARF 4.  */
   .debug_types ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
-    *(.debug_types) *(.gnu.linkonce.wt.*)
+    *(.debug_types${RELOCATING+ .gnu.linkonce.wt.*})
   }
 }
 EOF
-- 
2.7.4