* ld-pe/pe-run.exp (proc test_direct_link_dll): Always pass

	--enable-auto-import to the linker.
	* ld-pe/vers-script-1.d:  Replace '\$' by '_' in all symbol names.
	* ld-pe/vers-script-3.d:  Likewise.
	* ld-pe/vers-script-4.d:  Likewise.
	* ld-pe/vers-script-dll.c:  Likewise.
	* lib/ld-lib.exp (proc is_pecoff_format):  Also return true for
	"*-*-cegcc*" targets.

5 files changed, 28 insertions, 24 deletions

diff --git a/ld/testsuite/ld-pe/pe-run.exp b/ld/testsuite/ld-pe/pe-run.exp
index 3e7c356..9fa6bdb 100755
--- a/ld/testsuite/ld-pe/pe-run.exp
+++ b/ld/testsuite/ld-pe/pe-run.exp
@@ -83,7 +83,8 @@ proc test_direct_link_dll {} {
 	} else {
 	    # Check linking directly to direct_dll.dll.
 	    set msg "linking client (.dll)"
-	    if [ld_simple_link $CC $tmpdir/direct_client_dll.exe "$tmpdir/direct_client.o $tmpdir/direct_dll.dll" ] {
+	    if [ld_simple_link "$CC -Wl,--enable-auto-import" $tmpdir/direct_client_dll.exe
+	      "$tmpdir/direct_client.o $tmpdir/direct_dll.dll" ] {
 		pass $msg
 	    } else {
 		fail $msg 
@@ -91,7 +92,8 @@ proc test_direct_link_dll {} {
 
 	    # Check linking directly to direct_dll.sl.
 	    set msg "linking client (.sl)"
-	    if [ld_simple_link $CC $tmpdir/direct_client_sl.exe "$tmpdir/direct_client.o $tmpdir/direct_dll.sl" ] {
+	    if [ld_simple_link "$CC -Wl,--enable-auto-import" $tmpdir/direct_client_sl.exe
+	      "$tmpdir/direct_client.o $tmpdir/direct_dll.sl" ] {
 		pass $msg
 	    } else {
 		fail $msg 
@@ -101,7 +103,8 @@ proc test_direct_link_dll {} {
 	    # Create symbolic link.
 	    catch "exec ln -fs direct_dll.dll $tmpdir/libdirect_dll.dll.a" ln_catch
 	    set msg "linking client (symlink -> .dll)"
-	    if [ld_simple_link $CC $tmpdir/direct_client_symlink_dll.exe "$tmpdir/direct_client.o $tmpdir/libdirect_dll.dll.a" ] {
+	    if [ld_simple_link "$CC -Wl,--enable-auto-import" $tmpdir/direct_client_symlink_dll.exe
+	      "$tmpdir/direct_client.o $tmpdir/libdirect_dll.dll.a" ] {
 	        pass $msg
 	    } else {
 		fail $msg
@@ -111,7 +114,8 @@ proc test_direct_link_dll {} {
 	    # Create symbolic link.
 	    catch "exec ln -fs direct_dll.sl $tmpdir/libdirect_sl.dll.a" ln_catch
 	    set msg "linking client (symlink -> .sl)"
-	    if [ld_simple_link $CC $tmpdir/direct_client_symlink_sl.exe "$tmpdir/direct_client.o $tmpdir/libdirect_sl.dll.a" ] {
+	    if [ld_simple_link "$CC -Wl,--enable-auto-import" $tmpdir/direct_client_symlink_sl.exe
+	      "$tmpdir/direct_client.o $tmpdir/libdirect_sl.dll.a" ] {
 		pass $msg
 	    } else {
 		fail $msg 
diff --git a/ld/testsuite/ld-pe/vers-script-1.d b/ld/testsuite/ld-pe/vers-script-1.d
index a6c0bec..d494cfc 100644
--- a/ld/testsuite/ld-pe/vers-script-1.d
+++ b/ld/testsuite/ld-pe/vers-script-1.d
@@ -80,11 +80,11 @@ EXPORTS
     _Z9_Jv_ZFreePvS_ @79
     _Z9_Jv_equalP13_Jv_Utf8ConstPN4java4lang6StringEi @80
     _Z9shsUpdateP8SHS_INFOPhi @81
-    _ZGr30_java\$Sutil\$Sweeks\$_properties @82
-    _ZGr32_java\$Sutil\$Siso4217\$_properties @83
-    _ZGr48_gnu\$Sjavax\$Sprint\$SPrinterDialog_de\$_properties @84
-    _ZGr49_gnu\$Sjava\$Slocale\$SLocaleInformation\$_properties @85
-    _ZGr51_gnu\$Sjava\$Sutil\$Sregex\$SMessagesBundle\$_properties @86
+    _ZGr30_java_Sutil_Sweeks__properties @82
+    _ZGr32_java_Sutil_Siso4217__properties @83
+    _ZGr48_gnu_Sjavax_Sprint_SPrinterDialog_de__properties @84
+    _ZGr49_gnu_Sjava_Slocale_SLocaleInformation__properties @85
+    _ZGr51_gnu_Sjava_Sutil_Sregex_SMessagesBundle__properties @86
     _ZTVN5javax8security4auth4x50021X500PrivateCredentialE @87
     _ZTVN5javax8security4auth5login12LoginContextE @88
     _ZTVN5javax8security4auth5login13ConfigurationE @89
diff --git a/ld/testsuite/ld-pe/vers-script-3.d b/ld/testsuite/ld-pe/vers-script-3.d
index 679a655..0feafe0 100644
--- a/ld/testsuite/ld-pe/vers-script-3.d
+++ b/ld/testsuite/ld-pe/vers-script-3.d
@@ -62,11 +62,11 @@ EXPORTS
     _Z9_Jv_ZFreePvS_ @61
     _Z9_Jv_equalP13_Jv_Utf8ConstPN4java4lang6StringEi @62
     _Z9shsUpdateP8SHS_INFOPhi @63
-    _ZGr30_java\$Sutil\$Sweeks\$_properties @64
-    _ZGr32_java\$Sutil\$Siso4217\$_properties @65
-    _ZGr48_gnu\$Sjavax\$Sprint\$SPrinterDialog_de\$_properties @66
-    _ZGr49_gnu\$Sjava\$Slocale\$SLocaleInformation\$_properties @67
-    _ZGr51_gnu\$Sjava\$Sutil\$Sregex\$SMessagesBundle\$_properties @68
+    _ZGr30_java_Sutil_Sweeks__properties @64
+    _ZGr32_java_Sutil_Siso4217__properties @65
+    _ZGr48_gnu_Sjavax_Sprint_SPrinterDialog_de__properties @66
+    _ZGr49_gnu_Sjava_Slocale_SLocaleInformation__properties @67
+    _ZGr51_gnu_Sjava_Sutil_Sregex_SMessagesBundle__properties @68
     _ZTVN5javax8security4auth4x50021X500PrivateCredentialE @69
     _ZTVN5javax8security4auth5login12LoginContextE @70
     _ZTVN5javax8security4auth5login13ConfigurationE @71
diff --git a/ld/testsuite/ld-pe/vers-script-4.d b/ld/testsuite/ld-pe/vers-script-4.d
index 679a655..0feafe0 100644
--- a/ld/testsuite/ld-pe/vers-script-4.d
+++ b/ld/testsuite/ld-pe/vers-script-4.d
@@ -62,11 +62,11 @@ EXPORTS
     _Z9_Jv_ZFreePvS_ @61
     _Z9_Jv_equalP13_Jv_Utf8ConstPN4java4lang6StringEi @62
     _Z9shsUpdateP8SHS_INFOPhi @63
-    _ZGr30_java\$Sutil\$Sweeks\$_properties @64
-    _ZGr32_java\$Sutil\$Siso4217\$_properties @65
-    _ZGr48_gnu\$Sjavax\$Sprint\$SPrinterDialog_de\$_properties @66
-    _ZGr49_gnu\$Sjava\$Slocale\$SLocaleInformation\$_properties @67
-    _ZGr51_gnu\$Sjava\$Sutil\$Sregex\$SMessagesBundle\$_properties @68
+    _ZGr30_java_Sutil_Sweeks__properties @64
+    _ZGr32_java_Sutil_Siso4217__properties @65
+    _ZGr48_gnu_Sjavax_Sprint_SPrinterDialog_de__properties @66
+    _ZGr49_gnu_Sjava_Slocale_SLocaleInformation__properties @67
+    _ZGr51_gnu_Sjava_Sutil_Sregex_SMessagesBundle__properties @68
     _ZTVN5javax8security4auth4x50021X500PrivateCredentialE @69
     _ZTVN5javax8security4auth5login12LoginContextE @70
     _ZTVN5javax8security4auth5login13ConfigurationE @71
diff --git a/ld/testsuite/ld-pe/vers-script-dll.c b/ld/testsuite/ld-pe/vers-script-dll.c
index 9b7a574..547ddb5 100755
--- a/ld/testsuite/ld-pe/vers-script-dll.c
+++ b/ld/testsuite/ld-pe/vers-script-dll.c
@@ -148,9 +148,9 @@ FUNC(_Z9_Jv_RunGCv)
 FUNC(_Z9_Jv_ZFreePvS_)
 FUNC(_Z9_Jv_equalP13_Jv_Utf8ConstPN4java4lang6StringEi)
 FUNC(_Z9shsUpdateP8SHS_INFOPhi)
-FUNC(_ZGr30_java$Sutil$Sweeks$_properties)
-FUNC(_ZGr32_java$Sutil$Siso4217$_properties)
-FUNC(_ZGr48_gnu$Sjavax$Sprint$SPrinterDialog_de$_properties)
-FUNC(_ZGr49_gnu$Sjava$Slocale$SLocaleInformation$_properties)
-FUNC(_ZGr51_gnu$Sjava$Sutil$Sregex$SMessagesBundle$_properties)
+FUNC(_ZGr30_java_Sutil_Sweeks__properties)
+FUNC(_ZGr32_java_Sutil_Siso4217__properties)
+FUNC(_ZGr48_gnu_Sjavax_Sprint_SPrinterDialog_de__properties)
+FUNC(_ZGr49_gnu_Sjava_Slocale_SLocaleInformation__properties)
+FUNC(_ZGr51_gnu_Sjava_Sutil_Sregex_SMessagesBundle__properties)