From 9396a3cecf17e0754ab3a4642f306d2e2f20fe3f Mon Sep 17 00:00:00 2001
From: Dave Korn <dave.korn@artimi.com>
Date: Fri, 24 Sep 2010 04:41:12 +0000
Subject: [PATCH] 	* scripttempl/armcoff.sc: Revert 2010-09-22 change.

---
 ld/ChangeLog              |  4 ++++
 ld/scripttempl/armcoff.sc | 27 +--------------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e7c8e774b2b..3ecb59cff31 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-23  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* scripttempl/armcoff.sc: Revert 2010-09-22 change.
+
 2010-09-23  Alan Modra  <amodra@gmail.com>
 
 	* ldlang.c (lang_add_section): Don't copy SEC_RELOC from input
diff --git a/ld/scripttempl/armcoff.sc b/ld/scripttempl/armcoff.sc
index cefd6eba3f8..ebc019a89f0 100644
--- a/ld/scripttempl/armcoff.sc
+++ b/ld/scripttempl/armcoff.sc
@@ -17,22 +17,7 @@ DTOR='.dtor : {
     *(SORT(.dtors.*))
     *(.dtor)
   }'
-if test "${RELOCATING}"; then
-  R_IDATA234='
-    SORT(*)(.idata$2)
-    SORT(*)(.idata$3)
-    /* These zeroes mark the end of the import list.  */
-    LONG (0); LONG (0); LONG (0); LONG (0); LONG (0);
-    SORT(*)(.idata$4)'
-  R_IDATA5='SORT(*)(.idata$5)'
-  R_IDATA67='
-    SORT(*)(.idata$6)
-    SORT(*)(.idata$7)'
-else
-  R_IDATA234=
-  R_IDATA5=
-  R_IDATA67=
-fi
+
 cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", "${LITTLE_OUTPUT_FORMAT}")
 ${LIB_SEARCH_DIRS}
@@ -75,16 +60,6 @@ SECTIONS
   }
   ${CONSTRUCTING+${RELOCATING-$CTOR}}
   ${CONSTRUCTING+${RELOCATING-$DTOR}}
-  .idata ${RELOCATING+BLOCK(__section_alignment__)} :
-  {
-    /* This cannot currently be handled with grouped sections.
-       See pep.em:sort_sections.  */
-       ${R_IDATA234}
-       ${RELOCATING+__IAT_start__ = .;}
-    ${R_IDATA5}
-       ${RELOCATING+__IAT_end__ = .;}
-    ${R_IDATA67}
-  }
   .bss ${RELOCATING+ ALIGN(0x8)} :
   { 					
     ${RELOCATING+ __bss_start__ = . ;}
-- 
2.30.2