Damjan Jovanovic : winegcc: Support the mingw32 target without an i[3456] 86- prefix.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d31f61414ccc0c0717f28ce5b6e82b5558a18c62
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d31f61414ccc0c0717f28ce5b6...

Author: Damjan Jovanovic <damjan.jov(a)gmail.com>
Date:   Thu Jun 14 20:36:02 2012 +0200

winegcc: Support the mingw32 target without an i[3456]86- prefix.

---

 tools/winegcc/winegcc.c |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 318c86a..3550960 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1184,20 +1184,29 @@ static void parse_target_option( struct options *opts, const char *target )
 
     /* get the CPU part */
 
-    if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target );
-    *p++ = 0;
-    for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++)
+    if ((p = strchr( spec, '-' )))
     {
-        if (!strcmp( cpu_names[i].name, spec ))
+        *p++ = 0;
+        for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++)
         {
-            opts->target_cpu = cpu_names[i].cpu;
-            break;
+            if (!strcmp( cpu_names[i].name, spec ))
+            {
+                opts->target_cpu = cpu_names[i].cpu;
+                break;
+            }
         }
+        if (i == sizeof(cpu_names)/sizeof(cpu_names[0]))
+            error( "Unrecognized CPU '%s'\n", spec );
+        platform = p;
+        if ((p = strrchr( p, '-' ))) platform = p + 1;
     }
-    if (i == sizeof(cpu_names)/sizeof(cpu_names[0]))
-        error( "Unrecognized CPU '%s'\n", spec );
-    platform = p;
-    if ((p = strrchr( p, '-' ))) platform = p + 1;
+    else if (!strcmp( spec, "mingw32" ))
+    {
+        opts->target_cpu = CPU_x86;
+        platform = spec;
+    }
+    else
+        error( "Invalid target specification '%s'\n", target );
 
     /* get the OS part */