remove armelf sanitization

diff --git a/ld/testsuite/ld-srec/.Sanitize b/ld/testsuite/ld-srec/.Sanitize
index 954ac1ad07160ef2f7c192f75048df0f245b233e..414ab735e2528dc60011f541a3230d9c4fc6006c 100644 (file)
--- a/ld/testsuite/ld-srec/.Sanitize
+++ b/ld/testsuite/ld-srec/.Sanitize
@@ -36,33 +36,6 @@ Things-to-lose:
 
 Do-last:
 
-armelf_files="srec.exp"
-if ( echo $* | grep keep\-armelf > /dev/null ) ; then
-       for i in $armelf_files ; do
-               if test ! -d $i && (grep sanitize-armelf $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping armelf stuff in $i
-                       fi
-               fi
-       done
-else
-       for i in $armelf_files ; do
-               if test ! -d $i && (grep sanitize-armelf $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"armelf\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-armelf/,/end-\sanitize\-armelf/d' < $i > new
-                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-                               if [ -n "${verbose}" ] ; then
-                                       echo Caching $i in .Recover...
-                               fi
-                               mv $i .Recover
-                       fi
-                       mv new $i
-               fi
-       done
-fi
 
 for i in * ; do
        if test ! -d $i && (grep sanitize $i > /dev/null) ; then

diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp
index f9436e6548434e0c3f65304b30dc1d7583b75c57..19f58de56f79260a1af38df0aa0a85eb44b10d08 100644 (file)
--- a/ld/testsuite/ld-srec/srec.exp
+++ b/ld/testsuite/ld-srec/srec.exp
@@ -235,11 +235,9 @@ proc run_srec_test { test objs } {
     if [istarget arm-*-pe] {
        set flags "$flags --defsym ___gccmain=0"
     }
-    # start-sanitize-armelf
     if [istarget arm-*-elf] {
        set flags "$flags --defsym ___gccmain=0"
     }
-    # end-sanitize-armelf
     
     # Thumb targets call __gccmain
     if [istarget thumb-*-coff] {
@@ -248,11 +246,9 @@ proc run_srec_test { test objs } {
     if [istarget thumb-*-pe] {
        set flags "$flags --defsym ___gccmain=0"
     }
-    # start-sanitize-armelf
     if [istarget thumb-*-*] {
        set flags "$flags --defsym ___gccmain=0"
     }
-    # end-sanitize-armelf
 
     # PowerPC EABI code calls __eabi.
     if [istarget powerpc*-*-eabi*] {
@@ -339,14 +335,10 @@ setup_xfail "*-*-aix*" "*-*-xcoff*"
 # The S-record linker doesn't build ARM/Thumb stubs.
 setup_xfail "arm-*-coff*"
 setup_xfail "arm-*-pe*"
-# start-sanitize-armelf
 setup_xfail "arm-*elf*"
-# end-sanitize-armelf
 setup_xfail "thumb-*-coff*"
 setup_xfail "thumb-*-pe*"
-# start-sanitize-armelf
 setup_xfail "thumb-*-elf*"
-# end-sanitize-armelf
 
 # The S-record linker doesn't build special EABI sections.
 setup_xfail "powerpc*-*-eabi*"
@@ -383,14 +375,10 @@ setup_xfail "mips*-*-irix5*" "mips*-*-irix6*"
 setup_xfail "*-*-aix*" "*-*-xcoff*"
 setup_xfail "arm-*-coff*"
 setup_xfail "arm-*-pe*"
-# start-sanitize-armelf
 setup_xfail "arm-*-elf*"
-# end-sanitize-armelf
 setup_xfail "thumb-*-coff*"
 setup_xfail "thumb-*-pe*"
-# start-sanitize-armelf
 setup_xfail "thumb-*-elf*"
-# end-sanitize-armelf
 setup_xfail "powerpc*-*-eabi*"
 setup_xfail "powerpc*-*-linux*"
 setup_xfail "v850*-*-elf"