Changeset 86 for trunk/src/binutils/ld

Timestamp:

May 3, 2003, 11:45:43 PM (22 years ago)

Author:

bird

Message:

Applied the original 2.11.2 diff.

Location:

trunk/src/binutils/ld

Files:

• Makefile.in (modified) (1 diff, 1 prop)
• configure.host (modified) (1 diff, 1 prop)
• configure.tgt (modified) (1 diff, 1 prop)
• emulparams/i386aoutemx.sh (added)
• emultempl/i386aoutemx.em (added)
• ldctor.c (modified) (1 diff, 1 prop)
• ldemul.c (modified) (1 diff, 1 prop)
• ldemul.h (modified) (1 diff, 1 prop)
• ldfile.c (modified) (1 diff, 1 prop)
• ldmain.c (modified) (2 diffs, 1 prop)
• scripttempl/i386aoutemx.sc (added)

trunk/src/binutils/ld/Makefile.in

@@ -1317 +1317 @@
   $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
         ${GENSCRIPTS} i386pe_posix "$(tdir_i386pe_posix)"
+ei386aoutemx.c: $(srcdir)/emulparams/i386aout.sh \
+  $(srcdir)/emultempl/i386aoutemx.em $(srcdir)/scripttempl/i386aoutemx.sc ${GEN_DEPENDS}
+        ${GENSCRIPTS} i386aoutemx "$(tdir_i386aoutemx)"
 elnk960.c: $(srcdir)/emulparams/lnk960.sh \
   $(srcdir)/emultempl/lnk960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}

trunk/src/binutils/ld/configure.host

@@ -223 +223 @@
   ;;
 
+*-*-os2*)
+  HLDFLAGS="-s -Zexe -Zcrtdll"
+  NATIVE_LIB_DIRS=/emx/lib
 esac

trunk/src/binutils/ld/configure.tgt

@@ -171 +171 @@
 i[3456]86-*-interix*)   targ_emul=i386pe_posix;
                         targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+i[3456]86-*-os2)        targ_emul=i386aoutemx; tdir_i386emx=i386aoutemx ;;
 i[3456]86-*-beospe*)    targ_emul=i386beos ;;
 i[3456]86-*-beos*)      targ_emul=elf_i386_be ;;

trunk/src/binutils/ld/ldctor.c

@@ -363 +363 @@
               if (e->name != NULL)
                 minfo ("%T\n", e->name);
-              else
+              else if (e->section->owner)
                 minfo ("%G\n", e->section->owner, e->section, e->value);
+              else
+                minfo ("*unknown*\n");
             }
 

trunk/src/binutils/ld/ldemul.c

@@ -304 +304 @@
   return 0;
 }
+
+void
+ldemul_finish_link (char *filename)
+{
+ if (ld_emulation->finish_link)
+  ld_emulation->finish_link (filename);
+}

trunk/src/binutils/ld/ldemul.h

@@ -140 +140 @@
     PARAMS ((char *, struct lang_input_statement_struct *));
 
+  /* Perform final action(s) on output file */
+  void (*finish_link) PARAMS ((char *));
+
 } ld_emulation_xfer_type;
 

trunk/src/binutils/ld/ldfile.c

@@ -240 +240 @@
            arch = arch->next)
         {
+#if defined (__EMX__)
+          found = ldfile_open_file_search (arch->name, entry, "", ".a");
+          if (found)
+            break;
+#endif /* __EMX__ */
           found = ldfile_open_file_search (arch->name, entry, "lib", ".a");
           if (found)

trunk/src/binutils/ld/ldmain.c

@@ -174 +174 @@
   textdomain (PACKAGE);
 
+#ifdef __EMX__
+  _response (&argc, &argv);
+  program_name = _getname(argv[0]);
+#else
   program_name = argv[0];
+#endif
   xmalloc_set_program_name (program_name);
 
@@ -400 +405 @@
       if (! bfd_close (output_bfd))
         einfo (_("%F%B: final close failed: %E\n"), output_bfd);
+
+      /* Perform the final actions on output file */
+      ldemul_finish_link (output_filename);
 
       /* If the --force-exe-suffix is enabled, and we're making an