Add support to skip import libraries for performance reasons and instead

use the direct auto-import of dll's

1 files changed, 23 insertions, 31 deletions

diff --git a/ld/deffile.h b/ld/deffile.h
index efd7834887..09f84071e1 100644
--- a/ld/deffile.h
+++ b/ld/deffile.h
@@ -1,5 +1,5 @@
 /* deffile.h - header for .DEF file parser
-   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    Written by DJ Delorie dj@cygnus.com
 
    This file is part of GLD, the Gnu Linker.
@@ -52,65 +52,57 @@ typedef struct def_file_import {
   def_file_module *module;	/* always set */
   char *name;			/* may be NULL; either this or ordinal will be set */
   int ordinal;			/* may be -1 */
+  int data;			/* = 1 if data */
 } def_file_import;
 
 typedef struct def_file {
-  /* from the NAME or LIBRARY command */
+  /* From the NAME or LIBRARY command.  */
   char *name;
   int is_dll;			/* -1 if NAME/LIBRARY not given */
   bfd_vma base_address;		/* (bfd_vma)(-1) if unspecified */
 
-  /* from the DESCRIPTION command */
+  /* From the DESCRIPTION command.  */
   char *description;
 
-  /* from the STACK/HEAP command, -1 if unspecified */
+  /* From the STACK/HEAP command, -1 if unspecified.  */
   int stack_reserve, stack_commit;
   int heap_reserve, heap_commit;
 
-  /* from the SECTION/SEGMENT commands */
+  /* From the SECTION/SEGMENT commands.  */
   int num_section_defs;
   def_file_section *section_defs;
 
-  /* from the EXPORTS commands */
+  /* From the EXPORTS commands.  */
   int num_exports;
   def_file_export *exports;
 
-  /* used by imports for module names */
+  /* Used by imports for module names.  */
   def_file_module *modules;
 
-  /* from the IMPORTS commands */
+  /* From the IMPORTS commands.  */
   int num_imports;
   def_file_import *imports;
 
-  /* from the VERSION command, -1 if not specified */
+  /* From the VERSION command, -1 if not specified.  */
   int version_major, version_minor;
 } def_file;
 
 extern def_file *def_file_empty PARAMS ((void));
 
-/* add_to may be NULL.  If not, this .def is appended to it */
-extern def_file *def_file_parse PARAMS ((const char *_filename,
-					 def_file * _add_to));
-
-extern void def_file_free PARAMS ((def_file * _def));
-
-extern def_file_export *def_file_add_export PARAMS ((def_file * _def,
-						     const char *_name,
-						 const char *_internal_name,
-						     int _ordinal));
-
-extern def_file_import *def_file_add_import PARAMS ((def_file * _def,
-						     const char *_name,
-						     const char *_from,
-						     int _ordinal,
-					       const char *_imported_name));
-
-extern void def_file_add_directive PARAMS ((def_file * _def,
-					    const char *param,
-					    int len));
-
+/* The second arg may be NULL.  If not, this .def is appended to it.  */
+extern def_file * def_file_parse
+  PARAMS ((const char *, def_file *));
+extern void def_file_free
+  PARAMS ((def_file *));
+extern def_file_export * def_file_add_export
+  PARAMS ((def_file *, const char *, const char *, int));
+extern def_file_import * def_file_add_import
+  PARAMS ((def_file *, const char *, const char *, int, const char *));
+extern void def_file_add_directive
+  PARAMS ((def_file *, const char *, int));
 #ifdef DEF_FILE_PRINT
-extern void def_file_print PARAMS ((FILE * _file, def_file * _def));
+extern void def_file_print
+  PARAMS ((FILE *, def_file *));
 #endif
 
 #endif /* DEFFILE_H */