* ld.texinfo: Document that fill values now use the four least

[deliverable/binutils-gdb.git] / bfd / aout-encap.c

diff --git a/bfd/aout-encap.c b/bfd/aout-encap.c
index dff9f7499891495fd9f534f0f019f656b0bd3207..77d63584bba9b3992b77cfe3a2628d8d983b12f6 100644 (file)
--- a/bfd/aout-encap.c
+++ b/bfd/aout-encap.c
@@ -1,5 +1,5 @@
 /* BFD back-end for a.out files encapsulated with COFF headers.
 /* BFD back-end for a.out files encapsulated with COFF headers.

-   Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1994, 1995, 2000 Free Software Foundation, Inc.

 
 This file is part of BFD, the Binary File Descriptor library.
 
 
 This file is part of BFD, the Binary File Descriptor library.
 


@@ -15,15 +15,14 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 /* THIS MODULE IS NOT FINISHED.  IT PROBABLY DOESN'T EVEN COMPILE.  */
 
 #if 0
 
 /* THIS MODULE IS NOT FINISHED.  IT PROBABLY DOESN'T EVEN COMPILE.  */
 
 #if 0

-#define        PAGE_SIZE       4096
-#define        SEGMENT_SIZE    PAGE_SIZE
+#define        TARGET_PAGE_SIZE        4096
+#define        SEGMENT_SIZE    TARGET_PAGE_SIZE

 #define TEXT_START_ADDR 0
 #define TEXT_START_ADDR 0

-#define ARCH 32

 #define BYTES_IN_WORD 4
 #endif
 
 #define BYTES_IN_WORD 4
 #endif
 


@@ -35,9 +34,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "aout/ar.h"
 #include "libaout.h"           /* BFD a.out internal data structures */
 
 #include "aout/ar.h"
 #include "libaout.h"           /* BFD a.out internal data structures */
 

-bfd_target *encap_real_callback ();
+const bfd_target *encap_real_callback ();

 
 

-bfd_target *
+const bfd_target *

 encap_object_p (abfd)
      bfd *abfd;
 {
 encap_object_p (abfd)
      bfd *abfd;
 {


@@ -54,12 +53,12 @@ encap_object_p (abfd)
        bfd_set_error (bfd_error_wrong_format);
       return 0;
     }
        bfd_set_error (bfd_error_wrong_format);
       return 0;
     }

-  
+

   coff_magic = bfd_h_get_16 (abfd, magicbuf);
   if (coff_magic != COFF_MAGIC)
     return 0;                  /* Not an encap coff file */
 
   coff_magic = bfd_h_get_16 (abfd, magicbuf);
   if (coff_magic != COFF_MAGIC)
     return 0;                  /* Not an encap coff file */
 

-  __header_offset_temp==COFF_MAGIC ? sizeof(struct coffheader) : 0)
+  __header_offset_temp==COFF_MAGIC ? sizeof (struct coffheader) : 0)

   (fseek ((f), HEADER_OFFSET((f)), 1))
 
   magic = bfd_h_get_32 (abfd, magicbuf);
   (fseek ((f), HEADER_OFFSET((f)), 1))
 
   magic = bfd_h_get_32 (abfd, magicbuf);


@@ -73,20 +72,20 @@ encap_object_p (abfd)
       bfd_set_error (bfd_error_wrong_format);
     return 0;
   }
       bfd_set_error (bfd_error_wrong_format);
     return 0;
   }

-  NAME(aout,swap_exec_header_in)(abfd, &exec_bytes, &exec);
+  NAME(aout,swap_exec_header_in) (abfd, &exec_bytes, &exec);

 
   return aout_32_some_aout_object_p (abfd, &exec, encap_realcallback);
 }
 
 /* Finish up the reading of a encapsulated-coff a.out file header */
 
   return aout_32_some_aout_object_p (abfd, &exec, encap_realcallback);
 }
 
 /* Finish up the reading of a encapsulated-coff a.out file header */

-bfd_target *
+const bfd_target *

 encap_real_callback (abfd)
      bfd *abfd;
 {
   struct internal_exec *execp = exec_hdr (abfd);
 encap_real_callback (abfd)
      bfd *abfd;
 {
   struct internal_exec *execp = exec_hdr (abfd);

-  
-  MY(callback)(abfd, execp);
-  
+
+  MY(callback) (abfd, execp);
+

   /* If we have a coff header, it can give us better values for
      text_start and exec_data_start.  This is particularly useful
      for remote debugging of embedded systems.  */
   /* If we have a coff header, it can give us better values for
      text_start and exec_data_start.  This is particularly useful
      for remote debugging of embedded systems.  */


@@ -148,7 +147,7 @@ int need_coff_header;
     {
       need_coff_header = 1;
       /* set this flag now, since it will change the values of N_TXTOFF, etc */
     {
       need_coff_header = 1;
       /* set this flag now, since it will change the values of N_TXTOFF, etc */

-      N_SET_FLAGS (outheader, N_FLAGS_COFF_ENCAPSULATE);
+      N_SET_FLAGS (outheader, aout_backend_info (abfd)->exec_hdr_flags);

       text_size += sizeof (struct coffheader);
     }
 #endif
       text_size += sizeof (struct coffheader);
     }
 #endif


@@ -232,5 +231,6 @@ int need_coff_header;
 
 #define MY_write_object_content encap_write_object_contents
 #define MY_object_p encap_object_p
 
 #define MY_write_object_content encap_write_object_contents
 #define MY_object_p encap_object_p

+#define MY_exec_hdr_flags N_FLAGS_COFF_ENCAPSULATE

 
 #include "aout-target.h"
 
 #include "aout-target.h"