+2020-04-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * testsuite/ld-shared/shared.exp: Remove dangling comments.
+       xfail shared non PIC tests on Solaris.
+
 2020-04-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * testsuite/ld-elf/shared.exp: Add -Av9 to AFLAGS_PIC on sparc*-*-*.
 
     } else { if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } {
        shared_test shnp "shared (nonPIC)" mainnp.o sh1np.o sh2np.o xcoff
     } else {
-       # SunOS non PIC shared libraries don't permit some cases of
-       # overriding.
+       # Solaris defaults to -z text.
+       setup_xfail "*-*-solaris2*"
        setup_xfail "ia64-*-linux*"
        setup_xfail "alpha*-*-linux*"
        setup_xfail "powerpc64*-*-*"
            setup_xfail "arm*-*-linux*"
        }
        setup_xfail "aarch64*-*-linux*"
+       # Solaris defaults to -z text.
+       setup_xfail "*-*-solaris2*"
        shared_test shnp "shared (non PIC, load offset)" \
                mainnp.o sh1np.o sh2np.o shared \
                "-Wl,-T,$srcdir/$subdir/elf-offset.ld,--hash-style=sysv"
         if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } {
            shared_test shmpnp "shared (PIC main, non PIC so)" mainp.o sh1np.o sh2np.o xcoff
        } else {
-           # SunOS non PIC shared libraries don't permit some cases of
-           # overriding.
+           # Solaris defaults to -z text.
+           setup_xfail "*-*-solaris2*"
            setup_xfail "ia64-*-linux*"
            setup_xfail "alpha*-*-linux*"
            setup_xfail "powerpc64*-*-*"