summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2000-01-05 00:03:36 +0000
committerNick Clifton <nickc@redhat.com>2000-01-05 00:03:36 +0000
commit087f88b2308ec38f3ce78da35353c3c96fc07513 (patch)
tree473b18457511753d3ca9ca8ce0c36111a9da9c14
parent5f0f29c341840a237a572b907aacad6948039b16 (diff)
downloadbinutils-gdb-087f88b2308ec38f3ce78da35353c3c96fc07513.tar.gz
Apply Mumit Khan's patch to remove 32 postfix from cygwin and mingw
-rw-r--r--binutils/ChangeLog3
-rw-r--r--binutils/dllwrap.c14
2 files changed, 10 insertions, 7 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 0188737a455..98ce3bb3213 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -7,6 +7,9 @@
(usage): Handle.
(main): Handle.
+ * dllwrap.c (enum target_type): Rename MINGW32_TARGET to MINGW_TARGET.
+ (main): Use. Don't look for "32" in cygwin and mingw target names.
+
2000-01-03 Nick Clifton <nickc@cygnus.com>
* binutils.texi: Document new, ARM specific disassembler
diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index 84606fb2b8e..25bf519d192 100644
--- 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;
@@ -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;