Changeset 99 for trunk/src/binutils/ld

Timestamp:

May 7, 2003, 2:12:21 PM (22 years ago)

Author:

bird

Message:

abort() macro clash. Missing prototypes. Wrong function table initialization.

File:

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

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

@@ -64 +64 @@
 
 # sed commands to quote an ld script as a C string.
-sc="-f ${srcdir}/emultempl/stringify.sed"
+# bird: stringify.sed is in current directory.
+sc="-f stringify.sed"
 
 #cat >>e${EMULATION_NAME}.c <<EOF
@@ -143 +144 @@
 parse (arg, format, error)
   char *arg, *format;
+  int error;
 {
   int x;
@@ -176 +178 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+/* bird: clash with abort macro in ld should really include this earlier
+ *       Quick fix is to undefine the abort macro.
+ */
+#undef abort
 #include <process.h>
+#define abort() ld_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__)
+/* bird: include headers for alloca and utime too please */
+#include <alloca.h>
+#include <sys/utime.h>
 
 static const char *exe_filename;
@@ -324 +334 @@
   ext = _getext (entry->filename);
   if (ext != NULL)
+  {
     if (stricmp (ext, ".def") == 0)
     {
@@ -336 +347 @@
       return true;
     }
+  }
 
   return false;
@@ -513 +525 @@
   gld_${EMULATION_NAME}_parse_args,
   gld_${EMULATION_NAME}_unrecognized_file,
+  NULL, /* list_options */
+  NULL, /* recognized_file */
+  NULL, /* find_potential_libraries */
   gld_${EMULATION_NAME}_finish_link
 };