Changeset 625

Timestamp:

Aug 17, 2003, 3:45:55 AM (22 years ago)

Author:

bird

Message:

#597: Corrected struct initialization and fixed some compiler warnings.

File:

• trunk/src/binutils/ld/emultempl/i386aoutemx.em (modified) (14 diffs, 1 prop)

trunk/src/binutils/ld/emultempl/i386aoutemx.em

@@ -36 +36 @@
 #include "ld.h"
 #include "ldmain.h"
+#include "ldfile.h"
 #include "ldemul.h"
-#include "ldfile.h"
 #include "ldmisc.h"
 #include "ldexp.h"
@@ -44 +44 @@
 #include "ldgram.h"
 
+#ifdef ANSI_PROTOTYPES
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
 static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
 static char *gld${EMULATION_NAME}_get_script PARAMS ((int *isfile));
+static int gld${EMULATION_NAME}_parse_args PARAMS ((int argc, char **argv));
+static bfd_boolean gld${EMULATION_NAME}_unrecognized_file PARAMS ((lang_input_statement_type *entry));
+
+
+static int parse PARAMS ((char *arg, char *format, char *error));
+
 
 static void
-gld${EMULATION_NAME}_before_parse()
+gld${EMULATION_NAME}_before_parse(void)
 {
   ldfile_set_output_arch ("`echo ${ARCH}`");
@@ -71 +83 @@
 #  *isfile = 0;
 #
-#  if (link_info.relocateable == true && config.build_constructors == true)
+#  if (link_info.relocateable == TRUE && config.build_constructors == TRUE)
 #    return
 #EOF
 #sed $sc ldscripts/${EMULATION_NAME}.xu                     >> e${EMULATION_NAME}.c
-#echo '  ; else if (link_info.relocateable == true) return' >> e${EMULATION_NAME}.c
+#echo '  ; else if (link_info.relocateable == TRUE) return' >> e${EMULATION_NAME}.c
 #sed $sc ldscripts/${EMULATION_NAME}.xr                     >> e${EMULATION_NAME}.c
 #echo '  ; else if (!config.text_read_only) return'         >> e${EMULATION_NAME}.c
@@ -105 +117 @@
   *isfile = 1;
 
-  if (link_info.relocateable == true && config.build_constructors == true)
+  if (link_info.relocateable == TRUE && config.build_constructors == TRUE)
     return "ldscripts/${EMULATION_NAME}.xu";
-  else if (link_info.relocateable == true)
+  else if (link_info.relocateable == TRUE)
     return "ldscripts/${EMULATION_NAME}.xr";
   else if (!config.text_read_only)
@@ -125 +137 @@
 
 /* Report a fatal error.
-   STRING is a printf format string and ARG is one arg for it.  */
-
-void
-fatal (string, arg1, arg2)
- char *string, *arg1, *arg2;
-{
+   FMT is a printf format string and ARG is one arg for it.  */
+
+static void fatal VPARAMS ((char *fmt, ...))
+{
+  VA_OPEN (arg, fmt);
+  VA_FIXEDARG (arg, char *, fmt);
+
   fprintf (stderr, "%s: ", program_name);
-  fprintf (stderr, string, arg1, arg2);
+  vfprintf (stderr, fmt, arg);
+  VA_CLOSE (arg);
   fprintf (stderr, "\n");
   xexit (1);
@@ -141 +155 @@
    generating the error message using format string ERROR and ARG as arg.  */
 
-int
+static int
 parse (arg, format, error)
-  char *arg, *format;
-  int error;
+  char *arg, *format, *error;
 {
   int x;
@@ -204 +217 @@
 } rsxnt_linked = EMX_DEFAULT;
 
-int gld_${EMULATION_NAME}_parse_args (argc, argv)
+static int gld${EMULATION_NAME}_parse_args (argc, argv)
  int argc;
  char **argv;
@@ -256 +269 @@
  * output_filename is not effective).
  */
-void gld${EMULATION_NAME}_set_symbols ()
+static void gld${EMULATION_NAME}_set_symbols (void)
 {
   char *ext, *tmp_dir, *tmp;
@@ -275 +288 @@
 
   /* Always generate relocatable output since ld is just the first stage ... */
-  link_info.relocateable = true;
+  link_info.relocateable = TRUE;
 
   if (exe_flag)
@@ -296 +309 @@
     if (stricmp (ext, ".dll") == 0)
     {
-      link_info.relocateable = true;
+      link_info.relocateable = TRUE;
       dll_flag = 1;
     }
@@ -327 +340 @@
 }
 
-boolean gld_${EMULATION_NAME}_unrecognized_file (entry)
+static bfd_boolean gld${EMULATION_NAME}_unrecognized_file (entry)
  lang_input_statement_type *entry;
 {
@@ -338 +351 @@
     {
       def_filename = entry->filename;
-      entry->loaded = true;
-      return true;
+      entry->loaded = TRUE;
+      return TRUE;
     }
     else if (stricmp (ext, ".res") == 0)
     {
       res_filename = entry->filename;
-      entry->loaded = true;
-      return true;
-    }
-  }
-
-  return false;
-}
-
-extern u_int DosCopy (char *pszSource, char *pszTarget, u_int ulOption);
+      entry->loaded = TRUE;
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+extern u_int _System DosCopy (char *pszSource, char *pszTarget, u_int ulOption);
 
 /* Perform final action(s) on output file */
-void gld_${EMULATION_NAME}_finish_link (char *filename)
+static void gld${EMULATION_NAME}_finish_link (char *filename)
 {
   struct stat statbuf;
@@ -497 +510 @@
 
 /* Create any output sections needed by the target.  */
-void gld${EMULATION_NAME}_create_output_section_statements (void)
+static void gld${EMULATION_NAME}_create_output_section_statements (void)
 {
   /* Since we enabled relocations LD marked output file as non-pageable */
-  /* However, this is not true for emx: always generate paged output */
+  /* However, this is not TRUE for emx: always generate paged output */
   output_bfd->flags |= D_PAGED;
 }
@@ -523 +536 @@
   NULL, /* place orphan */
   gld${EMULATION_NAME}_set_symbols, /* set symbols */
-  gld_${EMULATION_NAME}_parse_args,
-  gld_${EMULATION_NAME}_unrecognized_file,
+  gld${EMULATION_NAME}_parse_args,
+  NULL, /* add_options */
+  NULL, /* handle_option */
+  gld${EMULATION_NAME}_unrecognized_file,
   NULL, /* list_options */
   NULL, /* recognized_file */
   NULL, /* find_potential_libraries */
-  NULL  /* new_vers_pattern.  */
-  gld_${EMULATION_NAME}_finish_link
+  NULL, /* new_vers_pattern.  */
+  gld${EMULATION_NAME}_finish_link
 };
 EOF