Set the machine number as well as the architecture when converting from a

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

diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index 4ca59366a0291332f29ab60bff66aa8024b005b5..e4db7bae53878ab22cdefd5640fe86afbc790bdf 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 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Mumit Khan (khan@xraylith.wisc.edu).
 
    This file is part of GNU Binutils.
@@ -114,17 +114,17 @@ static int delete_base_file = 1;
 static int delete_exp_file = 1;
 static int delete_def_file = 1;
 
-static int run PARAMS ((const char *, char *));
-static char *mybasename PARAMS ((const char *));
-static int strhash PARAMS ((const char *));
-static void usage PARAMS ((FILE *, int));
-static void display PARAMS ((const char *, va_list));
-static void inform PARAMS ((const char *, ...));
-static void warn PARAMS ((const char *, ...));
-static char *look_for_prog PARAMS ((const char *, const char *, int));
-static char *deduce_name PARAMS ((const char *));
-static void delete_temp_files PARAMS ((void));
-static void cleanup_and_exit PARAMS ((int));
+static int run (const char *, char *);
+static char *mybasename (const char *);
+static int strhash (const char *);
+static void usage (FILE *, int);
+static void display (const char *, va_list);
+static void inform (const char *, ...);
+static void warn (const char *, ...);
+static char *look_for_prog (const char *, const char *, int);
+static char *deduce_name (const char *);
+static void delete_temp_files (void);
+static void cleanup_and_exit (int);
 
 /**********************************************************************/
 
@@ -137,9 +137,7 @@ static void cleanup_and_exit PARAMS ((int));
    (hopefully) soon be retired in favor of `ld --shared.  */
 
 static void
-display (message, args)
-     const char * message;
-     va_list      args;
+display (const char * message, va_list args)
 {
   if (program_name != NULL)
     fprintf (stderr, "%s: ", program_name);
@@ -180,10 +178,7 @@ warn VPARAMS ((const char *format, ...))
    appropriate.  */
 
 static char *
-look_for_prog (prog_name, prefix, end_prefix)
-     const char *prog_name;
-     const char *prefix;
-     int end_prefix;
+look_for_prog (const char *prog_name, const char *prefix, int end_prefix)
 {
   struct stat s;
   char *cmd;
@@ -249,8 +244,7 @@ look_for_prog (prog_name, prefix, end_prefix)
    Returns a dynamically allocated string.  */
 
 static char *
-deduce_name (prog_name)
-     const char *prog_name;
+deduce_name (const char *prog_name)
 {
   char *cmd;
   char *dash, *slash, *cp;
@@ -298,7 +292,7 @@ deduce_name (prog_name)
 }
 
 static void
-delete_temp_files ()
+delete_temp_files (void)
 {
   if (delete_base_file && base_file_name)
     {
@@ -349,17 +343,14 @@ delete_temp_files ()
 }
 
 static void
-cleanup_and_exit (status)
-     int status;
+cleanup_and_exit (int status)
 {
   delete_temp_files ();
   exit (status);
 }
 
 static int
-run (what, args)
-     const char *what;
-     char *args;
+run (const char *what, char *args)
 {
   char *s;
   int pid, wait_status, retcode;
@@ -445,8 +436,7 @@ run (what, args)
 }
 
 static char *
-mybasename (name)
-     const char *name;
+mybasename (const char *name)
 {
   const char *base = name;
 
@@ -462,8 +452,7 @@ mybasename (name)
 }
 
 static int
-strhash (str)
-     const char *str;
+strhash (const char *str)
 {
   const unsigned char *s;
   unsigned long hash;
@@ -488,9 +477,7 @@ strhash (str)
 /**********************************************************************/
 
 static void
-usage (file, status)
-     FILE *file;
-     int status;
+usage (FILE *file, int status)
 {
   fprintf (file, _("Usage %s <option(s)> <object-file(s)>\n"), program_name);
   fprintf (file, _("  Generic options:\n"));
@@ -552,7 +539,7 @@ usage (file, status)
 /* DLLTOOL options.  */
 #define OPTION_NODELETE                (OPTION_MNO_CYGWIN + 1)
 #define OPTION_DLLNAME         (OPTION_NODELETE + 1)
-#define OPTION_NO_IDATA4       (OPTION_DLLNAME + 1)
+#define OPTION_NO_IDATA4       (OPTION_DLLNAME + 1)
 #define OPTION_NO_IDATA5       (OPTION_NO_IDATA4 + 1)
 #define OPTION_OUTPUT_EXP      (OPTION_NO_IDATA5 + 1)
 #define OPTION_OUTPUT_DEF      (OPTION_OUTPUT_EXP + 1)
@@ -611,12 +598,10 @@ static const struct option long_options[] =
   {0, 0, 0, 0}
 };
 
-int main PARAMS ((int, char **));
+int main (int, char **);
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int c;
   int i;