Thu Aug 31 16:00:53 1995 steve chamberlain <sac@slash.cygnus.com>

	* Makefile.in: Update dependencies.
	* aout-target.h (MY_bfd_print_private_bfd_data): New.
	* bfd-in.h (PE STUFF): Deleted.
	* bfd.c (tdata->pe_obj_data): New.
	(bfd_print_private_bfd_data): New.
	* coff-i386.c, coff-arm.c (coff_*-rtype_to_howto): Get image base from
	new place.
	* libcoff.h, libbfd.h, bfd-in2.h: Rebuilt.
	* coffcode.h (pe_value): Delete
	(coff_mkobject, coff_mkobject_hook): Conditionally build.
	(coff_compute_section_file_positions): Look in new place.
	(add_data_entry, fill_pe_header_info): Deleted.
	(coff_write_object_contents): Remove PE stuff.
	(coff_bfd_print_private_bfd_data): New.
	* coffswap.h: Remove PE stuff.
	* elfxx-target.h (bfd_elfNN_bfd_print_private_bfd_data): New.
	* libbfd-in.h (_bfd_generic_bfd_print_private_bfd_data): New.
	* libcoff-in.h (pe_data_type): New.
	* libecoff.h (_bfd_ecoff_bfd_print_private_bfd_data): New.
	* targets.c (_bfd_print_private_bfd_data): New.
	* peicode.h: New file.

1 files changed, 9 insertions, 53 deletions

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 9be3a4f..ced4171 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -449,58 +449,6 @@ extern long bfd_tell PARAMS ((bfd *abfd));
 extern int bfd_flush PARAMS ((bfd *abfd));
 extern int bfd_stat PARAMS ((bfd *abfd, struct stat *));
 
-/* PE STUFF */
-/* Also define some types which are used within bfdlink.h for the
-   bfd_link_info struct.  These are not defined in bfdlink.h for a reason.  
-   When the link_info data is passed to bfd from ld, it is copied into 
-   extern variables defined in internal.h.  The type class for these must
-   be available to any thing that includes internal.h.  When internal.h is
-   included, it is always preceeded by an include on this file.  If I leave the
-   type definitions in bfdlink.h, then I must include that file when ever
-   I include internal.h, and this is not always a good thing */
-
-/* These are the different types of subsystems to be used when linking for
-   Windows NT.  This information is passed in as an input parameter (default
-   is console) and ultimately ends up in the optional header data */
-
-#define BFD_PE_NATIVE  1 	/* image doesn't require a subsystem */
-#define BFD_PE_WINDOWS 2 	/* image runs in the Windows GUI subsystem */
-#define BFD_PE_CONSOLE 3	/* image runs in the Windows CUI subsystem */
-#define BFD_PE_OS2     5	/* image runs in the OS/2 character subsystem */
-#define BFD_PE_POSIX   7	/* image runs in the posix character subsystem */
-
-/* The NT optional header file allows input of the stack and heap reserve
-   and commit size.  This data may be input on the command line and will
-   end up in the optional header.  Default sizes are provided. */
-
-typedef struct 
-{
-  boolean defined;
-  bfd_vma value;
-} bfd_link_pe_info_dval ;
-
-typedef struct _bfd_link_pe_info
-{
-  bfd_link_pe_info_dval dll;
-  bfd_link_pe_info_dval file_alignment;
-  bfd_link_pe_info_dval heap_commit;
-  bfd_link_pe_info_dval heap_reserve;
-  bfd_link_pe_info_dval image_base;
-  bfd_link_pe_info_dval major_image_version;
-  bfd_link_pe_info_dval major_os_version;
-  bfd_link_pe_info_dval major_subsystem_version;
-  bfd_link_pe_info_dval minor_image_version;
-  bfd_link_pe_info_dval minor_os_version;
-  bfd_link_pe_info_dval minor_subsystem_version;
-  bfd_link_pe_info_dval section_alignment;
-  bfd_link_pe_info_dval stack_commit;
-  bfd_link_pe_info_dval stack_reserve;
-  bfd_link_pe_info_dval subsystem;
-}  bfd_link_pe_info;
-
-/* END OF PE STUFF */
-
-
 
 /* Cast from const char * to char * so that caller can assign to
    a char * without a warning.  */
@@ -1909,6 +1857,7 @@ struct _bfd
       struct _oasys_data *oasys_obj_data;
       struct _oasys_ar_data *oasys_ar_data;
       struct coff_tdata *coff_obj_data;
+      struct pe_tdata *pe_obj_data;
       struct ecoff_tdata *ecoff_obj_data;
       struct ieee_data_struct *ieee_data;
       struct ieee_ar_data_struct *ieee_ar_data;
@@ -2079,6 +2028,9 @@ bfd_set_private_flags PARAMS ((bfd *abfd, flagword flags));
 #define bfd_get_dynamic_symtab_upper_bound(abfd) \
 	BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd))
 
+#define bfd_print_private_bfd_data(abfd, file)\
+	BFD_SEND (abfd, _bfd_print_private_bfd_data, (abfd, file))
+
 #define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
 	BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
 
@@ -2211,7 +2163,8 @@ CAT(NAME,_bfd_copy_private_bfd_data),\
 CAT(NAME,_bfd_merge_private_bfd_data),\
 CAT(NAME,_bfd_copy_private_section_data),\
 CAT(NAME,_bfd_copy_private_symbol_data),\
-CAT(NAME,_bfd_set_private_flags)
+CAT(NAME,_bfd_set_private_flags),\
+CAT(NAME,_bfd_print_private_bfd_data)\
    /* Called to copy BFD general private data from one object file
      to another.  */
   boolean	 (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
@@ -2229,6 +2182,9 @@ CAT(NAME,_bfd_set_private_flags)
    /* Called to set private backend flags */
   boolean	 (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));
 
+   /* Called to print private BFD data */
+  boolean       (*_bfd_print_private_bfd_data) PARAMS ((bfd *, void  *));
+
    /* Core file entry points.  */
 #define BFD_JUMP_TABLE_CORE(NAME)\
 CAT(NAME,_core_file_failing_command),\