Remove sparc-aout and sparc-coff support

bfd/
	* Makefile.am: Remove sparc-aout and sparc-coff support.
	* config.bfd: Likewise.
	* configure.ac: Likewise.
	* targets.c: Likewise.
	* aout-sparcle.c: Delete.
	* aoutf1.h: Delete.
	* cf-sparclynx.c: Delete.
	* coff-sparc.c: Delete.
	* demo64.c: Delete.
	* sparclinux.c: Delete.
	* sparclynx.c: Delete.
	* sparcnetbsd.c: Delete.
	* sunos.c: Delete.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
	* po/SRC-POTFILES.in: Regenerate.
binutils/
	* testsuite/lib/binutils-common.exp: Remove sparc-aout and
	sparc-coff support.
gas/
	* Makefile.am: Remove sparc-aout and sparc-coff support.
	* config/obj-coff.h: Likewise.
	* config/tc-sparc.c: Likewise.
	* config/tc-sparc.h: Likewise.
	* configure.tgt: Likewise.
	* config/te-sparcaout.h: Delete.
	* testsuite/gas/sun4/addend.d: Delete.
	* testsuite/gas/sun4/addend.exp: Delete.
	* testsuite/gas/sun4/addend.s: Delete.
	* Makefile.in: Regenerate.
	* po/POTFILES.in: Regenerate.
ld/
	* Makefile.am: Remove sparc-aout and sparc-coff support.
	* configure.tgt: Likewise.
	* testsuite/ld-elfvers/vers.exp: Likewise.
	* testsuite/ld-elfvsb/elfvsb.exp: Likewise.
	* testsuite/ld-elfweak/elfweak.exp: Likewise.
	* testsuite/ld-shared/shared.exp: Likewise.
	* emulparams/coff_sparc.sh: Delete.
	* emulparams/sparcaout.sh: Delete.
	* emulparams/sparclinux.sh: Delete.
	* emulparams/sparcnbsd.sh: Delete.
	* emulparams/sun4.sh: Delete.
	* scripttempl/sparccoff.sc: Delete.
	* Makefile.in: Regenerate.
	* po/BLD-POTFILES.in: Regenerate.

15 files changed, 39 insertions, 230 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1c78450..af1c0e9 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,22 @@
 2018-04-16  Alan Modra  <amodra@gmail.com>
 
+	* Makefile.am: Remove sparc-aout and sparc-coff support.
+	* configure.tgt: Likewise.
+	* testsuite/ld-elfvers/vers.exp: Likewise.
+	* testsuite/ld-elfvsb/elfvsb.exp: Likewise.
+	* testsuite/ld-elfweak/elfweak.exp: Likewise.
+	* testsuite/ld-shared/shared.exp: Likewise.
+	* emulparams/coff_sparc.sh: Delete.
+	* emulparams/sparcaout.sh: Delete.
+	* emulparams/sparclinux.sh: Delete.
+	* emulparams/sparcnbsd.sh: Delete.
+	* emulparams/sun4.sh: Delete.
+	* scripttempl/sparccoff.sc: Delete.
+	* Makefile.in: Regenerate.
+	* po/BLD-POTFILES.in: Regenerate.
+
+2018-04-16  Alan Modra  <amodra@gmail.com>
+
 	* Makefile.am: Remove m68k-aout and m68k-coff support.
 	* configure.tgt: Likewise.
 	* emultempl/m68kelf.em: Likewise.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 09d93c3..0998a05 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -209,7 +209,6 @@ ALL_EMULATION_SOURCES = \
 	eavrxmega6.c \
 	eavrxmega7.c \
 	eavrtiny.c   \
-	ecoff_sparc.c \
 	ecrisaout.c \
 	ecriself.c \
 	ecrislinux.c \
@@ -372,10 +371,6 @@ ALL_EMULATION_SOURCES = \
 	eshlelf_nto.c \
 	eshlelf_vxworks.c \
 	eshpe.c \
-	esparcaout.c \
-	esparclinux.c \
-	esparcnbsd.c \
-	esun4.c \
 	etic30aout.c \
 	etic30coff.c \
 	etic3xcoff.c \
@@ -879,9 +874,6 @@ eavrtiny.c: $(srcdir)/emulparams/avrtiny.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
 
-ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sparccoff.sc ${GEN_DEPENDS}
-
 ecrisaout.c: $(srcdir)/emulparams/crisaout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/crisaout.sc ${GEN_DEPENDS}
 
@@ -1652,18 +1644,6 @@ eshlelf_vxworks.c: $(srcdir)/emulparams/shlelf_vxworks.sh \
 eshpe.c: $(srcdir)/emulparams/shpe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
 
-esparcaout.c: $(srcdir)/emulparams/sparcaout.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
-esparclinux.c: $(srcdir)/emulparams/sparclinux.sh \
-  $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
-esparcnbsd.c:	$(srcdir)/emulparams/sparcnbsd.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
-esun4.c: $(srcdir)/emulparams/sun4.sh \
-  $(srcdir)/emultempl/sunos.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
 etic30aout.c: $(srcdir)/emulparams/tic30aout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic30aout.sc ${GEN_DEPENDS}
 
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 0bad290..3c67306 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -578,7 +578,6 @@ ALL_EMULATION_SOURCES = \
 	eavrxmega6.c \
 	eavrxmega7.c \
 	eavrtiny.c   \
-	ecoff_sparc.c \
 	ecrisaout.c \
 	ecriself.c \
 	ecrislinux.c \
@@ -741,10 +740,6 @@ ALL_EMULATION_SOURCES = \
 	eshlelf_nto.c \
 	eshlelf_vxworks.c \
 	eshpe.c \
-	esparcaout.c \
-	esparclinux.c \
-	esparcnbsd.c \
-	esun4.c \
 	etic30aout.c \
 	etic30coff.c \
 	etic3xcoff.c \
@@ -1140,7 +1135,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eavrxmega5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eavrxmega6.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eavrxmega7.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecoff_sparc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecrisaout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecriself.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecrislinux.Po@am__quote@
@@ -1364,10 +1358,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshlelf_nto.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshlelf_vxworks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eshpe.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/esparcaout.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/esparclinux.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/esparcnbsd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/esun4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic30aout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic30coff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etic3xcoff.Po@am__quote@
@@ -2395,9 +2385,6 @@ eavrtiny.c: $(srcdir)/emulparams/avrtiny.sh \
   $(srcdir)/emultempl/avrelf.em $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
   ${GEN_DEPENDS}
 
-ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sparccoff.sc ${GEN_DEPENDS}
-
 ecrisaout.c: $(srcdir)/emulparams/crisaout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/crisaout.sc ${GEN_DEPENDS}
 
@@ -3168,18 +3155,6 @@ eshlelf_vxworks.c: $(srcdir)/emulparams/shlelf_vxworks.sh \
 eshpe.c: $(srcdir)/emulparams/shpe.sh \
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
 
-esparcaout.c: $(srcdir)/emulparams/sparcaout.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
-esparclinux.c: $(srcdir)/emulparams/sparclinux.sh \
-  $(srcdir)/emultempl/linux.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
-esparcnbsd.c:	$(srcdir)/emulparams/sparcnbsd.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
-esun4.c: $(srcdir)/emulparams/sun4.sh \
-  $(srcdir)/emultempl/sunos.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-
 etic30aout.c: $(srcdir)/emulparams/tic30aout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/tic30aout.sc ${GEN_DEPENDS}
 
diff --git a/ld/configure.tgt b/ld/configure.tgt
index eb188be..ca11eca 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -702,45 +702,27 @@ sh-*-nto*)		targ_emul=shelf_nto
 sh-*-pe)		targ_emul=shpe ;
 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 sh-*-*)			targ_emul=sh; targ_extra_emuls=shl ;;
-sparc64-*-aout*)	targ_emul=sparcaout ;;
-sparc64-*-elf* | sparc64-*-rtems*)
-			targ_emul=elf64_sparc ;;
-sparc-sun-sunos4*)	targ_emul=sun4 ;;
-sparclite*-*-elf)	targ_emul=elf32_sparc ;;
-sparclite*-*-coff)	targ_emul=coff_sparc ;;
-sparclite*-fujitsu-*)	targ_emul=sparcaout ;;
-sparc*-*-aout)		targ_emul=sparcaout ;;
-sparc*-*-coff)		targ_emul=coff_sparc ;;
-sparc*-*-elf | sparc-*-rtems*)
-			targ_emul=elf32_sparc ;;
-sparc*-*-sysv4*)	targ_emul=elf32_sparc ;;
-sparc*-*-vxworks*)	targ_emul=elf32_sparc_vxworks ;;
 sparc64-*-freebsd* | sparcv9-*-freebsd* | sparc64-*-kfreebsd*-gnu | sparcv9-*-kfreebsd*-gnu)
 			targ_emul=elf64_sparc_fbsd
 			targ_extra_emuls="elf64_sparc elf32_sparc"
 			targ_extra_libpath=$targ_extra_emuls
 			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'`	;;
-sparc*-*-linux*aout*)	targ_emul=sparclinux
-			targ_extra_emuls="elf32_sparc sun4"
-			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/aout//'`
-			tdir_sun4=sparc-sun-sunos4 ;;
 sparc64-*-linux-*)	targ_emul=elf64_sparc
-			targ_extra_emuls="elf32_sparc sparclinux sun4"
+			targ_extra_emuls="elf32_sparc"
 			targ_extra_libpath=elf32_sparc
-			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'`
-			tdir_sparclinux=${tdir_elf32_sparc}aout
-			tdir_sun4=sparc-sun-sunos4 ;;
+			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'` ;;
+sparc64-*-*bsd*)	targ_emul=elf64_sparc
+			targ_extra_emuls="elf32_sparc" ;;
+sparc64-*-solaris2* | sparcv9-*-solaris2*)
+			targ_emul=elf64_sparc_sol2
+			targ_extra_emuls="elf64_sparc elf32_sparc_sol2 elf32_sparc"
+			targ_extra_libpath=$targ_extra_emuls
+			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'` ;;
+sparc64-*-*)		targ_emul=elf64_sparc ;;
 sparc*-*-linux-*)	targ_emul=elf32_sparc
-			targ_extra_emuls="sparclinux elf64_sparc sun4"
+			targ_extra_emuls="elf64_sparc"
 			targ_extra_libpath=elf64_sparc
-			tdir_sparclinux=${targ_alias}aout
-			tdir_elf64_sparc=`echo ${targ_alias} | sed -e 's/32//'`
-			tdir_sun4=sparc-sun-sunos4 ;;
-sparc64-*-netbsd* | sparc64-*-openbsd*)
-			targ_emul=elf64_sparc
-			targ_extra_emuls="elf32_sparc" ;;
-sparc*-*-netbsd*elf*)	targ_emul=elf32_sparc ;;
-sparc*-*-netbsd*)	targ_emul=sparcnbsd ;;
+			tdir_elf64_sparc=`echo ${targ_alias} | sed -e 's/32//'` ;;
 sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
 			targ_emul=elf32_sparc_sol2
 			targ_extra_emuls=elf32_sparc ;;
@@ -748,13 +730,8 @@ sparc-*-solaris2*)	targ_emul=elf32_sparc_sol2
 			targ_extra_emuls="elf32_sparc elf64_sparc_sol2 elf64_sparc"
 			targ_extra_libpath=$targ_extra_emuls
 			tdir_elf64_sparc=`echo ${targ_alias} | sed -e 's/32//'`	;;
-sparcv9-*-solaris2* | sparc64-*-solaris2*)
-			targ_emul=elf64_sparc_sol2
-			targ_extra_emuls="elf64_sparc elf32_sparc_sol2 elf32_sparc"
-			targ_extra_libpath=$targ_extra_emuls
-			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'` ;;
-sparc*-*-solaris2*)	targ_emul=elf32_sparc ;;
-sparc*-wrs-vxworks*)	targ_emul=sparcaout ;;
+sparc*-*-vxworks*)	targ_emul=elf32_sparc_vxworks ;;
+sparc*-*-*)		targ_emul=elf32_sparc ;;
 spu-*-elf*)		targ_emul=elf32_spu ;;
 tic30-*-*aout*)		targ_emul=tic30aout ;;
 tic30-*-*coff*)		targ_emul=tic30coff ;;
diff --git a/ld/emulparams/coff_sparc.sh b/ld/emulparams/coff_sparc.sh
deleted file mode 100644
index d66cf61..0000000
--- a/ld/emulparams/coff_sparc.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_NAME=sparccoff
-OUTPUT_FORMAT="coff-sparc"
-# following are dubious (borrowed from sparc lynx)
-TARGET_PAGE_SIZE=0x1000
-TEXT_START_ADDR=0
-case ${LD_FLAG} in
-    n|N)	TEXT_START_ADDR=0x1000 ;;
-esac
-ARCH=sparc
diff --git a/ld/emulparams/sparcaout.sh b/ld/emulparams/sparcaout.sh
deleted file mode 100644
index e109064..0000000
--- a/ld/emulparams/sparcaout.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPT_NAME=aout
-OUTPUT_FORMAT="a.out-sunos-big"
-BIG_OUTPUT_FORMAT="a.out-sunos-big"
-LITTLE_OUTPUT_FORMAT="a.out-sparc-little"
-TEXT_START_ADDR=0x2020
-case ${LD_FLAG} in
-    n|N)	TEXT_START_ADDR=0x2000 ;;
-esac
-TARGET_PAGE_SIZE=0x2000
-ARCH=sparc
diff --git a/ld/emulparams/sparclinux.sh b/ld/emulparams/sparclinux.sh
deleted file mode 100644
index e2164bc..0000000
--- a/ld/emulparams/sparclinux.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPT_NAME=aout
-OUTPUT_FORMAT="a.out-sparc-linux"
-TARGET_PAGE_SIZE=0x1000
-TEXT_START_ADDR=0x1020
-case ${LD_FLAG} in
-    n|N)	TEXT_START_ADDR=0 ;;
-esac
-ARCH=sparc
-TEMPLATE_NAME=linux
diff --git a/ld/emulparams/sparcnbsd.sh b/ld/emulparams/sparcnbsd.sh
deleted file mode 100644
index f27daf3..0000000
--- a/ld/emulparams/sparcnbsd.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-SCRIPT_NAME=aout
-TEXT_START_ADDR=0x1020
-OUTPUT_FORMAT="a.out-sparc-netbsd"
-TARGET_PAGE_SIZE=0x1000
-ARCH=sparc
diff --git a/ld/emulparams/sun4.sh b/ld/emulparams/sun4.sh
deleted file mode 100644
index 6cfbccc..0000000
--- a/ld/emulparams/sun4.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-SCRIPT_NAME=aout
-OUTPUT_FORMAT="a.out-sunos-big"
-TEXT_START_ADDR=0x2020
-TARGET_PAGE_SIZE=0x2000
-ALIGNMENT=8
-ARCH=sparc
-TEMPLATE_NAME=sunos
diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in
index f169882..f187d7c 100644
--- a/ld/po/BLD-POTFILES.in
+++ b/ld/po/BLD-POTFILES.in
@@ -66,7 +66,6 @@ eavrxmega4.c
 eavrxmega5.c
 eavrxmega6.c
 eavrxmega7.c
-ecoff_sparc.c
 ecrisaout.c
 ecriself.c
 ecrislinux.c
@@ -290,10 +289,6 @@ eshlelf_nbsd.c
 eshlelf_nto.c
 eshlelf_vxworks.c
 eshpe.c
-esparcaout.c
-esparclinux.c
-esparcnbsd.c
-esun4.c
 etic30aout.c
 etic30coff.c
 etic3xcoff.c
diff --git a/ld/scripttempl/sparccoff.sc b/ld/scripttempl/sparccoff.sc
deleted file mode 100644
index cffc5a9..0000000
--- a/ld/scripttempl/sparccoff.sc
+++ /dev/null
@@ -1,62 +0,0 @@
-# Linker script for Sparc COFF.
-# Based on i386coff.sc by Ian Taylor <ian@cygnus.com>.
-#
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-test -z "$ENTRY" && ENTRY=_start
-
-cat <<EOF
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-${LIB_SEARCH_DIRS}
-
-${RELOCATING+ENTRY (${ENTRY})}
-
-SECTIONS
-{
-  .text ${RELOCATING+ SIZEOF_HEADERS} : {
-    *(.init)
-    *(.text)
-    ${RELOCATING+ etext  =  .;}
-    ${CONSTRUCTING+ ___CTOR_LIST__ = .;}
-    ${CONSTRUCTING+ LONG((___CTOR_END__ - ___CTOR_LIST__) / 4 - 2)}
-    ${CONSTRUCTING+ *(.ctors)}
-    ${CONSTRUCTING+ LONG(0)}
-    ${CONSTRUCTING+ ___CTOR_END__ = .;}
-    ${CONSTRUCTING+ ___DTOR_LIST__ = .;}
-    ${CONSTRUCTING+ LONG((___DTOR_END__ - ___DTOR_LIST__) / 4 - 2)}
-    ${CONSTRUCTING+ *(.dtors)}
-    ${CONSTRUCTING+ LONG(0)}
-    ${CONSTRUCTING+ ___DTOR_END__ = .;}
-    *(.fini)
-    ${RELOCATING+ etext  =  .};
-  }
-  .data ${RELOCATING+ 0x400000 + (. & 0xffc00fff)} : {
-    *(.data)
-    ${RELOCATING+ edata  =  .};
-  }
-  .bss ${RELOCATING+ SIZEOF(.data) + ADDR(.data)} :
-  {
-    *(.bss)
-    *(COMMON)
-    ${RELOCATING+ end = .};
-  }
-  .stab  0 ${RELOCATING+(NOLOAD)} :
-  {
-    [ .stab ]
-  }
-  .stabstr  0 ${RELOCATING+(NOLOAD)} :
-  {
-    [ .stabstr ]
-  }
-}
-EOF
diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index 4f4c511..acf5bfd 100644
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -93,11 +93,7 @@ if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then {
 	 || [string match "*option ignored*" $exec_output]
 	 || [string match "*unrecognized option*" $exec_output]
 	 || [string match "*passed to ld*" $exec_output] } {
-	if [istarget *-*-sunos4*] {
-	    set picflag "-pic"
-	} else {
-	    set picflag "-KPIC"
-	}
+	set picflag "-KPIC"
     }
 }
 
diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp
index fb7a3af..2dfe2aa 100644
--- a/ld/testsuite/ld-elfvsb/elfvsb.exp
+++ b/ld/testsuite/ld-elfvsb/elfvsb.exp
@@ -299,8 +299,6 @@ proc visibility_run {visibility} {
 		if [ string match $support_protected "no" ] {
 		    setup_xfail $target_triplet
 		}
-	    } else {
-		setup_xfail "*-*-sunos4*"
 	    }
 
 	    # Non-pic code uses name binding rules for applications to
@@ -342,9 +340,6 @@ proc visibility_run {visibility} {
 		if [ string match $support_protected "no" ] {
 		    setup_xfail $target_triplet
 		}
-	    } else {
-		setup_xfail "*-*-sunos4*"
-		setup_xfail "*-*-linux*libc1"
 	    }
 	    if { [ string match $visibility "hidden_normal" ]
 		 || [ string match $visibility "hidden_weak" ]
@@ -392,14 +387,11 @@ proc visibility_run {visibility} {
 		    setup_xfail $target_triplet
 		}
 	    }
-	    # SunOS can not compare function pointers correctly
-	    if [istarget "*-*-sunos4*"] {
-		visibility_test $visibility vp "visibility ($visibility)" mainnp.o sh1p.o sh2p.o sun4
-	    } else { if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } {
+	    if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } {
 		visibility_test $visibility vp "visibility ($visibility)" mainnp.o sh1p.o sh2p.o xcoff
 	    } else {
 		visibility_test $visibility vp "visibility ($visibility)" mainnp.o sh1p.o sh2p.o elfvsb $COMPRESS_LDFLAG
-	    } }
+	    }
 	}
     }}
 
@@ -423,8 +415,6 @@ proc visibility_run {visibility} {
 		    if [ string match $support_protected "no" ] {
 			setup_xfail $target_triplet
 		    }
-		} else {
-		    setup_xfail "*-*-sunos4*"
 		}
 		if { ![ string match $visibility "hidden_undef" ]
 		     && ![ string match $visibility "protected_undef" ] } {
@@ -493,11 +483,7 @@ if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then {
 	 || [string match "*option ignored*" $exec_output] \
 	 || [string match "*unrecognized option*" $exec_output] \
 	 || [string match "*passed to ld*" $exec_output] } {
-	if [istarget *-*-sunos4*] {
-	    set picflag "-pic"
-	} else {
-	    set picflag "-KPIC"
-	}
+	set picflag "-KPIC"
     }
 }
 verbose "Using $picflag to compile PIC code"
diff --git a/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp
index 3650f63..d827901 100644
--- a/ld/testsuite/ld-elfweak/elfweak.exp
+++ b/ld/testsuite/ld-elfweak/elfweak.exp
@@ -384,11 +384,7 @@ if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then {
 	 || [string match "*option ignored*" $exec_output]
 	 || [string match "*unrecognized option*" $exec_output]
 	 || [string match "*passed to ld*" $exec_output] } {
-	if [istarget *-*-sunos4*] {
-	    set picflag "-pic"
-	} else {
-	    set picflag "-KPIC"
-	}
+	set picflag "-KPIC"
     }
 }
 verbose "Using $picflag to compile PIC code"
diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp
index 0194057..d4b0c6a 100644
--- a/ld/testsuite/ld-shared/shared.exp
+++ b/ld/testsuite/ld-shared/shared.exp
@@ -50,7 +50,6 @@ if { ![istarget hppa*64*-*-hpux*] \
      && ![istarget powerpc*-*-sysv4*] \
      && ![istarget sparc*-*-elf] \
      && ![istarget sparc*-*-solaris2*] \
-     && ![istarget sparc*-*-sunos4*] \
      && ![istarget sparc*-*-linux*] \
      && ![istarget arm*-*-linux*] \
      && ![istarget alpha*-*-linux*] \
@@ -205,11 +204,7 @@ if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then {
 	 || [string match "*option ignored*" $exec_output] \
 	 || [string match "*unrecognized option*" $exec_output] \
 	 || [string match "*passed to ld*" $exec_output] } {
-	if [istarget *-*-sunos4*] {
-	    set picflag "-pic"
-	} else {
-	    set picflag "-KPIC"
-	}
+	set picflag "-KPIC"
     }
 }
 verbose "Using $picflag to compile PIC code"
@@ -234,7 +229,6 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o]
     } else {
 	# SunOS non PIC shared libraries don't permit some cases of
 	# overriding.
-	setup_xfail "*-*-sunos4*"
 	setup_xfail "ia64-*-linux*"
 	setup_xfail "alpha*-*-linux*"
 	setup_xfail "powerpc64*-*-*"
@@ -259,7 +253,6 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o]
 	# address for the library.  Near as I can tell, the R_*_RELATIVE
 	# relocations for various targets are broken in the case where
 	# the load address is not zero (which is the default).
-	setup_xfail "*-*-sunos4*"
 	setup_xfail "*-*-linux*libc1"
 	setup_xfail "powerpc*-*-linux*"
 	setup_xfail "ia64-*-linux*"
@@ -291,10 +284,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o]
 	 || ![ld_compile "$CC $CFLAGS $SHCFLAG $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } {
 	unresolved "shared"
     } else {
-	# SunOS can not compare function pointers correctly
-	if [istarget "*-*-sunos4*"] {
-	    shared_test shp "shared" mainnp.o sh1p.o sh2p.o sun4
-	} else { if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } {
+	if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } {
 	    shared_test shp "shared" mainnp.o sh1p.o sh2p.o xcoff
 	} else {
 	    shared_test shp "shared" mainnp.o sh1p.o sh2p.o shared
@@ -303,7 +293,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o]
 	    shared_test shp "shared -Bsymbolic" mainnp.o sh1p.o sh2p.o symbolic "-Bsymbolic"
 	    ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o
 	    ld_compile "$CC $CFLAGS $SHCFLAG $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o
-	} }
+	}
     }
 }
 
@@ -318,7 +308,6 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG $picflag" $srcdir/$subdir/main.c $tmpdir/m
 	} else {
 	    # SunOS non PIC shared libraries don't permit some cases of
 	    # overriding.
-	    setup_xfail "*-*-sunos4*"
 	    setup_xfail "ia64-*-linux*"
 	    setup_xfail "alpha*-*-linux*"
 	    setup_xfail "powerpc64*-*-*"