Changeset 625 for trunk/src/binutils/ld/emultempl

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 "ldemul.h"
-#include "ldfile.h"
 #include "ldmisc.h"
 #include "ldexp.h"
@@ -44 +44 @@
 #include "ldgram.h"
 
+
+
+
+
+
+
 static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
 static char *gld${EMULATION_NAME}_get_script PARAMS ((int *isfile));
+
+
+
+
+
+
 
 static void
-gld${EMULATION_NAME}_before_parse()
+gld${EMULATION_NAME}_before_parse()
 {
   ldfile_set_output_arch ("`echo ${ARCH}`");
@@ -71 +83 @@
 #  *isfile = 0;
 #
-#  if (link_info.relocateable == true && config.build_constructors == true)
+#  if (link_info.relocateable == )
 #    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 == ) 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 == )
     return "ldscripts/${EMULATION_NAME}.xu";
-  else if (link_info.relocateable == true)
+  else if (link_info.relocateable == )
     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
+int
 parse (arg, format, error)
-  char *arg, *format;
-  int error;
+  char *arg, *format, *error;
 {
   int x;