This commit was generated by cvs2svn to track changes on a CVS vendor

[deliverable/binutils-gdb.git] / binutils / dllwrap.c

diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index 235b5dad5cf3cdc9f591bb647f7ce341c2ccc9d5..25bf519d192e1a5d847ec4cc0c00555b07bb6599 100644 (file)
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -1,5 +1,5 @@
 /* dllwrap.c -- wrapper for DLLTOOL and GCC to generate PE style DLLs
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
    Contributed by Mumit Khan (khan@xraylith.wisc.edu).
 
    This file is part of GNU Binutils.
@@ -94,7 +94,7 @@ static char *target = TARGET;
 typedef enum {
   UNKNOWN_TARGET, 
   CYGWIN_TARGET, 
-  MINGW32_TARGET
+  MINGW_TARGET
 } 
 target_type;
 
@@ -178,7 +178,7 @@ inform (message, va_alist)
 /* Look for the program formed by concatenating PROG_NAME and the
    string running from PREFIX to END_PREFIX.  If the concatenated
    string contains a '/', try appending EXECUTABLE_SUFFIX if it is
-   defined.  */
+   appropriate.  */
 
 static char *
 look_for_prog (prog_name, prefix, end_prefix)
@@ -191,7 +191,7 @@ look_for_prog (prog_name, prefix, end_prefix)
 
   cmd = xmalloc (strlen (prefix) 
                  + strlen (prog_name) 
-#ifdef EXECUTABLE_SUFFIX
+#ifdef HAVE_EXECUTABLE_SUFFIX
                  + strlen (EXECUTABLE_SUFFIX) 
 #endif
                 + 10);
@@ -204,7 +204,7 @@ look_for_prog (prog_name, prefix, end_prefix)
       int found;
 
       found = (stat (cmd, &s) == 0
-#ifdef EXECUTABLE_SUFFIX
+#ifdef HAVE_EXECUTABLE_SUFFIX
                || stat (strcat (cmd, EXECUTABLE_SUFFIX), &s) == 0
 #endif
               );
@@ -830,10 +830,10 @@ main (argc, argv)
     }
   
   /* set the target platform. */
-  if (strstr (target, "cygwin32"))
+  if (strstr (target, "cygwin"))
     which_target = CYGWIN_TARGET;
-  else if (strstr (target, "mingw32"))
-    which_target = MINGW32_TARGET;
+  else if (strstr (target, "mingw"))
+    which_target = MINGW_TARGET;
   else 
     which_target = UNKNOWN_TARGET;
 
@@ -869,7 +869,7 @@ main (argc, argv)
           driver_flags = cygwin_driver_flags;
          break;
        
-       case MINGW32_TARGET:
+       case MINGW_TARGET:
           driver_flags = mingw32_driver_flags;
          break;
        
@@ -890,7 +890,7 @@ main (argc, argv)
          entry_point = "__cygwin_dll_entry@12";
          break;
        
-       case MINGW32_TARGET:
+       case MINGW_TARGET:
          entry_point = "_DllMainCRTStartup@12";
          break;