X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Faout-encap.c;h=c25f9037dce007c330c026185cf154c5e1acc3fd;hb=9ea033b2dfa95ca58778cd0e7232bfcc347fb769;hp=dff9f7499891495fd9f534f0f019f656b0bd3207;hpb=4002f18a05ecf53961c0e3b25a6d835576239fab;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/aout-encap.c b/bfd/aout-encap.c
index dff9f74998..c25f9037dc 100644
--- a/bfd/aout-encap.c
+++ b/bfd/aout-encap.c
@@ -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
-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
-#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 ARCH 32
 #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 */
 
-bfd_target *encap_real_callback ();
+const bfd_target *encap_real_callback ();
 
-bfd_target *
+const bfd_target *
 encap_object_p (abfd)
      bfd *abfd;
 {
@@ -79,7 +78,7 @@ encap_object_p (abfd)
 }
 
 /* Finish up the reading of a encapsulated-coff a.out file header */
-bfd_target *
+const bfd_target *
 encap_real_callback (abfd)
      bfd *abfd;
 {
@@ -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 */
-      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
@@ -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_exec_hdr_flags N_FLAGS_COFF_ENCAPSULATE
 
 #include "aout-target.h"