Changeset 100

Timestamp:

May 7, 2003, 5:00:11 PM (22 years ago)

Author:

bird

Message:

review. Added some comments and #ifs.

Location:

trunk/src/binutils

Files:

• bfd/aoutx.h (modified) (1 diff, 1 prop)
• bfd/bfd-in2.h (modified) (1 diff, 1 prop)
• bfd/host-aout.c (modified) (1 diff, 1 prop)
• bfd/sysdep.h (modified) (1 diff, 1 prop)
• bfd/trad-core.c (modified) (3 diffs, 1 prop)
• ld/ldctor.c (modified) (1 diff, 1 prop)
• ld/ldemul.c (modified) (1 diff, 1 prop)
• ld/ldemul.h (modified) (1 diff, 1 prop)
• ld/ldfile.c (modified) (1 diff, 1 prop)
• ld/ldmain.c (modified) (1 diff, 1 prop)

trunk/src/binutils/bfd/aoutx.h

@@ -4268 +4268 @@
               symsec = NULL;
             }
+#ifdef EMX
           else if ((type == (N_IMP1 | N_EXT))
-                || (type == (N_IMP2 | N_EXT)))
+                   || (type == (N_IMP2 | N_EXT)))
             symsec = bfd_abs_section_ptr;
+#endif
           else if (IS_STAB(type))
             {

trunk/src/binutils/bfd/bfd-in2.h

@@ -3076 +3076 @@
 void
 bfd_set_reloc PARAMS ((bfd *abfd, asection *sec, arelent **rel, unsigned int count)
-    
+
     );
 

trunk/src/binutils/bfd/host-aout.c

@@ -36 +36 @@
 
    in the ./hosts/h-systemname.h file.  */
+
+#ifndef __EMX__ /* r=bird: Code was initially removed. Is this __EMX__ or EMX
+                 * and why don't we include it? anything to do with sysdep.h? */
+#ifdef TRAD_HEADER
+#include TRAD_HEADER
+#endif
+#endif /* !__EMX__ */
 
 #ifdef                  HOST_PAGE_SIZE

trunk/src/binutils/bfd/sysdep.h

@@ -27 +27 @@
 #include "config.h"
 
+#ifdef __EMX__ /* r=bird: hmm seen this before. */
 #ifdef TRAD_HEADER
 #include TRAD_HEADER
 #endif
+#endif /* __EMX__ */
 
 #ifdef HAVE_STDDEF_H

trunk/src/binutils/bfd/trad-core.c

@@ -44 +44 @@
 #include <sys/user.h>           /* After a.out.h  */
 
+#ifndef __EMX__ /* r=bird: Code was initially removed. Is this __EMX__ or EMX
+                 * and why don't we include it? anything to do with sysdep.h? */
+#ifdef TRAD_HEADER
+#include TRAD_HEADER
+#endif
+#endif /* !__EMX__ */
+
   struct trad_core_struct
     {
       asection *data_section;
-#ifdef __EMX__
+#ifdef __EMX__ /* r=bird: Isn't this a EMX (target) thing?  */
       asection *heap_section;
 #endif /* __EMX__ */
@@ -57 +64 @@
 #define core_upage(bfd) (&((bfd)->tdata.trad_core_data->u))
 #define core_datasec(bfd) ((bfd)->tdata.trad_core_data->data_section)
-#ifdef __EMX__
+#ifdef __EMX__ /* r=bird: Isn't this a EMX (target) thing?  */
 #define core_heapsec(bfd) ((bfd)->tdata.trad_core_data->heap_section)
 #endif /* __EMX__ */
@@ -99 +106 @@
 
   /* Sanity check perhaps??? */
-#ifdef __EMX__
+#ifdef __EMX__                          /* r=bird: Target (EMX) as well? */
   if (u.u_magic != UMAGIC)
     return 0;

trunk/src/binutils/ld/ldctor.c

@@ -363 +363 @@
               if (e->name != NULL)
                 minfo ("%T\n", e->name);
-              else if (e->section->owner)
+#ifdef __EMX__ /* r=bird: Is this workaround for a crash something? */
+              else if (e->section->owner != NULL)
                 minfo ("%G\n", e->section->owner, e->section, e->value);
               else
                 minfo ("*unknown*\n");
+#else
+              else
+                minfo ("%G\n", e->section->owner, e->section, e->value);
+#endif
             }
 

trunk/src/binutils/ld/ldemul.c

@@ -305 +305 @@
 }
 
+/* Added by the EMX/OS2 port */
 void
 ldemul_finish_link (char *filename)

trunk/src/binutils/ld/ldemul.h

@@ -140 +140 @@
     PARAMS ((char *, struct lang_input_statement_struct *));
 
-  /* Perform final action(s) on output file */
+  /* Perform final action(s) on output file
+     Note: Added by the EMX/OS2 port, so keep it at the end! */
   void (*finish_link) PARAMS ((char *));
 

trunk/src/binutils/ld/ldfile.c

@@ -240 +240 @@
            arch = arch->next)
         {
-#if defined (__EMX__)
+#if defined (__EMX__) /* Target feature really, but no target define to test on. */
           found = ldfile_open_file_search (arch->name, entry, "", ".a");
           if (found)

trunk/src/binutils/ld/ldmain.c

@@ -406 +406 @@
         einfo (_("%F%B: final close failed: %E\n"), output_bfd);
 
-      /* Perform the final actions on output file */
+      /* Perform the final actions on output file
+       * (Added by the EMX/OS2 port) */
       ldemul_finish_link (output_filename);