Re: [PATCH] Add new CeGCC target names.

[Dave Korn <dave dot korn dot cygwin at googlemail dot com>]

Nick Clifton wrote:
> Hi Dave,

>>   Merge cegcc and mingw32ce target name changes from CeGCC project.

> Approved - please apply.

  Thank you, applied, with one very minor modification:

--- gas/configure.tgt	16 Apr 2009 15:39:44 -0000	1.48
+++ gas/configure.tgt	27 May 2009 19:04:48 -0000
@@ -121,7 +121,8 @@ case ${generic_target} in
   arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
   arm-*-nto*)				fmt=elf ;;
   arm-epoc-pe | thumb-epoc-pe)		fmt=coff em=epoc-pe ;;
-  arm-wince-pe | arm-*-wince)		fmt=coff em=wince-pe ;;
+  arm-wince-* | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)

  In this hunk, I didn't mean to change arm-wince-pe to arm-wince-*, so I
undid that bit; the patch as committed now only adds the two extra names to
the end of the line.

  Attached is the follow up patch which fixes a few minor glitches in the
testsuite for the new targets: these are only PE testsuite changes, which I
figure I can check in myself (maybe it's a slight stretch to include the
PE-specific function in ld-lib.exp, let me know if so and I can avoid doing it
again in future).  There remain a number of gas failures, largely related to
assumptions-of-ELFism in the respective tests; I'll take a look when I get a
chance soon to see which can be tweaked and which might be XFAILed.

ld/testsuite/ChangeLog:

	* 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.

    cheers,
      DaveK

Index: ld/testsuite/ld-pe/pe-run.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-pe/pe-run.exp,v
retrieving revision 1.1
diff -p -u -r1.1 pe-run.exp
--- ld/testsuite/ld-pe/pe-run.exp	19 May 2009 16:08:08 -0000	1.1
+++ ld/testsuite/ld-pe/pe-run.exp	18 Jun 2009 02:31:41 -0000
@@ -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 
Index: ld/testsuite/ld-pe/vers-script-1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-pe/vers-script-1.d,v
retrieving revision 1.1
diff -p -u -r1.1 vers-script-1.d
--- ld/testsuite/ld-pe/vers-script-1.d	4 May 2009 12:09:30 -0000	1.1
+++ ld/testsuite/ld-pe/vers-script-1.d	18 Jun 2009 02:31:41 -0000
@@ -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
Index: ld/testsuite/ld-pe/vers-script-3.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-pe/vers-script-3.d,v
retrieving revision 1.1
diff -p -u -r1.1 vers-script-3.d
--- ld/testsuite/ld-pe/vers-script-3.d	4 May 2009 12:09:30 -0000	1.1
+++ ld/testsuite/ld-pe/vers-script-3.d	18 Jun 2009 02:31:41 -0000
@@ -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
Index: ld/testsuite/ld-pe/vers-script-4.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-pe/vers-script-4.d,v
retrieving revision 1.1
diff -p -u -r1.1 vers-script-4.d
--- ld/testsuite/ld-pe/vers-script-4.d	4 May 2009 12:09:30 -0000	1.1
+++ ld/testsuite/ld-pe/vers-script-4.d	18 Jun 2009 02:31:41 -0000
@@ -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
Index: ld/testsuite/ld-pe/vers-script-dll.c
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-pe/vers-script-dll.c,v
retrieving revision 1.1
diff -p -u -r1.1 vers-script-dll.c
--- ld/testsuite/ld-pe/vers-script-dll.c	4 May 2009 12:09:30 -0000	1.1
+++ ld/testsuite/ld-pe/vers-script-dll.c	18 Jun 2009 02:31:41 -0000
@@ -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)
 
Index: ld/testsuite/lib/ld-lib.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/lib/ld-lib.exp,v
retrieving revision 1.63
diff -p -u -r1.63 ld-lib.exp
--- ld/testsuite/lib/ld-lib.exp	20 May 2009 13:40:38 -0000	1.63
+++ ld/testsuite/lib/ld-lib.exp	18 Jun 2009 02:31:41 -0000
@@ -447,6 +447,7 @@ proc is_aout_format {} {
 proc is_pecoff_format {} {
     if { ![istarget *-*-mingw*] \
 	 && ![istarget *-*-cygwin*] \
+	 && ![istarget *-*-cegcc*] \
 	 && ![istarget *-*-pe*] } {
 	return 0
     }