* gas/config/tc-tic4x.c (c4x_operands_match): Bugfix in direct

[deliverable/binutils-gdb.git] / binutils / dlltool.c

diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 1d299b9127dccbc398d47adb71110d96e49f61c0..6e83cce25ccb622c38b0b69252a40ba625f5afd6 100644 (file)
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -1,5 +1,6 @@
 /* dlltool.c -- tool to generate stuff for PE style DLLs
 /* dlltool.c -- tool to generate stuff for PE style DLLs

-   Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.

 
    This file is part of GNU Binutils.
 
 
    This file is part of GNU Binutils.
 


@@ -19,8 +20,7 @@
    02111-1307, USA.  */
 
 
    02111-1307, USA.  */
 
 

-/*
-   This program allows you to build the files necessary to create
+/* This program allows you to build the files necessary to create

    DLLs to run on a system which understands PE format image files.
    (eg, Windows NT)
 
    DLLs to run on a system which understands PE format image files.
    (eg, Windows NT)
 


@@ -47,9 +47,13 @@
    LIBRARY <name> [ , <base> ]
    The result is going to be <name>.DLL
 
    LIBRARY <name> [ , <base> ]
    The result is going to be <name>.DLL
 

-   EXPORTS  ( <name1> [ = <name2> ] [ @ <integer> ] [ NONAME ] [CONSTANT] [DATA] ) *
+   EXPORTS  ( (  ( <name1> [ = <name2> ] )
+               | ( <name1> = <module-name> . <external-name>))
+            [ @ <integer> ] [ NONAME ] [CONSTANT] [DATA] ) *

    Declares name1 as an exported symbol from the
    Declares name1 as an exported symbol from the

-   DLL, with optional ordinal number <integer>
+   DLL, with optional ordinal number <integer>.
+   Or declares name1 as an alias (forward) of the function <external-name>
+   in the DLL <module-name>.

 
    IMPORTS  (  (   <internal-name> =   <module-name> . <integer> )
              | ( [ <internal-name> = ] <module-name> . <external-name> )) *
 
    IMPORTS  (  (   <internal-name> =   <module-name> . <integer> )
              | ( [ <internal-name> = ] <module-name> . <external-name> )) *


@@ -110,7 +114,7 @@
    asm (".section .drectve");
    asm (".ascii \"-export:cdef\"");
    asm (".ascii \"-export:ddef\"");
    asm (".section .drectve");
    asm (".ascii \"-export:cdef\"");
    asm (".ascii \"-export:ddef\"");

-   
+

    void cdef (char * s)
    {
      printf ("hello from the dll %s\n", s);
    void cdef (char * s)
    {
      printf ("hello from the dll %s\n", s);


@@ -157,15 +161,15 @@
  # Run this tool over the DLL's .def file and generate an exports
  # file (thedll.o) and an imports file (thedll.a).
  # (You may have to use -S to tell dlltool where to find the assembler).
  # Run this tool over the DLL's .def file and generate an exports
  # file (thedll.o) and an imports file (thedll.a).
  # (You may have to use -S to tell dlltool where to find the assembler).

- 
+

    dlltool --def thedll.def --output-exp thedll.o --output-lib thedll.a
 
  # Build the dll with the library and the export table
    dlltool --def thedll.def --output-exp thedll.o --output-lib thedll.a
 
  # Build the dll with the library and the export table

- 
+

    ld -o thedll.dll thedll.o thedll.in
 
  # Link the executable with the import library
    ld -o thedll.dll thedll.o thedll.in
 
  # Link the executable with the import library

- 
+

    gcc -o themain.exe themain.o thedll.a
 
  This example can be extended if relocations are needed in the DLL:
    gcc -o themain.exe themain.o thedll.a
 
  This example can be extended if relocations are needed in the DLL:


@@ -175,23 +179,22 @@
    gcc -c file1.c file2.c themain.c
 
  # Run this tool over the DLL's .def file and generate an imports file.
    gcc -c file1.c file2.c themain.c
 
  # Run this tool over the DLL's .def file and generate an imports file.

- 
+

    dlltool --def thedll.def --output-lib thedll.lib
 
  # Link the executable with the import library and generate a base file
  # at the same time
    dlltool --def thedll.def --output-lib thedll.lib
 
  # Link the executable with the import library and generate a base file
  # at the same time

- 
+

    gcc -o themain.exe themain.o thedll.lib -Wl,--base-file -Wl,themain.base
 
  # Run this tool over the DLL's .def file and generate an exports file
  # which includes the relocations from the base file.
    gcc -o themain.exe themain.o thedll.lib -Wl,--base-file -Wl,themain.base
 
  # Run this tool over the DLL's .def file and generate an exports file
  # which includes the relocations from the base file.

- 
+

    dlltool --def thedll.def --base-file themain.base --output-exp thedll.exp
 
  # Build the dll with file1.o, file2.o and the export table
    dlltool --def thedll.def --base-file themain.base --output-exp thedll.exp
 
  # Build the dll with file1.o, file2.o and the export table

- 
-   ld -o thedll.dll thedll.exp file1.o file2.o
- */
+
+   ld -o thedll.dll thedll.exp file1.o file2.o  */

 
 /* .idata section description
 
 
 /* .idata section description
 


@@ -227,8 +230,7 @@
    = Array of { short, asciz } entries, one for each imported function.
    The `short' is the function's ordinal number.
 
    = Array of { short, asciz } entries, one for each imported function.
    The `short' is the function's ordinal number.
 

-   .idata$7 = dll name (eg: "kernel32.dll"). (.idata$6 for ppc)
-*/
+   .idata$7 = dll name (eg: "kernel32.dll"). (.idata$6 for ppc).  */

 
 /* AIX requires this to be the first thing in the file.  */
 #ifndef __GNUC__
 
 /* AIX requires this to be the first thing in the file.  */
 #ifndef __GNUC__


@@ -248,8 +250,8 @@
 #include "demangle.h"
 #include "dyn-string.h"
 #include "dlltool.h"
 #include "demangle.h"
 #include "dyn-string.h"
 #include "dlltool.h"

+#include "safe-ctype.h"

 
 

-#include <ctype.h>

 #include <time.h>
 #include <sys/stat.h>
 
 #include <time.h>
 #include <sys/stat.h>
 


@@ -269,19 +271,19 @@ static char *look_for_prog PARAMS ((const char *, const char *, int));
 static char *deduce_name PARAMS ((const char *));
 
 #ifdef DLLTOOL_MCORE_ELF
 static char *deduce_name PARAMS ((const char *));
 
 #ifdef DLLTOOL_MCORE_ELF

-static void mcore_elf_cache_filename (char *);
-static void mcore_elf_gen_out_file (void);
+static void mcore_elf_cache_filename PARAMS ((char *));
+static void mcore_elf_gen_out_file PARAMS ((void));

 #endif
 #endif

-     
+

 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #else /* ! HAVE_SYS_WAIT_H */
 #if ! defined (_WIN32) || defined (__CYGWIN32__)
 #ifndef WIFEXITED
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #else /* ! HAVE_SYS_WAIT_H */
 #if ! defined (_WIN32) || defined (__CYGWIN32__)
 #ifndef WIFEXITED

-#define WIFEXITED(w)   (((w)&0377) == 0)
+#define WIFEXITED(w)   (((w) & 0377) == 0)

 #endif
 #ifndef WIFSIGNALED
 #endif
 #ifndef WIFSIGNALED

-#define WIFSIGNALED(w) (((w)&0377) != 0177 && ((w)&~0377) == 0)
+#define WIFSIGNALED(w) (((w) & 0377) != 0177 && ((w) & ~0377) == 0)

 #endif
 #ifndef WTERMSIG
 #define WTERMSIG(w)    ((w) & 0177)
 #endif
 #ifndef WTERMSIG
 #define WTERMSIG(w)    ((w) & 0177)


@@ -322,18 +324,18 @@ static void mcore_elf_gen_out_file (void);
 
 typedef struct ifunct
 {
 
 typedef struct ifunct
 {

-  char          *name;   /* name of function being imported */
-  int            ord;    /* two-byte ordinal value associated with function */
+  char *         name;   /* Name of function being imported.  */
+  int            ord;    /* Two-byte ordinal value associated with function.  */

   struct ifunct *next;
 } ifunctype;
 
 typedef struct iheadt
 {
   struct ifunct *next;
 } ifunctype;
 
 typedef struct iheadt
 {

-  char          *dllname;  /* name of dll file imported from */
-  long           nfuncs;   /* number of functions in list */
-  struct ifunct *funchead; /* first function in list */
-  struct ifunct *functail; /* last  function in list */
-  struct iheadt *next;     /* next dll file in list */
+  char          *dllname;  /* Name of dll file imported from.  */
+  long           nfuncs;   /* Number of functions in list.  */
+  struct ifunct *funchead; /* First function in list.  */
+  struct ifunct *functail; /* Last  function in list.  */
+  struct iheadt *next;     /* Next dll file in list.  */

 } iheadtype;
 
 /* Structure containing all import information as defined in .def file
 } iheadtype;
 
 /* Structure containing all import information as defined in .def file


@@ -362,12 +364,12 @@ static boolean export_all_symbols;
 
 /* True if we should exclude the symbols in DEFAULT_EXCLUDES when
    exporting all symbols.  */
 
 /* True if we should exclude the symbols in DEFAULT_EXCLUDES when
    exporting all symbols.  */

-static boolean do_default_excludes;
+static boolean do_default_excludes=true;

 
 /* Default symbols to exclude when exporting all the symbols.  */
 static const char *default_excludes = "DllMain@12,DllEntryPoint@0,impure_ptr";
 
 
 /* Default symbols to exclude when exporting all the symbols.  */
 static const char *default_excludes = "DllMain@12,DllEntryPoint@0,impure_ptr";
 

-/* True if we should add __imp_<SYMBOL> to import libraries for backward 
+/* True if we should add __imp_<SYMBOL> to import libraries for backward

    compatibility to old Cygwin releases.  */
 static boolean create_compat_implib;
 
    compatibility to old Cygwin releases.  */
 static boolean create_compat_implib;
 


@@ -383,8 +385,12 @@ static FILE *output_def;
 static FILE *base_file;
 
 #ifdef DLLTOOL_ARM
 static FILE *base_file;
 
 #ifdef DLLTOOL_ARM

+#ifdef DLLTOOL_ARM_EPOC
+static const char *mname = "arm-epoc";
+#else

 static const char *mname = "arm";
 #endif
 static const char *mname = "arm";
 #endif

+#endif

 
 #ifdef DLLTOOL_I386
 static const char *mname = "i386";
 
 #ifdef DLLTOOL_I386
 static const char *mname = "i386";


@@ -394,6 +400,14 @@ static const char *mname = "i386";
 static const char *mname = "ppc";
 #endif
 
 static const char *mname = "ppc";
 #endif
 

+#ifdef DLLTOOL_SH
+static const char *mname = "sh";
+#endif
+
+#ifdef DLLTOOL_MIPS
+static const char *mname = "mips";
+#endif
+

 #ifdef DLLTOOL_MCORE
 static const char * mname = "mcore-le";
 #endif
 #ifdef DLLTOOL_MCORE
 static const char * mname = "mcore-le";
 #endif


@@ -411,7 +425,7 @@ static char * mcore_elf_linker_flags = NULL;
 #define DRECTVE_SECTION_NAME ".drectve"
 #endif
 
 #define DRECTVE_SECTION_NAME ".drectve"
 #endif
 

-#define PATHMAX 250            /* What's the right name for this ? */
+#define PATHMAX 250            /* What's the right name for this ?  */

 
 #define TMP_ASM                "dc.s"
 #define TMP_HEAD_S     "dh.s"
 
 #define TMP_ASM                "dc.s"
 #define TMP_HEAD_S     "dh.s"


@@ -420,7 +434,7 @@ static char * mcore_elf_linker_flags = NULL;
 #define TMP_TAIL_O     "dt.o"
 #define TMP_STUB       "ds"
 
 #define TMP_TAIL_O     "dt.o"
 #define TMP_STUB       "ds"
 

-/* This bit of assemly does jmp * .... */
+/* This bit of assemly does jmp * ....  */

 static const unsigned char i386_jtab[] =
 {
   0xff, 0x25, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90
 static const unsigned char i386_jtab[] =
 {
   0xff, 0x25, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90


@@ -454,23 +468,27 @@ static const unsigned char thumb_jtab[] =
 
 static const unsigned char mcore_be_jtab[] =
 {
 
 static const unsigned char mcore_be_jtab[] =
 {

-  0x70, 0x01,            /* jmpi 1     */
-  0x12, 0x11,            /* nop */
-  0x00, 0x00, 0x00, 0x00 /* <address>  */  
+  0x71, 0x02,            /* lrw r1,2       */
+  0x81, 0x01,            /* ld.w r1,(r1,0) */
+  0x00, 0xC1,            /* jmp r1         */
+  0x12, 0x00,            /* nop            */
+  0x00, 0x00, 0x00, 0x00 /* <address>      */

 };
 
 static const unsigned char mcore_le_jtab[] =
 {
 };
 
 static const unsigned char mcore_le_jtab[] =
 {

-  0x01, 0x70,            /* jmpi 1     */
-  0x11, 0x12,            /* nop */
-  0x00, 0x00, 0x00, 0x00 /* <address>  */  
+  0x02, 0x71,            /* lrw r1,2       */
+  0x01, 0x81,            /* ld.w r1,(r1,0) */
+  0xC1, 0x00,            /* jmp r1         */
+  0x00, 0x12,            /* nop            */
+  0x00, 0x00, 0x00, 0x00 /* <address>      */

 };
 
 };
 

-/* This is the glue sequence for PowerPC PE. There is a  */
-/* tocrel16-tocdefn reloc against the first instruction. */
-/* We also need a IMGLUE reloc against the glue function */
-/* to restore the toc saved by the third instruction in  */
-/* the glue. */
+/* This is the glue sequence for PowerPC PE. There is a
+   tocrel16-tocdefn reloc against the first instruction.
+   We also need a IMGLUE reloc against the glue function
+   to restore the toc saved by the third instruction in
+   the glue.  */

 static const unsigned char ppc_jtab[] =
 {
   0x00, 0x00, 0x62, 0x81, /* lwz r11,0(r2)               */
 static const unsigned char ppc_jtab[] =
 {
   0x00, 0x00, 0x62, 0x81, /* lwz r11,0(r2)               */


@@ -483,8 +501,8 @@ static const unsigned char ppc_jtab[] =
 };
 
 #ifdef DLLTOOL_PPC
 };
 
 #ifdef DLLTOOL_PPC

-/* the glue instruction, picks up the toc from the stw in */
-/* the above code: "lwz r2,4(r1)"                         */
+/* The glue instruction, picks up the toc from the stw in
+   the above code: "lwz r2,4(r1)".  */

 static bfd_vma ppc_glue_insn = 0x80410004;
 #endif
 
 static bfd_vma ppc_glue_insn = 0x80410004;
 #endif
 


@@ -505,8 +523,8 @@ struct mac
     const char *how_bfd_target;
     enum bfd_architecture how_bfd_arch;
     const unsigned char *how_jtab;
     const char *how_bfd_target;
     enum bfd_architecture how_bfd_arch;
     const unsigned char *how_jtab;

-    int how_jtab_size; /* size of the jtab entry */
-    int how_jtab_roff; /* offset into it for the ind 32 reloc into idata 5 */
+    int how_jtab_size; /* Size of the jtab entry.  */
+    int how_jtab_roff; /* Offset into it for the ind 32 reloc into idata 5.  */

   };
 
 static const struct mac
   };
 
 static const struct mac


@@ -558,42 +576,42 @@ mtable[] =
   {
 #define MMCORE_BE 5
     "mcore-be", ".byte", ".short", ".long", ".asciz", "//",
   {
 #define MMCORE_BE 5
     "mcore-be", ".byte", ".short", ".long", ".asciz", "//",

-    "jmpi\t1\n\tnop\n\t.long",
+    "lrw r1,[1f]\n\tld.w r1,(r1,0)\n\tjmp r1\n\tnop\n1:.long",

     ".global", ".space", ".align\t2",".align\t4", "",
     "pe-mcore-big", bfd_arch_mcore,
     ".global", ".space", ".align\t2",".align\t4", "",
     "pe-mcore-big", bfd_arch_mcore,

-    mcore_be_jtab, sizeof (mcore_be_jtab), 4
+    mcore_be_jtab, sizeof (mcore_be_jtab), 8

   }
   ,
   {
 #define MMCORE_LE 6
     "mcore-le", ".byte", ".short", ".long", ".asciz", "//",
   }
   ,
   {
 #define MMCORE_LE 6
     "mcore-le", ".byte", ".short", ".long", ".asciz", "//",

-    "jmpi\t1\n\tnop\n\t.long",
+    "lrw r1,[1f]\n\tld.w r1,(r1,0)\n\tjmp r1\n\tnop\n1:.long",

     ".global", ".space", ".align\t2",".align\t4", "-EL",
     "pe-mcore-little", bfd_arch_mcore,
     ".global", ".space", ".align\t2",".align\t4", "-EL",
     "pe-mcore-little", bfd_arch_mcore,

-    mcore_le_jtab, sizeof (mcore_le_jtab), 4
+    mcore_le_jtab, sizeof (mcore_le_jtab), 8

   }
   ,
   {
 #define MMCORE_ELF 7
     "mcore-elf-be", ".byte", ".short", ".long", ".asciz", "//",
   }
   ,
   {
 #define MMCORE_ELF 7
     "mcore-elf-be", ".byte", ".short", ".long", ".asciz", "//",

-    "jmpi\t1\n\tnop\n\t.long",
+    "lrw r1,[1f]\n\tld.w r1,(r1,0)\n\tjmp r1\n\tnop\n1:.long",

     ".global", ".space", ".align\t2",".align\t4", "",
     "elf32-mcore-big", bfd_arch_mcore,
     ".global", ".space", ".align\t2",".align\t4", "",
     "elf32-mcore-big", bfd_arch_mcore,

-    mcore_be_jtab, sizeof (mcore_be_jtab), 4
+    mcore_be_jtab, sizeof (mcore_be_jtab), 8

   }
   ,
   {
 #define MMCORE_ELF_LE 8
     "mcore-elf-le", ".byte", ".short", ".long", ".asciz", "//",
   }
   ,
   {
 #define MMCORE_ELF_LE 8
     "mcore-elf-le", ".byte", ".short", ".long", ".asciz", "//",

-    "jmpi\t1\n\tnop\n\t.long",
+    "lrw r1,[1f]\n\tld.w r1,(r1,0)\n\tjmp r1\n\tnop\n1:.long",

     ".global", ".space", ".align\t2",".align\t4", "-EL",
     "elf32-mcore-little", bfd_arch_mcore,
     ".global", ".space", ".align\t2",".align\t4", "-EL",
     "elf32-mcore-little", bfd_arch_mcore,

-    mcore_le_jtab, sizeof (mcore_le_jtab), 4
+    mcore_le_jtab, sizeof (mcore_le_jtab), 8

   }
   ,
   {
 #define MARM_EPOC 9
   }
   ,
   {
 #define MARM_EPOC 9

-    "arm", ".byte", ".short", ".long", ".asciz", "@",
+    "arm-epoc", ".byte", ".short", ".long", ".asciz", "@",

     "ldr\tip,[pc]\n\tldr\tpc,[ip]\n\t.long",
     ".global", ".space", ".align\t2",".align\t4", "",
     "epoc-pe-arm-little", bfd_arch_arm,
     "ldr\tip,[pc]\n\tldr\tpc,[ip]\n\t.long",
     ".global", ".space", ".align\t2",".align\t4", "",
     "epoc-pe-arm-little", bfd_arch_arm,


@@ -619,12 +637,13 @@ typedef struct export
     int noname;
     int data;
     int hint;
     int noname;
     int data;
     int hint;

+    int forward;       /* Number of forward label, 0 means no forward.  */

     struct export *next;
   }
 export_type;
 
 /* A list of symbols which we should not export.  */
     struct export *next;
   }
 export_type;
 
 /* A list of symbols which we should not export.  */

- 
+

 struct string_list
 {
   struct string_list *next;
 struct string_list
 {
   struct string_list *next;


@@ -636,6 +655,8 @@ static struct string_list *excludes;
 static const char *rvaafter PARAMS ((int));
 static const char *rvabefore PARAMS ((int));
 static const char *asm_prefix PARAMS ((int));
 static const char *rvaafter PARAMS ((int));
 static const char *rvabefore PARAMS ((int));
 static const char *asm_prefix PARAMS ((int));

+static void process_def_file PARAMS ((const char *));
+static void new_directive PARAMS ((char *));

 static void append_import PARAMS ((const char *, const char *, int));
 static void run PARAMS ((const char *, char *));
 static void scan_drectve_symbols PARAMS ((bfd *));
 static void append_import PARAMS ((const char *, const char *, int));
 static void run PARAMS ((const char *, char *));
 static void scan_drectve_symbols PARAMS ((bfd *));


@@ -652,12 +673,14 @@ static int sfunc PARAMS ((const void *, const void *));
 static void flush_page PARAMS ((FILE *, long *, int, int));
 static void gen_def_file PARAMS ((void));
 static void generate_idata_ofile PARAMS ((FILE *));
 static void flush_page PARAMS ((FILE *, long *, int, int));
 static void gen_def_file PARAMS ((void));
 static void generate_idata_ofile PARAMS ((FILE *));

+static void assemble_file PARAMS ((const char *, const char *));

 static void gen_exp_file PARAMS ((void));
 static const char *xlate PARAMS ((const char *));
 #if 0
 static void dump_iat PARAMS ((FILE *, export_type *));
 #endif
 static char *make_label PARAMS ((const char *, const char *));
 static void gen_exp_file PARAMS ((void));
 static const char *xlate PARAMS ((const char *));
 #if 0
 static void dump_iat PARAMS ((FILE *, export_type *));
 #endif
 static char *make_label PARAMS ((const char *, const char *));

+static char *make_imp_label PARAMS ((const char *, const char *));

 static bfd *make_one_lib_file PARAMS ((export_type *, int));
 static bfd *make_head PARAMS ((void));
 static bfd *make_tail PARAMS ((void));
 static bfd *make_one_lib_file PARAMS ((export_type *, int));
 static bfd *make_head PARAMS ((void));
 static bfd *make_tail PARAMS ((void));


@@ -671,70 +694,21 @@ static void fill_ordinals PARAMS ((export_type **));
 static int alphafunc PARAMS ((const void *, const void *));
 static void mangle_defs PARAMS ((void));
 static void usage PARAMS ((FILE *, int));
 static int alphafunc PARAMS ((const void *, const void *));
 static void mangle_defs PARAMS ((void));
 static void usage PARAMS ((FILE *, int));

-static void display PARAMS ((const char *, va_list));

 static void inform PARAMS ((const char *, ...));
 static void inform PARAMS ((const char *, ...));

-static void warn PARAMS ((const char *, ...));
-
-static void
-display (message, args)
-     const char * message;
-     va_list      args;
-{
-  if (program_name != NULL)
-    fprintf (stderr, "%s: ", program_name);
-
-  vfprintf (stderr, message, args);
-
-  if (message [strlen (message) - 1] != '\n')
-    fputc ('\n', stderr);
-}  

 
 
 static void
 
 
 static void

-#ifdef __STDC__
-inform (const char * message, ...)
-#else
-inform (message, va_alist)
-     const char * message;
-     va_dcl
-#endif
+inform VPARAMS ((const char * message, ...))

 {
 {

-  va_list args;
-  
+  VA_OPEN (args, message);
+  VA_FIXEDARG (args, const char *, message);
+

   if (!verbose)
     return;
 
   if (!verbose)
     return;
 

-#ifdef __STDC__
-  va_start (args, message);
-#else
-  va_start (args);
-#endif
+  report (message, args);

 
 

-  display (message, args);
-  
-  va_end (args);
-}
-
-static void
-#ifdef __STDC__
-warn (const char * message, ...)
-#else
-warn (message, va_alist)
-     const char * message;
-     va_dcl
-#endif
-{
-  va_list args;
-  
-#ifdef __STDC__
-  va_start (args, message);
-#else
-  va_start (args);
-#endif
-  
-  display (message, args);
-
-  va_end (args);
+  VA_CLOSE (args);

 }
 
 static const char *
 }
 
 static const char *


@@ -752,10 +726,11 @@ rvaafter (machine)
     case MMCORE_LE:
     case MMCORE_ELF:
     case MMCORE_ELF_LE:
     case MMCORE_LE:
     case MMCORE_ELF:
     case MMCORE_ELF_LE:

+    case MARM_EPOC:

       break;
     default:
       /* xgettext:c-format */
       break;
     default:
       /* xgettext:c-format */

-      fatal (_("Internal error: Unknown machine type: %d\n"), machine);
+      fatal (_("Internal error: Unknown machine type: %d"), machine);

       break;
     }
   return "";
       break;
     }
   return "";


@@ -776,10 +751,11 @@ rvabefore (machine)
     case MMCORE_LE:
     case MMCORE_ELF:
     case MMCORE_ELF_LE:
     case MMCORE_LE:
     case MMCORE_ELF:
     case MMCORE_ELF_LE:

+    case MARM_EPOC:

       return ".rva\t";
     default:
       /* xgettext:c-format */
       return ".rva\t";
     default:
       /* xgettext:c-format */

-      fatal (_("Internal error: Unknown machine type: %d\n"), machine);
+      fatal (_("Internal error: Unknown machine type: %d"), machine);

       break;
     }
   return "";
       break;
     }
   return "";


@@ -799,12 +775,13 @@ asm_prefix (machine)
     case MMCORE_LE:
     case MMCORE_ELF:
     case MMCORE_ELF_LE:
     case MMCORE_LE:
     case MMCORE_ELF:
     case MMCORE_ELF_LE:

+    case MARM_EPOC:

       break;
     case M386:
       return "_";
     default:
       /* xgettext:c-format */
       break;
     case M386:
       return "_";
     default:
       /* xgettext:c-format */

-      fatal (_("Internal error: Unknown machine type: %d\n"), machine);
+      fatal (_("Internal error: Unknown machine type: %d"), machine);

       break;
     }
   return "";
       break;
     }
   return "";


@@ -833,12 +810,12 @@ asm_prefix (machine)
 
 static char **oav;
 
 
 static char **oav;
 

-void
+static void

 process_def_file (name)
      const char *name;
 {
   FILE *f = fopen (name, FOPEN_RT);
 process_def_file (name)
      const char *name;
 {
   FILE *f = fopen (name, FOPEN_RT);

-  
+

   if (!f)
     /* xgettext:c-format */
     fatal (_("Can't open def file: %s"), name);
   if (!f)
     /* xgettext:c-format */
     fatal (_("Can't open def file: %s"), name);


@@ -847,7 +824,7 @@ process_def_file (name)
 
   /* xgettext:c-format */
   inform (_("Processing def file: %s"), name);
 
   /* xgettext:c-format */
   inform (_("Processing def file: %s"), name);

-  
+

   yyparse ();
 
   inform (_("Processed def file"));
   yyparse ();
 
   inform (_("Processed def file"));


@@ -855,17 +832,18 @@ process_def_file (name)
 
 /**********************************************************************/
 
 
 /**********************************************************************/
 

-/* Communications with the parser */
+/* Communications with the parser.  */

 
 

-static const char *d_name;     /* Arg to NAME or LIBRARY */
-static int d_nfuncs;           /* Number of functions exported */
-static int d_named_nfuncs;     /* Number of named functions exported */
-static int d_low_ord;          /* Lowest ordinal index */
-static int d_high_ord;         /* Highest ordinal index */
-static export_type *d_exports; /*list of exported functions */
-static export_type **d_exports_lexically;      /* vector of exported functions in alpha order */
-static dlist_type *d_list;     /* Descriptions */
-static dlist_type *a_list;     /* Stuff to go in directives */
+static const char *d_name;     /* Arg to NAME or LIBRARY.  */
+static int d_nfuncs;           /* Number of functions exported.  */
+static int d_named_nfuncs;     /* Number of named functions exported.  */
+static int d_low_ord;          /* Lowest ordinal index.  */
+static int d_high_ord;         /* Highest ordinal index.  */
+static export_type *d_exports; /* List of exported functions.  */
+static export_type **d_exports_lexically;  /* Vector of exported functions in alpha order.  */
+static dlist_type *d_list;     /* Descriptions.  */
+static dlist_type *a_list;     /* Stuff to go in directives.  */
+static int d_nforwards = 0;    /* Number of forwarded exports.  */

 
 static int d_is_dll;
 static int d_is_exe;
 
 static int d_is_dll;
 static int d_is_exe;


@@ -875,8 +853,8 @@ yyerror (err)
      const char * err ATTRIBUTE_UNUSED;
 {
   /* xgettext:c-format */
      const char * err ATTRIBUTE_UNUSED;
 {
   /* xgettext:c-format */

-  warn (_("Syntax error in def file %s:%d\n"), def_file, linenumber);
-  
+  non_fatal (_("Syntax error in def file %s:%d"), def_file, linenumber);
+

   return 0;
 }
 
   return 0;
 }
 


@@ -900,6 +878,12 @@ def_exports (name, internal_name, ordinal, noname, constant, data)
   p->next = d_exports;
   d_exports = p;
   d_nfuncs++;
   p->next = d_exports;
   d_exports = p;
   d_nfuncs++;

+
+  if ((internal_name != NULL)
+      && (strchr (internal_name, '.') != NULL))
+    p->forward = ++d_nforwards;
+  else
+    p->forward = 0; /* no forward */

 }
 
 void
 }
 
 void


@@ -909,13 +893,13 @@ def_name (name, base)
 {
   /* xgettext:c-format */
   inform (_("NAME: %s base: %x"), name, base);
 {
   /* xgettext:c-format */
   inform (_("NAME: %s base: %x"), name, base);

-  
+

   if (d_is_dll)
   if (d_is_dll)

-    warn (_("Can't have LIBRARY and NAME\n"));
-  
+    non_fatal (_("Can't have LIBRARY and NAME"));
+

   d_name = name;
   d_name = name;

-  /* if --dllname not provided, use the one in the DEF file.
-     FIXME: Is this appropriate for executables? */
+  /* If --dllname not provided, use the one in the DEF file.
+     FIXME: Is this appropriate for executables?  */

   if (! dll_name)
     dll_name = xstrdup (name);
   d_is_exe = 1;
   if (! dll_name)
     dll_name = xstrdup (name);
   d_is_exe = 1;


@@ -928,12 +912,12 @@ def_library (name, base)
 {
   /* xgettext:c-format */
   inform (_("LIBRARY: %s base: %x"), name, base);
 {
   /* xgettext:c-format */
   inform (_("LIBRARY: %s base: %x"), name, base);

-  
+

   if (d_is_exe)
   if (d_is_exe)

-    warn (_("%s: Can't have LIBRARY and NAME\n"), program_name);
-  
+    non_fatal (_("Can't have LIBRARY and NAME"));
+

   d_name = name;
   d_name = name;

-  /* if --dllname not provided, use the one in the DEF file. */
+  /* If --dllname not provided, use the one in the DEF file.  */

   if (! dll_name)
     dll_name = xstrdup (name);
   d_is_dll = 1;
   if (! dll_name)
     dll_name = xstrdup (name);
   d_is_dll = 1;


@@ -949,7 +933,7 @@ def_description (desc)
   d_list = d;
 }
 
   d_list = d;
 }
 

-void
+static void

 new_directive (dir)
      char *dir;
 {
 new_directive (dir)
      char *dir;
 {


@@ -1075,7 +1059,7 @@ def_import (app_name, module, dllext, entry, ord_val)
       else
        application_name = "";
     }
       else
        application_name = "";
     }

-  
+

   if (dllext != NULL)
     {
       buf = (char *) alloca (strlen (module) + strlen (dllext) + 2);
   if (dllext != NULL)
     {
       buf = (char *) alloca (strlen (module) + strlen (dllext) + 2);


@@ -1145,7 +1129,7 @@ run (what, args)
   char *errmsg_fmt, *errmsg_arg;
   char *temp_base = choose_temp_base ();
 
   char *errmsg_fmt, *errmsg_arg;
   char *temp_base = choose_temp_base ();
 

-  inform ("run: %s %s\n", what, args);
+  inform ("run: %s %s", what, args);

 
   /* Count the args */
   i = 0;
 
   /* Count the args */
   i = 0;


@@ -1176,12 +1160,12 @@ run (what, args)
   if (pid == -1)
     {
       inform (strerror (errno));
   if (pid == -1)
     {
       inform (strerror (errno));

-      
+

       fatal (errmsg_fmt, errmsg_arg);
     }
 
   pid = pwait (pid, & wait_status, 0);
       fatal (errmsg_fmt, errmsg_arg);
     }
 
   pid = pwait (pid, & wait_status, 0);

-  
+

   if (pid == -1)
     {
       /* xgettext:c-format */
   if (pid == -1)
     {
       /* xgettext:c-format */


@@ -1196,8 +1180,8 @@ run (what, args)
     {
       if (WEXITSTATUS (wait_status) != 0)
        /* xgettext:c-format */
     {
       if (WEXITSTATUS (wait_status) != 0)
        /* xgettext:c-format */

-       warn (_("%s exited with status %d\n"),
-             what, WEXITSTATUS (wait_status));
+       non_fatal (_("%s exited with status %d"),
+                  what, WEXITSTATUS (wait_status));

     }
   else
     abort ();
     }
   else
     abort ();


@@ -1218,17 +1202,17 @@ scan_drectve_symbols (abfd)
 
   /* Look for .drectve's */
   s = bfd_get_section_by_name (abfd, DRECTVE_SECTION_NAME);
 
   /* Look for .drectve's */
   s = bfd_get_section_by_name (abfd, DRECTVE_SECTION_NAME);

-  
+

   if (s == NULL)
     return;
   if (s == NULL)
     return;

-      
+

   size = bfd_get_section_size_before_reloc (s);
   buf  = xmalloc (size);
 
   bfd_get_section_contents (abfd, s, buf, 0, size);
   size = bfd_get_section_size_before_reloc (s);
   buf  = xmalloc (size);
 
   bfd_get_section_contents (abfd, s, buf, 0, size);

-      
+

   /* xgettext:c-format */
   /* xgettext:c-format */

-  inform (_("Sucking in info from %s section in %s\n"),
+  inform (_("Sucking in info from %s section in %s"),

          DRECTVE_SECTION_NAME, bfd_get_filename (abfd));
 
   /* Search for -export: strings. The exported symbols can optionally
          DRECTVE_SECTION_NAME, bfd_get_filename (abfd));
 
   /* Search for -export: strings. The exported symbols can optionally


@@ -1244,7 +1228,7 @@ scan_drectve_symbols (abfd)
          char * name;
          char * c;
          flagword flags = BSF_FUNCTION;
          char * name;
          char * c;
          flagword flags = BSF_FUNCTION;

-         
+

          p += 8;
          name = p;
          while (p < e && *p != ',' && *p != ' ' && *p != '-')
          p += 8;
          name = p;
          while (p < e && *p != ',' && *p != ' ' && *p != '-')


@@ -1252,7 +1236,7 @@ scan_drectve_symbols (abfd)
          c = xmalloc (p - name + 1);
          memcpy (c, name, p - name);
          c[p - name] = 0;
          c = xmalloc (p - name + 1);
          memcpy (c, name, p - name);
          c[p - name] = 0;

-         if (p < e && *p == ',')       /* found type tag. */
+         if (p < e && *p == ',')       /* found type tag.  */

            {
              char *tag_start = ++p;
              while (p < e && *p != ' ' && *p != '-')
            {
              char *tag_start = ++p;
              while (p < e && *p != ' ' && *p != '-')


@@ -1268,7 +1252,8 @@ scan_drectve_symbols (abfd)
 
          if (add_stdcall_alias && strchr (c, '@'))
            {
 
          if (add_stdcall_alias && strchr (c, '@'))
            {

-             char *exported_name = xstrdup (c);
+             int lead_at = (*c == '@') ;       
+             char *exported_name = xstrdup (c + lead_at);

              char *atsym = strchr (exported_name, '@');
              *atsym = '\0';
              /* Note: stdcall alias symbols can never be data.  */
              char *atsym = strchr (exported_name, '@');
              *atsym = '\0';
              /* Note: stdcall alias symbols can never be data.  */


@@ -1318,10 +1303,11 @@ scan_filtered_symbols (abfd, minisyms, symcount, size)
 
       if (add_stdcall_alias && strchr (symbol_name, '@'))
         {
 
       if (add_stdcall_alias && strchr (symbol_name, '@'))
         {

-         char *exported_name = xstrdup (symbol_name);
+         int lead_at = (*symbol_name == '@');
+         char *exported_name = xstrdup (symbol_name + lead_at);

          char *atsym = strchr (exported_name, '@');
          *atsym = '\0';
          char *atsym = strchr (exported_name, '@');
          *atsym = '\0';

-         /* Note: stdcall alias symbols can never be data. */
+         /* Note: stdcall alias symbols can never be data.  */

          def_exports (exported_name, xstrdup (symbol_name), -1, 0, 0, 0);
        }
     }
          def_exports (exported_name, xstrdup (symbol_name), -1, 0, 0, 0);
        }
     }


@@ -1342,17 +1328,20 @@ add_excludes (new_excludes)
   for (; exclude_string; exclude_string = strtok (NULL, ",:"))
     {
       struct string_list *new_exclude;
   for (; exclude_string; exclude_string = strtok (NULL, ",:"))
     {
       struct string_list *new_exclude;

-      
+

       new_exclude = ((struct string_list *)
                     xmalloc (sizeof (struct string_list)));
       new_exclude->string = (char *) xmalloc (strlen (exclude_string) + 2);
       new_exclude = ((struct string_list *)
                     xmalloc (sizeof (struct string_list)));
       new_exclude->string = (char *) xmalloc (strlen (exclude_string) + 2);

-      /* FIXME: Is it always right to add a leading underscore?  */
-      sprintf (new_exclude->string, "_%s", exclude_string);
+      /* Don't add a leading underscore for fastcall symbols.  */
+      if (*exclude_string == '@')
+       sprintf (new_exclude->string, "%s", exclude_string);
+      else
+       sprintf (new_exclude->string, "_%s", exclude_string);

       new_exclude->next = excludes;
       excludes = new_exclude;
 
       /* xgettext:c-format */
       new_exclude->next = excludes;
       excludes = new_exclude;
 
       /* xgettext:c-format */

-      inform (_("Excluding symbol: %s\n"), exclude_string);
+      inform (_("Excluding symbol: %s"), exclude_string);

     }
 
   free (local_copy);
     }
 
   free (local_copy);


@@ -1414,7 +1403,7 @@ filter_symbols (abfd, minisyms, symcount, size)
               || (sym->flags & BSF_WEAK) != 0
               || bfd_is_com_section (sym->section))
              && ! bfd_is_und_section (sym->section));
               || (sym->flags & BSF_WEAK) != 0
               || bfd_is_com_section (sym->section))
              && ! bfd_is_und_section (sym->section));

-      
+

       keep = keep && ! match_exclude (sym->name);
 
       if (keep)
       keep = keep && ! match_exclude (sym->name);
 
       if (keep)


@@ -1447,7 +1436,7 @@ scan_all_symbols (abfd)
   if (! (bfd_get_file_flags (abfd) & HAS_SYMS))
     {
       /* xgettext:c-format */
   if (! (bfd_get_file_flags (abfd) & HAS_SYMS))
     {
       /* xgettext:c-format */

-      warn (_("%s: no symbols\n"), bfd_get_filename (abfd));
+      non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));

       return;
     }
 
       return;
     }
 


@@ -1458,7 +1447,7 @@ scan_all_symbols (abfd)
   if (symcount == 0)
     {
       /* xgettext:c-format */
   if (symcount == 0)
     {
       /* xgettext:c-format */

-      warn (_("%s: no symbols\n"), bfd_get_filename (abfd));
+      non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));

       return;
     }
 
       return;
     }
 


@@ -1481,11 +1470,11 @@ scan_open_obj_file (abfd)
     scan_all_symbols (abfd);
   else
     scan_drectve_symbols (abfd);
     scan_all_symbols (abfd);
   else
     scan_drectve_symbols (abfd);

- 
-  /* FIXME: we ought to read in and block out the base relocations */
+
+  /* FIXME: we ought to read in and block out the base relocations.  */

 
   /* xgettext:c-format */
 
   /* xgettext:c-format */

-  inform (_("Done reading %s\n"), bfd_get_filename (abfd));
+  inform (_("Done reading %s"), bfd_get_filename (abfd));

 }
 
 static void
 }
 
 static void


@@ -1500,7 +1489,7 @@ scan_obj_file (filename)
 
   /* xgettext:c-format */
   inform (_("Scanning object file %s"), filename);
 
   /* xgettext:c-format */
   inform (_("Scanning object file %s"), filename);

-  
+

   if (bfd_check_format (f, bfd_archive))
     {
       bfd *arfile = bfd_openr_next_archived_file (f, 0);
   if (bfd_check_format (f, bfd_archive))
     {
       bfd *arfile = bfd_openr_next_archived_file (f, 0);


@@ -1511,7 +1500,7 @@ scan_obj_file (filename)
          bfd_close (arfile);
          arfile = bfd_openr_next_archived_file (f, arfile);
        }
          bfd_close (arfile);
          arfile = bfd_openr_next_archived_file (f, arfile);
        }

-      
+

 #ifdef DLLTOOL_MCORE_ELF
       if (mcore_elf_out_file)
        inform (_("Cannot produce mcore-elf dll from archive file: %s"), filename);
 #ifdef DLLTOOL_MCORE_ELF
       if (mcore_elf_out_file)
        inform (_("Cannot produce mcore-elf dll from archive file: %s"), filename);


@@ -1556,7 +1545,7 @@ dump_def_info (f)
     }
 }
 
     }
 }
 

-/* Generate the .exp file */
+/* Generate the .exp file.  */

 
 static int
 sfunc (a, b)
 
 static int
 sfunc (a, b)


@@ -1575,7 +1564,7 @@ flush_page (f, need, page_addr, on_page)
 {
   int i;
 
 {
   int i;
 

-  /* Flush this page */
+  /* Flush this page.  */

   fprintf (f, "\t%s\t0x%08x\t%s Starting RVA for chunk\n",
           ASM_LONG,
           page_addr,
   fprintf (f, "\t%s\t0x%08x\t%s Starting RVA for chunk\n",
           ASM_LONG,
           page_addr,


@@ -1584,17 +1573,17 @@ flush_page (f, need, page_addr, on_page)
           ASM_LONG,
           (on_page * 2) + (on_page & 1) * 2 + 8,
           ASM_C);
           ASM_LONG,
           (on_page * 2) + (on_page & 1) * 2 + 8,
           ASM_C);

-  
+

   for (i = 0; i < on_page; i++)
     {
       long needed = need[i];
   for (i = 0; i < on_page; i++)
     {
       long needed = need[i];

-      
+

       if (needed)
        needed = ((needed - page_addr) | 0x3000) & 0xffff;
       if (needed)
        needed = ((needed - page_addr) | 0x3000) & 0xffff;

-  
+

       fprintf (f, "\t%s\t0x%lx\n", ASM_SHORT, needed);
     }
       fprintf (f, "\t%s\t0x%lx\n", ASM_SHORT, needed);
     }

-  
+

   /* And padding */
   if (on_page & 1)
     fprintf (f, "\t%s\t0x%x\n", ASM_SHORT, 0 | 0x0000);
   /* And padding */
   if (on_page & 1)
     fprintf (f, "\t%s\t0x%x\n", ASM_SHORT, 0 | 0x0000);


@@ -1607,7 +1596,7 @@ gen_def_file ()
   export_type *exp;
 
   inform (_("Adding exports to output file"));
   export_type *exp;
 
   inform (_("Adding exports to output file"));

-  
+

   fprintf (output_def, ";");
   for (i = 0; oav[i]; i++)
     fprintf (output_def, " %s", oav[i]);
   fprintf (output_def, ";");
   for (i = 0; oav[i]; i++)
     fprintf (output_def, " %s", oav[i]);


@@ -1620,7 +1609,7 @@ gen_def_file ()
       char *res = cplus_demangle (exp->internal_name, DMGL_ANSI | DMGL_PARAMS);
 
       if (strcmp (exp->name, exp->internal_name) == 0)
       char *res = cplus_demangle (exp->internal_name, DMGL_ANSI | DMGL_PARAMS);
 
       if (strcmp (exp->name, exp->internal_name) == 0)

-        {
+       {

 
          fprintf (output_def, "\t%s%s%s @ %d%s%s ; %s\n",
                   quote,
 
          fprintf (output_def, "\t%s%s%s @ %d%s%s ; %s\n",
                   quote,


@@ -1631,9 +1620,9 @@ gen_def_file ()
                   exp->data ? " DATA" : "",
                   res ? res : "");
        }
                   exp->data ? " DATA" : "",
                   res ? res : "");
        }

-      else 
-        {
-          char *quote1 = strchr (exp->internal_name, '.') ? "\"" : "";
+      else
+       {
+         char *quote1 = strchr (exp->internal_name, '.') ? "\"" : "";

          /* char *alias =  */
          fprintf (output_def, "\t%s%s%s = %s%s%s @ %d%s%s ; %s\n",
                   quote,
          /* char *alias =  */
          fprintf (output_def, "\t%s%s%s = %s%s%s @ %d%s%s ; %s\n",
                   quote,


@@ -1648,9 +1637,9 @@ gen_def_file ()
                   res ? res : "");
        }
       if (res)
                   res ? res : "");
        }
       if (res)

-        free (res);
+       free (res);

     }
     }

-  
+

   inform (_("Added exports to output file"));
 }
 
   inform (_("Added exports to output file"));
 }
 


@@ -1750,14 +1739,14 @@ generate_idata_ofile (filvar)
     }
 }
 
     }
 }
 

-/* Assemble the specified file. */
+/* Assemble the specified file.  */

 static void
 assemble_file (source, dest)
      const char * source;
      const char * dest;
 {
   char * cmd;
 static void
 assemble_file (source, dest)
      const char * source;
      const char * dest;
 {
   char * cmd;

-  
+

   cmd = (char *) alloca (strlen (ASM_SWITCHES) + strlen (as_flags)
                         + strlen (source) + strlen (dest) + 50);
 
   cmd = (char *) alloca (strlen (ASM_SWITCHES) + strlen (as_flags)
                         + strlen (source) + strlen (dest) + 50);
 


@@ -1775,18 +1764,18 @@ gen_exp_file ()
   dlist_type *dl;
 
   /* xgettext:c-format */
   dlist_type *dl;
 
   /* xgettext:c-format */

-  inform (_("Generating export file: %s\n"), exp_name);
-  
+  inform (_("Generating export file: %s"), exp_name);
+

   f = fopen (TMP_ASM, FOPEN_WT);
   if (!f)
     /* xgettext:c-format */
     fatal (_("Unable to open temporary assembler file: %s"), TMP_ASM);
   f = fopen (TMP_ASM, FOPEN_WT);
   if (!f)
     /* xgettext:c-format */
     fatal (_("Unable to open temporary assembler file: %s"), TMP_ASM);

-  
+

   /* xgettext:c-format */
   inform (_("Opened temporary file: %s"), TMP_ASM);
 
   dump_def_info (f);
   /* xgettext:c-format */
   inform (_("Opened temporary file: %s"), TMP_ASM);
 
   dump_def_info (f);

-  
+

   if (d_exports)
     {
       fprintf (f, "\t.section  .edata\n\n");
   if (d_exports)
     {
       fprintf (f, "\t.section  .edata\n\n");


@@ -1837,9 +1826,20 @@ gen_exp_file ()
                  i++;
                }
            }
                  i++;
                }
            }

-         fprintf (f, "\t%s%s%s%s\t%s %d\n", ASM_RVA_BEFORE,
-                   ASM_PREFIX,
-                   exp->internal_name, ASM_RVA_AFTER, ASM_C, exp->ordinal);
+
+         if (exp->forward == 0)
+           {
+             if (exp->internal_name[0] == '@')
+               fprintf (f, "\t%s%s%s\t%s %d\n", ASM_RVA_BEFORE,
+                        exp->internal_name, ASM_RVA_AFTER, ASM_C, exp->ordinal);
+             else
+               fprintf (f, "\t%s%s%s%s\t%s %d\n", ASM_RVA_BEFORE,
+                        ASM_PREFIX,
+                        exp->internal_name, ASM_RVA_AFTER, ASM_C, exp->ordinal);
+           }
+         else
+           fprintf (f, "\t%sf%d%s\t%s %d\n", ASM_RVA_BEFORE,
+                    exp->forward, ASM_RVA_AFTER, ASM_C, exp->ordinal);

          i++;
        }
 
          i++;
        }
 


@@ -1864,8 +1864,13 @@ gen_exp_file ()
       fprintf(f,"%s Export Name Table\n", ASM_C);
       for (i = 0; (exp = d_exports_lexically[i]); i++)
        if (!exp->noname || show_allnames)
       fprintf(f,"%s Export Name Table\n", ASM_C);
       for (i = 0; (exp = d_exports_lexically[i]); i++)
        if (!exp->noname || show_allnames)

-         fprintf (f, "n%d:     %s      \"%s\"\n",
-                  exp->ordinal, ASM_TEXT, exp->name);
+         {
+           fprintf (f, "n%d:   %s      \"%s\"\n",
+                    exp->ordinal, ASM_TEXT, xlate (exp->name));
+           if (exp->forward != 0)
+             fprintf (f, "f%d: %s      \"%s\"\n",
+                      exp->forward, ASM_TEXT, exp->internal_name);
+         }

 
       if (a_list)
        {
 
       if (a_list)
        {


@@ -1875,7 +1880,7 @@ gen_exp_file ()
              fprintf (f, "\t%s\t\"%s\"\n", ASM_TEXT, dl->text);
            }
        }
              fprintf (f, "\t%s\t\"%s\"\n", ASM_TEXT, dl->text);
            }
        }

-      
+

       if (d_list)
        {
          fprintf (f, "\t.section .rdata\n");
       if (d_list)
        {
          fprintf (f, "\t.section .rdata\n");


@@ -1883,7 +1888,7 @@ gen_exp_file ()
            {
              char *p;
              int l;
            {
              char *p;
              int l;

-             
+

              /* We don't output as ascii because there can
                 be quote characters in the string.  */
              l = 0;
              /* We don't output as ascii because there can
                 be quote characters in the string.  */
              l = 0;


@@ -1931,7 +1936,7 @@ gen_exp_file ()
          }
     }
 
          }
     }
 

-  /* Dump the reloc section if a base file is provided */
+  /* Dump the reloc section if a base file is provided.  */

   if (base_file)
     {
       int addr;
   if (base_file)
     {
       int addr;


@@ -1991,12 +1996,12 @@ gen_exp_file ()
 
   fclose (f);
 
 
   fclose (f);
 

-  /* assemble the file */
+  /* Assemble the file.  */

   assemble_file (TMP_ASM, exp_name);
 
   if (dontdeltemps == 0)
     unlink (TMP_ASM);
   assemble_file (TMP_ASM, exp_name);
 
   if (dontdeltemps == 0)
     unlink (TMP_ASM);

-  
+

   inform (_("Generated exports file"));
 }
 
   inform (_("Generated exports file"));
 }
 


@@ -2004,9 +2009,12 @@ static const char *
 xlate (name)
      const char *name;
 {
 xlate (name)
      const char *name;
 {

-  if (add_underscore)
+  int lead_at = (*name == '@');
+
+  if (add_underscore &&  !lead_at)

     {
       char *copy = xmalloc (strlen (name) + 2);
     {
       char *copy = xmalloc (strlen (name) + 2);

+

       copy[0] = '_';
       strcpy (copy + 1, name);
       name = copy;
       copy[0] = '_';
       strcpy (copy + 1, name);
       name = copy;


@@ -2015,6 +2023,8 @@ xlate (name)
   if (killat)
     {
       char *p;
   if (killat)
     {
       char *p;

+
+      name += lead_at;

       p = strchr (name, '@');
       if (p)
        *p = 0;
       p = strchr (name, '@');
       if (p)
        *p = 0;


@@ -2057,7 +2067,7 @@ typedef struct
   asymbol *sym;
   asymbol **sympp;
   int size;
   asymbol *sym;
   asymbol **sympp;
   int size;

-  unsigned   char *data;
+  unsigned char *data;

 } sinfo;
 
 #ifndef DLLTOOL_PPC
 } sinfo;
 
 #ifndef DLLTOOL_PPC


@@ -2072,22 +2082,28 @@ typedef struct
 
 #define NSECS 7
 
 
 #define NSECS 7
 

-#define INIT_SEC_DATA(id, name, flags, align) { id, name, flags, align, NULL, NULL, NULL, 0, NULL }
+#define TEXT_SEC_FLAGS   \
+        (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_READONLY | SEC_HAS_CONTENTS)
+#define DATA_SEC_FLAGS   (SEC_ALLOC | SEC_LOAD | SEC_DATA)
+#define BSS_SEC_FLAGS     SEC_ALLOC
+
+#define INIT_SEC_DATA(id, name, flags, align) \
+        { id, name, flags, align, NULL, NULL, NULL, 0, NULL }

 static sinfo secdata[NSECS] =
 {
 static sinfo secdata[NSECS] =
 {

-  INIT_SEC_DATA (TEXT,   ".text",    SEC_CODE | SEC_HAS_CONTENTS, 2),
-  INIT_SEC_DATA (DATA,   ".data",    SEC_DATA,                    2),
-  INIT_SEC_DATA (BSS,    ".bss",     0,                           2),
-  INIT_SEC_DATA (IDATA7, ".idata$7", SEC_HAS_CONTENTS,            2),
-  INIT_SEC_DATA (IDATA5, ".idata$5", SEC_HAS_CONTENTS,            2),
-  INIT_SEC_DATA (IDATA4, ".idata$4", SEC_HAS_CONTENTS,            2),
-  INIT_SEC_DATA (IDATA6, ".idata$6", SEC_HAS_CONTENTS,            1)
+  INIT_SEC_DATA (TEXT,   ".text",    TEXT_SEC_FLAGS,   2),
+  INIT_SEC_DATA (DATA,   ".data",    DATA_SEC_FLAGS,   2),
+  INIT_SEC_DATA (BSS,    ".bss",     BSS_SEC_FLAGS,    2),
+  INIT_SEC_DATA (IDATA7, ".idata$7", SEC_HAS_CONTENTS, 2),
+  INIT_SEC_DATA (IDATA5, ".idata$5", SEC_HAS_CONTENTS, 2),
+  INIT_SEC_DATA (IDATA4, ".idata$4", SEC_HAS_CONTENTS, 2),
+  INIT_SEC_DATA (IDATA6, ".idata$6", SEC_HAS_CONTENTS, 1)

 };
 
 #else
 
 };
 
 #else
 

-/* Sections numbered to make the order the same as other PowerPC NT    */
-/* compilers. This also keeps funny alignment thingies from happening. */
+/* Sections numbered to make the order the same as other PowerPC NT
+   compilers. This also keeps funny alignment thingies from happening.  */

 #define TEXT   0
 #define PDATA  1
 #define RDATA  2
 #define TEXT   0
 #define PDATA  1
 #define RDATA  2


@@ -2115,9 +2131,8 @@ static sinfo secdata[NSECS] =
 
 #endif
 
 
 #endif
 

-/*
-This is what we're trying to make.  We generate the imp symbols with
-both single and double underscores, for compatibility.
+/* This is what we're trying to make.  We generate the imp symbols with
+   both single and double underscores, for compatibility.

 
        .text
        .global _GetFileVersionInfoSizeW@8
 
        .text
        .global _GetFileVersionInfoSizeW@8


@@ -2140,7 +2155,7 @@ ID2:      .short  2
        .asciz  "GetFileVersionInfoSizeW"
 
 
        .asciz  "GetFileVersionInfoSizeW"
 
 

-For the PowerPC, here's the variation on the above scheme:
+   For the PowerPC, here's the variation on the above scheme:

 
 # Rather than a simple "jmp *", the code to get to the dll function
 # looks like:
 
 # Rather than a simple "jmp *", the code to get to the dll function
 # looks like:


@@ -2151,8 +2166,7 @@ For the PowerPC, here's the variation on the above scheme:
         stw    r2,4(r1)
         mtctr  r12
         lwz    r2,4(r11)
         stw    r2,4(r1)
         mtctr  r12
         lwz    r2,4(r11)

-        bctr
-*/
+        bctr  */

 
 static char *
 make_label (prefix, name)
 
 static char *
 make_label (prefix, name)


@@ -2161,12 +2175,39 @@ make_label (prefix, name)
 {
   int len = strlen (ASM_PREFIX) + strlen (prefix) + strlen (name);
   char *copy = xmalloc (len +1 );
 {
   int len = strlen (ASM_PREFIX) + strlen (prefix) + strlen (name);
   char *copy = xmalloc (len +1 );

+

   strcpy (copy, ASM_PREFIX);
   strcat (copy, prefix);
   strcat (copy, name);
   return copy;
 }
 
   strcpy (copy, ASM_PREFIX);
   strcat (copy, prefix);
   strcat (copy, name);
   return copy;
 }
 

+static char *
+make_imp_label (prefix, name)
+     const char *prefix;
+     const char *name;
+{
+  int len;
+  char *copy;
+
+  if (name[0] == '@')
+    {
+      len = strlen (prefix) + strlen (name);
+      copy = xmalloc (len + 1);
+      strcpy (copy, prefix);
+      strcat (copy, name);
+    }
+  else
+    {
+      len = strlen (ASM_PREFIX) + strlen (prefix) + strlen (name);
+      copy = xmalloc (len + 1);
+      strcpy (copy, prefix);
+      strcat (copy, ASM_PREFIX);
+      strcat (copy, name);
+    }
+  return copy;
+}
+

 static bfd *
 make_one_lib_file (exp, i)
      export_type *exp;
 static bfd *
 make_one_lib_file (exp, i)
      export_type *exp;


@@ -2227,7 +2268,7 @@ make_one_lib_file (exp, i)
     {
       bfd *      abfd;
       asymbol *  exp_label;
     {
       bfd *      abfd;
       asymbol *  exp_label;

-      asymbol *  iname;
+      asymbol *  iname = 0;

       asymbol *  iname2;
       asymbol *  iname_lab;
       asymbol ** iname_lab_pp;
       asymbol *  iname2;
       asymbol *  iname_lab;
       asymbol ** iname_lab_pp;


@@ -2241,22 +2282,23 @@ make_one_lib_file (exp, i)
 #define EXTRA    0
 #endif
       asymbol *  ptrs[NSECS + 4 + EXTRA + 1];
 #define EXTRA    0
 #endif
       asymbol *  ptrs[NSECS + 4 + EXTRA + 1];

+      flagword   applicable;

 
       char *     outname = xmalloc (10);
       int        oidx = 0;
 
 
       char *     outname = xmalloc (10);
       int        oidx = 0;
 

-      
+

       sprintf (outname, "%s%05d.o", TMP_STUB, i);
       sprintf (outname, "%s%05d.o", TMP_STUB, i);

-      
+

       abfd = bfd_openw (outname, HOW_BFD_WRITE_TARGET);
       abfd = bfd_openw (outname, HOW_BFD_WRITE_TARGET);

-      
+

       if (!abfd)
        /* xgettext:c-format */
        fatal (_("bfd_open failed open stub file: %s"), outname);
 
       /* xgettext:c-format */
       inform (_("Creating stub file: %s"), outname);
       if (!abfd)
        /* xgettext:c-format */
        fatal (_("bfd_open failed open stub file: %s"), outname);
 
       /* xgettext:c-format */
       inform (_("Creating stub file: %s"), outname);

-      
+

       bfd_set_format (abfd, bfd_object);
       bfd_set_arch_mach (abfd, HOW_BFD_ARCH, 0);
 
       bfd_set_format (abfd, bfd_object);
       bfd_set_arch_mach (abfd, HOW_BFD_ARCH, 0);
 


@@ -2264,8 +2306,10 @@ make_one_lib_file (exp, i)
       if (machine == MARM_INTERWORK || machine == MTHUMB)
        bfd_set_private_flags (abfd, F_INTERWORK);
 #endif
       if (machine == MARM_INTERWORK || machine == MTHUMB)
        bfd_set_private_flags (abfd, F_INTERWORK);
 #endif

-      
-      /* First make symbols for the sections */
+
+      applicable = bfd_applicable_section_flags (abfd);
+
+      /* First make symbols for the sections.  */

       for (i = 0; i < NSECS; i++)
        {
          sinfo *si = secdata + i;
       for (i = 0; i < NSECS; i++)
        {
          sinfo *si = secdata + i;


@@ -2274,7 +2318,7 @@ make_one_lib_file (exp, i)
          si->sec = bfd_make_section_old_way (abfd, si->name);
          bfd_set_section_flags (abfd,
                                 si->sec,
          si->sec = bfd_make_section_old_way (abfd, si->name);
          bfd_set_section_flags (abfd,
                                 si->sec,

-                                si->flags);
+                                si->flags & applicable);

 
          bfd_set_section_alignment(abfd, si->sec, si->align);
          si->sec->output_section = si->sec;
 
          bfd_set_section_alignment(abfd, si->sec, si->align);
          si->sec->output_section = si->sec;


@@ -2294,12 +2338,12 @@ make_one_lib_file (exp, i)
       if (! exp->data)
        {
          exp_label = bfd_make_empty_symbol (abfd);
       if (! exp->data)
        {
          exp_label = bfd_make_empty_symbol (abfd);

-         exp_label->name = make_label ("", exp->name);
+         exp_label->name = make_imp_label ("", exp->name);

 
          /* On PowerPC, the function name points to a descriptor in
             the rdata section, the first element of which is a
             pointer to the code (..function_name), and the second
 
          /* On PowerPC, the function name points to a descriptor in
             the rdata section, the first element of which is a
             pointer to the code (..function_name), and the second

-            points to the .toc */
+            points to the .toc.  */

 #ifdef DLLTOOL_PPC
          if (machine == MPPC)
            exp_label->section = secdata[RDATA].sec;
 #ifdef DLLTOOL_PPC
          if (machine == MPPC)
            exp_label->section = secdata[RDATA].sec;


@@ -2323,14 +2367,14 @@ make_one_lib_file (exp, i)
       if (create_compat_implib)
        {
          iname = bfd_make_empty_symbol (abfd);
       if (create_compat_implib)
        {
          iname = bfd_make_empty_symbol (abfd);

-         iname->name = make_label ("__imp_", exp->name);
+         iname->name = make_imp_label ("___imp", exp->name);

          iname->section = secdata[IDATA5].sec;
          iname->flags = BSF_GLOBAL;
          iname->value = 0;
        }
 
       iname2 = bfd_make_empty_symbol (abfd);
          iname->section = secdata[IDATA5].sec;
          iname->flags = BSF_GLOBAL;
          iname->value = 0;
        }
 
       iname2 = bfd_make_empty_symbol (abfd);

-      iname2->name = make_label ("_imp__", exp->name);
+      iname2->name = make_imp_label ("__imp_", exp->name);

       iname2->section = secdata[IDATA5].sec;
       iname2->flags = BSF_GLOBAL;
       iname2->value = 0;
       iname2->section = secdata[IDATA5].sec;
       iname2->flags = BSF_GLOBAL;
       iname2->value = 0;


@@ -2342,7 +2386,6 @@ make_one_lib_file (exp, i)
       iname_lab->flags = 0;
       iname_lab->value = 0;
 
       iname_lab->flags = 0;
       iname_lab->value = 0;
 

-

       iname_pp = ptrs + oidx;
       if (create_compat_implib)
        ptrs[oidx++] = iname;
       iname_pp = ptrs + oidx;
       if (create_compat_implib)
        ptrs[oidx++] = iname;


@@ -2352,7 +2395,7 @@ make_one_lib_file (exp, i)
       ptrs[oidx++] = iname_lab;
 
 #ifdef DLLTOOL_PPC
       ptrs[oidx++] = iname_lab;
 
 #ifdef DLLTOOL_PPC

-      /* The symbol refering to the code (.text) */
+      /* The symbol refering to the code (.text).  */

       {
        asymbol *function_name;
 
       {
        asymbol *function_name;
 


@@ -2366,9 +2409,9 @@ make_one_lib_file (exp, i)
        ptrs[oidx++] = function_name;
       }
 
        ptrs[oidx++] = function_name;
       }
 

-      /* The .toc symbol */
+      /* The .toc symbol.  */

       {
       {

-       asymbol *toc_symbol;    /* The .toc symbol */
+       asymbol *toc_symbol;

 
        toc_symbol = bfd_make_empty_symbol (abfd);
        toc_symbol->name = make_label (".", "toc");
 
        toc_symbol = bfd_make_empty_symbol (abfd);
        toc_symbol->name = make_label (".", "toc");


@@ -2380,7 +2423,7 @@ make_one_lib_file (exp, i)
        ptrs[oidx++] = toc_symbol;
       }
 #endif
        ptrs[oidx++] = toc_symbol;
       }
 #endif

-      
+

       ptrs[oidx] = 0;
 
       for (i = 0; i < NSECS; i++)
       ptrs[oidx] = 0;
 
       for (i = 0; i < NSECS; i++)


@@ -2401,11 +2444,11 @@ make_one_lib_file (exp, i)
 
                  /* add the reloc into idata$5 */
                  rel = xmalloc (sizeof (arelent));
 
                  /* add the reloc into idata$5 */
                  rel = xmalloc (sizeof (arelent));

-                 
+

                  rpp = xmalloc (sizeof (arelent *) * 2);
                  rpp[0] = rel;
                  rpp[1] = 0;
                  rpp = xmalloc (sizeof (arelent *) * 2);
                  rpp[0] = rel;
                  rpp[1] = 0;

-                 
+

                  rel->address = HOW_JTAB_ROFF;
                  rel->addend = 0;
 
                  rel->address = HOW_JTAB_ROFF;
                  rel->addend = 0;
 


@@ -2427,7 +2470,7 @@ make_one_lib_file (exp, i)
            case IDATA4:
            case IDATA5:
              /* An idata$4 or idata$5 is one word long, and has an
            case IDATA4:
            case IDATA5:
              /* An idata$4 or idata$5 is one word long, and has an

-                rva to idata$6 */
+                rva to idata$6.  */

 
              si->data = xmalloc (4);
              si->size = 4;
 
              si->data = xmalloc (4);
              si->size = 4;


@@ -2472,7 +2515,7 @@ make_one_lib_file (exp, i)
              break;
            case IDATA7:
              si->size = 4;
              break;
            case IDATA7:
              si->size = 4;

-             si->data =xmalloc(4);
+             si->data =xmalloc (4);

              memset (si->data, 0, si->size);
              rel = xmalloc (sizeof (arelent));
              rpp = xmalloc (sizeof (arelent *) * 2);
              memset (si->data, 0, si->size);
              rel = xmalloc (sizeof (arelent));
              rpp = xmalloc (sizeof (arelent *) * 2);


@@ -2488,16 +2531,16 @@ make_one_lib_file (exp, i)
 #ifdef DLLTOOL_PPC
            case PDATA:
              {
 #ifdef DLLTOOL_PPC
            case PDATA:
              {

-               /* The .pdata section is 5 words long. */
-               /* Think of it as:                     */
-               /* struct                              */
-               /* {                                   */
-               /*   bfd_vma BeginAddress,     [0x00]  */
-               /*           EndAddress,       [0x04]  */
-               /*           ExceptionHandler, [0x08]  */
-               /*           HandlerData,      [0x0c]  */
-               /*           PrologEndAddress; [0x10]  */
-               /* };                                  */
+               /* The .pdata section is 5 words long.
+                  Think of it as:                    
+                  struct                             
+                  {                                  
+                    bfd_vma BeginAddress,     [0x00] 
+                            EndAddress,       [0x04] 
+                            ExceptionHandler, [0x08] 
+                            HandlerData,      [0x0c] 
+                            PrologEndAddress; [0x10] 
+                  };  */

 
                /* So this pdata section setups up this as a glue linkage to
                   a dll routine. There are a number of house keeping things
 
                /* So this pdata section setups up this as a glue linkage to
                   a dll routine. There are a number of house keeping things


@@ -2512,15 +2555,14 @@ make_one_lib_file (exp, i)
                      So we need a total of four relocs for this section.
 
                   3. Lastly, the HandlerData field is set to 0x03, to indicate
                      So we need a total of four relocs for this section.
 
                   3. Lastly, the HandlerData field is set to 0x03, to indicate

-                     that this is a glue routine.
-               */
+                     that this is a glue routine.  */

                arelent *imglue, *ba_rel, *ea_rel, *pea_rel;
 
                arelent *imglue, *ba_rel, *ea_rel, *pea_rel;
 

-               /* alignment must be set to 2**2 or you get extra stuff */
+               /* Alignment must be set to 2**2 or you get extra stuff.  */

                bfd_set_section_alignment(abfd, sec, 2);
 
                si->size = 4 * 5;
                bfd_set_section_alignment(abfd, sec, 2);
 
                si->size = 4 * 5;

-               si->data =xmalloc(4 * 5);
+               si->data = xmalloc (si->size);

                memset (si->data, 0, si->size);
                rpp = xmalloc (sizeof (arelent *) * 5);
                rpp[0] = imglue  = xmalloc (sizeof (arelent));
                memset (si->data, 0, si->size);
                rpp = xmalloc (sizeof (arelent *) * 5);
                rpp[0] = imglue  = xmalloc (sizeof (arelent));


@@ -2529,7 +2571,7 @@ make_one_lib_file (exp, i)
                rpp[3] = pea_rel = xmalloc (sizeof (arelent));
                rpp[4] = 0;
 
                rpp[3] = pea_rel = xmalloc (sizeof (arelent));
                rpp[4] = 0;
 

-               /* stick the toc reload instruction in the glue reloc */
+               /* Stick the toc reload instruction in the glue reloc.  */

                bfd_put_32(abfd, ppc_glue_insn, (char *) &imglue->address);
 
                imglue->addend = 0;
                bfd_put_32(abfd, ppc_glue_insn, (char *) &imglue->address);
 
                imglue->addend = 0;


@@ -2542,17 +2584,17 @@ make_one_lib_file (exp, i)
                ba_rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);
                ba_rel->sym_ptr_ptr = fn_pp;
 
                ba_rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);
                ba_rel->sym_ptr_ptr = fn_pp;
 

-               bfd_put_32(abfd, 0x18, si->data + 0x04);
+               bfd_put_32 (abfd, 0x18, si->data + 0x04);

                ea_rel->address = 4;
                ea_rel->addend = 0;
                ea_rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);
                ea_rel->sym_ptr_ptr = fn_pp;
 
                ea_rel->address = 4;
                ea_rel->addend = 0;
                ea_rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);
                ea_rel->sym_ptr_ptr = fn_pp;
 

-               /* mark it as glue */
-               bfd_put_32(abfd, 0x03, si->data + 0x0c);
+               /* Mark it as glue.  */
+               bfd_put_32 (abfd, 0x03, si->data + 0x0c);

 
 

-               /* mark the prolog end address */
-               bfd_put_32(abfd, 0x0D, si->data + 0x10);
+               /* Mark the prolog end address.  */
+               bfd_put_32 (abfd, 0x0D, si->data + 0x10);

                pea_rel->address = 0x10;
                pea_rel->addend = 0;
                pea_rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);
                pea_rel->address = 0x10;
                pea_rel->addend = 0;
                pea_rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_32);


@@ -2567,9 +2609,7 @@ make_one_lib_file (exp, i)
                 descriptor consisting of:
                 1. The address of the code.
                 2. The address of the appropriate .toc
                 descriptor consisting of:
                 1. The address of the code.
                 2. The address of the appropriate .toc

-                We use relocs to build this.
-             */
-
+                We use relocs to build this.  */

              si->size = 8;
              si->data = xmalloc (8);
              memset (si->data, 0, si->size);
              si->size = 8;
              si->data = xmalloc (8);
              memset (si->data, 0, si->size);


@@ -2600,7 +2640,7 @@ make_one_lib_file (exp, i)
 
       {
        bfd_vma vma = 0;
 
       {
        bfd_vma vma = 0;

-       /* Size up all the sections */
+       /* Size up all the sections.  */

        for (i = 0; i < NSECS; i++)
          {
            sinfo *si = secdata + i;
        for (i = 0; i < NSECS; i++)
          {
            sinfo *si = secdata + i;


@@ -2611,7 +2651,7 @@ make_one_lib_file (exp, i)
 /*         vma += si->size;*/
          }
       }
 /*         vma += si->size;*/
          }
       }

-      /* Write them out */
+      /* Write them out.  */

       for (i = 0; i < NSECS; i++)
        {
          sinfo *si = secdata + i;
       for (i = 0; i < NSECS; i++)
        {
          sinfo *si = secdata + i;


@@ -2645,7 +2685,7 @@ make_head ()
       fatal (_("failed to open temporary head file: %s"), TMP_HEAD_S);
       return NULL;
     }
       fatal (_("failed to open temporary head file: %s"), TMP_HEAD_S);
       return NULL;
     }

-  
+

   fprintf (f, "%s IMAGE_IMPORT_DESCRIPTOR\n", ASM_C);
   fprintf (f, "\t.section      .idata$2\n");
 
   fprintf (f, "%s IMAGE_IMPORT_DESCRIPTOR\n", ASM_C);
   fprintf (f, "\t.section      .idata$2\n");
 


@@ -2677,7 +2717,7 @@ make_head ()
       fprintf (f, "\t%s\t0\n", ASM_LONG);
       fprintf (f, "fthunk:\n");
     }
       fprintf (f, "\t%s\t0\n", ASM_LONG);
       fprintf (f, "fthunk:\n");
     }

-  
+

   if (!no_idata4)
     {
       fprintf (f, "\t.section\t.idata$4\n");
   if (!no_idata4)
     {
       fprintf (f, "\t.section\t.idata$4\n");


@@ -2686,7 +2726,7 @@ make_head ()
       fprintf (f, "\t.section  .idata$4\n");
       fprintf (f, "hname:\n");
     }
       fprintf (f, "\t.section  .idata$4\n");
       fprintf (f, "hname:\n");
     }

-  
+

   fclose (f);
 
   assemble_file (TMP_HEAD_S, TMP_HEAD_O);
   fclose (f);
 
   assemble_file (TMP_HEAD_S, TMP_HEAD_O);


@@ -2704,13 +2744,13 @@ make_tail ()
       fatal (_("failed to open temporary tail file: %s"), TMP_TAIL_S);
       return NULL;
     }
       fatal (_("failed to open temporary tail file: %s"), TMP_TAIL_S);
       return NULL;
     }

-  
+

   if (!no_idata4)
     {
       fprintf (f, "\t.section  .idata$4\n");
       fprintf (f, "\t%s\t0\n", ASM_LONG);
     }
   if (!no_idata4)
     {
       fprintf (f, "\t.section  .idata$4\n");
       fprintf (f, "\t%s\t0\n", ASM_LONG);
     }

-  
+

   if (!no_idata5)
     {
       fprintf (f, "\t.section  .idata$5\n");
   if (!no_idata5)
     {
       fprintf (f, "\t.section  .idata$5\n");


@@ -2723,8 +2763,7 @@ make_tail ()
      would be to mark this section as a comdat type 2 section, so
      only one would appear in the final .exe (if our linker supported
      comdat, that is) or cause it to be inserted by something else (say
      would be to mark this section as a comdat type 2 section, so
      only one would appear in the final .exe (if our linker supported
      comdat, that is) or cause it to be inserted by something else (say

-     crt0)
-  */
+     crt0).  */

 
   fprintf (f, "\t.section      .idata$3\n");
   fprintf (f, "\t%s\t0\n", ASM_LONG);
 
   fprintf (f, "\t.section      .idata$3\n");
   fprintf (f, "\t%s\t0\n", ASM_LONG);


@@ -2736,7 +2775,7 @@ make_tail ()
 
 #ifdef DLLTOOL_PPC
   /* Other PowerPC NT compilers use idata$6 for the dllname, so I
 
 #ifdef DLLTOOL_PPC
   /* Other PowerPC NT compilers use idata$6 for the dllname, so I

-     do too. Original, huh? */
+     do too. Original, huh?  */

   fprintf (f, "\t.section      .idata$6\n");
 #else
   fprintf (f, "\t.section      .idata$7\n");
   fprintf (f, "\t.section      .idata$6\n");
 #else
   fprintf (f, "\t.section      .idata$7\n");


@@ -2749,8 +2788,8 @@ make_tail ()
   fclose (f);
 
   assemble_file (TMP_TAIL_S, TMP_TAIL_O);
   fclose (f);
 
   assemble_file (TMP_TAIL_S, TMP_TAIL_O);

-  
-  return  bfd_openr (TMP_TAIL_O, HOW_BFD_READ_TARGET);
+
+  return bfd_openr (TMP_TAIL_O, HOW_BFD_READ_TARGET);

 }
 
 static void
 }
 
 static void


@@ -2772,19 +2811,18 @@ gen_lib_file ()
     fatal (_("Can't open .lib file: %s"), imp_name);
 
   /* xgettext:c-format */
     fatal (_("Can't open .lib file: %s"), imp_name);
 
   /* xgettext:c-format */

-  inform (_("Creating library file: %s\n"), imp_name);
-  
+  inform (_("Creating library file: %s"), imp_name);
+

   bfd_set_format (outarch, bfd_archive);
   outarch->has_armap = 1;
 
   bfd_set_format (outarch, bfd_archive);
   outarch->has_armap = 1;
 

-  /* Work out a reasonable size of things to put onto one line. */
-
+  /* Work out a reasonable size of things to put onto one line.  */

   ar_head = make_head ();
   ar_tail = make_tail();
 
   if (ar_head == NULL || ar_tail == NULL)
     return;
   ar_head = make_head ();
   ar_tail = make_tail();
 
   if (ar_head == NULL || ar_tail == NULL)
     return;

-  
+

   for (i = 0; (exp = d_exports_lexically[i]); i++)
     {
       bfd *n = make_one_lib_file (exp, i);
   for (i = 0; (exp = d_exports_lexically[i]); i++)
     {
       bfd *n = make_one_lib_file (exp, i);


@@ -2792,15 +2830,14 @@ gen_lib_file ()
       head = n;
     }
 
       head = n;
     }
 

-  /* Now stick them all into the archive */
-
+  /* Now stick them all into the archive.  */

   ar_head->next = head;
   ar_tail->next = ar_head;
   head = ar_tail;
 
   if (! bfd_set_archive_head (outarch, head))
     bfd_fatal ("bfd_set_archive_head");
   ar_head->next = head;
   ar_tail->next = ar_head;
   head = ar_tail;
 
   if (! bfd_set_archive_head (outarch, head))
     bfd_fatal ("bfd_set_archive_head");

-  
+

   if (! bfd_close (outarch))
     bfd_fatal (imp_name);
 
   if (! bfd_close (outarch))
     bfd_fatal (imp_name);
 


@@ -2811,8 +2848,7 @@ gen_lib_file ()
       head = n;
     }
 
       head = n;
     }
 

-  /* Delete all the temp files */
-
+  /* Delete all the temp files.  */

   if (dontdeltemps == 0)
     {
       unlink (TMP_HEAD_O);
   if (dontdeltemps == 0)
     {
       unlink (TMP_HEAD_O);


@@ -2831,17 +2867,17 @@ gen_lib_file ()
          sprintf (name, "%s%05d.o", TMP_STUB, i);
          if (unlink (name) < 0)
            /* xgettext:c-format */
          sprintf (name, "%s%05d.o", TMP_STUB, i);
          if (unlink (name) < 0)
            /* xgettext:c-format */

-           warn (_("cannot delete %s: %s\n"), name, strerror (errno));
+           non_fatal (_("cannot delete %s: %s"), name, strerror (errno));

        }
     }
        }
     }

-  
+

   inform (_("Created lib file"));
 }
 
 /**********************************************************************/
 
 /* Run through the information gathered from the .o files and the
   inform (_("Created lib file"));
 }
 
 /**********************************************************************/
 
 /* Run through the information gathered from the .o files and the

-   .def file and work out the best stuff */
+   .def file and work out the best stuff.  */

 static int
 pfunc (a, b)
      const void *a;
 static int
 pfunc (a, b)
      const void *a;


@@ -2852,7 +2888,7 @@ pfunc (a, b)
   if (ap->ordinal == bp->ordinal)
     return 0;
 
   if (ap->ordinal == bp->ordinal)
     return 0;
 

-  /* unset ordinals go to the bottom */
+  /* Unset ordinals go to the bottom.  */

   if (ap->ordinal == -1)
     return 1;
   if (bp->ordinal == -1)
   if (ap->ordinal == -1)
     return 1;
   if (bp->ordinal == -1)


@@ -2877,6 +2913,7 @@ remove_null_names (ptr)
 {
   int src;
   int dst;
 {
   int src;
   int dst;

+

   for (dst = src = 0; src < d_nfuncs; src++)
     {
       if (ptr[src])
   for (dst = src = 0; src < d_nfuncs; src++)
     {
       if (ptr[src])


@@ -2920,11 +2957,12 @@ process_duplicates (d_export_vec)
 {
   int more = 1;
   int i;
 {
   int more = 1;
   int i;

+

   while (more)
     {
 
       more = 0;
   while (more)
     {
 
       more = 0;

-      /* Remove duplicates */
+      /* Remove duplicates.  */

       qsort (d_export_vec, d_nfuncs, sizeof (export_type *), nfunc);
 
       dtab (d_export_vec);
       qsort (d_export_vec, d_nfuncs, sizeof (export_type *), nfunc);
 
       dtab (d_export_vec);


@@ -2938,18 +2976,18 @@ process_duplicates (d_export_vec)
              export_type *b = d_export_vec[i + 1];
 
              more = 1;
              export_type *b = d_export_vec[i + 1];
 
              more = 1;

-             
+

              /* xgettext:c-format */
              /* xgettext:c-format */

-             inform (_("Warning, ignoring duplicate EXPORT %s %d,%d\n"),
+             inform (_("Warning, ignoring duplicate EXPORT %s %d,%d"),

                      a->name, a->ordinal, b->ordinal);
                      a->name, a->ordinal, b->ordinal);

-             
+

              if (a->ordinal != -1
                  && b->ordinal != -1)
                /* xgettext:c-format */
                fatal (_("Error, duplicate EXPORT with oridinals: %s"),
                      a->name);
 
              if (a->ordinal != -1
                  && b->ordinal != -1)
                /* xgettext:c-format */
                fatal (_("Error, duplicate EXPORT with oridinals: %s"),
                      a->name);
 

-             /* Merge attributes */
+             /* Merge attributes.  */

              b->ordinal = a->ordinal > 0 ? a->ordinal : b->ordinal;
              b->constant |= a->constant;
              b->noname |= a->noname;
              b->ordinal = a->ordinal > 0 ? a->ordinal : b->ordinal;
              b->constant |= a->constant;
              b->noname |= a->noname;


@@ -2964,7 +3002,7 @@ process_duplicates (d_export_vec)
     }
 
 
     }
 
 

-  /* Count the names */
+  /* Count the names.  */

   for (i = 0; i < d_nfuncs; i++)
     {
       if (!d_export_vec[i]->noname)
   for (i = 0; i < d_nfuncs; i++)
     {
       if (!d_export_vec[i]->noname)


@@ -2983,22 +3021,20 @@ fill_ordinals (d_export_vec)
 
   qsort (d_export_vec, d_nfuncs, sizeof (export_type *), pfunc);
 
 
   qsort (d_export_vec, d_nfuncs, sizeof (export_type *), pfunc);
 

-  /* fill in the unset ordinals with ones from our range */
-
+  /* Fill in the unset ordinals with ones from our range.  */

   ptr = (char *) xmalloc (size);
 
   memset (ptr, 0, size);
 
   ptr = (char *) xmalloc (size);
 
   memset (ptr, 0, size);
 

-  /* Mark in our large vector all the numbers that are taken */
+  /* Mark in our large vector all the numbers that are taken.  */

   for (i = 0; i < d_nfuncs; i++)
     {
       if (d_export_vec[i]->ordinal != -1)
        {
          ptr[d_export_vec[i]->ordinal] = 1;
   for (i = 0; i < d_nfuncs; i++)
     {
       if (d_export_vec[i]->ordinal != -1)
        {
          ptr[d_export_vec[i]->ordinal] = 1;

+

          if (lowest == -1 || d_export_vec[i]->ordinal < lowest)
          if (lowest == -1 || d_export_vec[i]->ordinal < lowest)

-           {
-             lowest = d_export_vec[i]->ordinal;
-           }
+           lowest = d_export_vec[i]->ordinal;

        }
     }
 
        }
     }
 


@@ -3006,14 +3042,14 @@ fill_ordinals (d_export_vec)
   if (lowest == -1)
     lowest = 1;
 
   if (lowest == -1)
     lowest = 1;
 

-  /* Now fill in ordinals where the user wants us to choose. */
+  /* Now fill in ordinals where the user wants us to choose.  */

   for (i = 0; i < d_nfuncs; i++)
     {
       if (d_export_vec[i]->ordinal == -1)
        {
          register int j;
 
   for (i = 0; i < d_nfuncs; i++)
     {
       if (d_export_vec[i]->ordinal == -1)
        {
          register int j;
 

-         /* First try within or after any user supplied range. */
+         /* First try within or after any user supplied range.  */

          for (j = lowest; j < size; j++)
            if (ptr[j] == 0)
              {
          for (j = lowest; j < size; j++)
            if (ptr[j] == 0)
              {


@@ -3022,7 +3058,7 @@ fill_ordinals (d_export_vec)
                goto done;
              }
 
                goto done;
              }
 

-         /* Then try before the range. */
+         /* Then try before the range.  */

          for (j = lowest; j >0; j--)
            if (ptr[j] == 0)
              {
          for (j = lowest; j >0; j--)
            if (ptr[j] == 0)
              {


@@ -3036,8 +3072,7 @@ fill_ordinals (d_export_vec)
 
   free (ptr);
 
 
   free (ptr);
 

-  /* And resort */
-
+  /* And resort.  */

   qsort (d_export_vec, d_nfuncs, sizeof (export_type *), pfunc);
 
   /* Work out the lowest and highest ordinal numbers.  */
   qsort (d_export_vec, d_nfuncs, sizeof (export_type *), pfunc);
 
   /* Work out the lowest and highest ordinal numbers.  */


@@ -3064,8 +3099,7 @@ alphafunc (av,bv)
 static void
 mangle_defs ()
 {
 static void
 mangle_defs ()
 {

-  /* First work out the minimum ordinal chosen */
-
+  /* First work out the minimum ordinal chosen.  */

   export_type *exp;
 
   int i;
   export_type *exp;
 
   int i;


@@ -3074,16 +3108,14 @@ mangle_defs ()
   = (export_type **) xmalloc (sizeof (export_type *) * d_nfuncs);
 
   inform (_("Processing definitions"));
   = (export_type **) xmalloc (sizeof (export_type *) * d_nfuncs);
 
   inform (_("Processing definitions"));

-  
+

   for (i = 0, exp = d_exports; exp; i++, exp = exp->next)
   for (i = 0, exp = d_exports; exp; i++, exp = exp->next)

-    {
-      d_export_vec[i] = exp;
-    }
+    d_export_vec[i] = exp;

 
   process_duplicates (d_export_vec);
   fill_ordinals (d_export_vec);
 
 
   process_duplicates (d_export_vec);
   fill_ordinals (d_export_vec);
 

-  /* Put back the list in the new order */
+  /* Put back the list in the new order.  */

   d_exports = 0;
   for (i = d_nfuncs - 1; i >= 0; i--)
     {
   d_exports = 0;
   for (i = d_nfuncs - 1; i >= 0; i--)
     {


@@ -3091,26 +3123,22 @@ mangle_defs ()
       d_exports = d_export_vec[i];
     }
 
       d_exports = d_export_vec[i];
     }
 

-  /* Build list in alpha order */
+  /* Build list in alpha order.  */

   d_exports_lexically = (export_type **)
     xmalloc (sizeof (export_type *) * (d_nfuncs + 1));
 
   for (i = 0, exp = d_exports; exp; i++, exp = exp->next)
   d_exports_lexically = (export_type **)
     xmalloc (sizeof (export_type *) * (d_nfuncs + 1));
 
   for (i = 0, exp = d_exports; exp; i++, exp = exp->next)

-    {
-      d_exports_lexically[i] = exp;
-    }
+    d_exports_lexically[i] = exp;
+

   d_exports_lexically[i] = 0;
 
   qsort (d_exports_lexically, i, sizeof (export_type *), alphafunc);
 
   d_exports_lexically[i] = 0;
 
   qsort (d_exports_lexically, i, sizeof (export_type *), alphafunc);
 

-  /* Fill exp entries with their hint values */
-
+  /* Fill exp entries with their hint values.  */

   for (i = 0; i < d_nfuncs; i++)
   for (i = 0; i < d_nfuncs; i++)

-    {
-      if (!d_exports_lexically[i]->noname || show_allnames)
-       d_exports_lexically[i]->hint = hint++;
-    }
-  
+    if (!d_exports_lexically[i]->noname || show_allnames)
+      d_exports_lexically[i]->hint = hint++;
+

   inform (_("Processed definitions"));
 }
 
   inform (_("Processed definitions"));
 }
 


@@ -3122,7 +3150,7 @@ usage (file, status)
      int status;
 {
   /* xgetext:c-format */
      int status;
 {
   /* xgetext:c-format */

-  fprintf (file, _("Usage %s <options> <object-files>\n"), program_name);
+  fprintf (file, _("Usage %s <option(s)> <object-file(s)>\n"), program_name);

   /* xgetext:c-format */
   fprintf (file, _("   -m --machine <machine>    Create as DLL for <machine>.  [default: %s]\n"), mname);
   fprintf (file, _("        possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"));
   /* xgetext:c-format */
   fprintf (file, _("   -m --machine <machine>    Create as DLL for <machine>.  [default: %s]\n"), mname);
   fprintf (file, _("        possible <machine>: arm[_interwork], i386, mcore[-elf]{-le|-be}, ppc, thumb\n"));


@@ -3193,6 +3221,8 @@ static const struct option long_options[] =
   {NULL,0,NULL,0}
 };
 
   {NULL,0,NULL,0}
 };
 

+int main PARAMS ((int, char **));
+

 int
 main (ac, av)
      int ac;
 int
 main (ac, av)
      int ac;


@@ -3206,15 +3236,18 @@ main (ac, av)
 
 #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
   setlocale (LC_MESSAGES, "");
 
 #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
   setlocale (LC_MESSAGES, "");

+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");

 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
   while ((c = getopt_long (ac, av,
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
   while ((c = getopt_long (ac, av,

-#ifdef DLLTOOL_MCORE_ELF                          
-                          "m:e:l:aD:d:z:b:xcCuUkAS:f:nvVhM:L:F:",
+#ifdef DLLTOOL_MCORE_ELF
+                          "m:e:l:aD:d:z:b:xcCuUkAS:f:nvVHhM:L:F:",

 #else
 #else

-                          "m:e:l:aD:d:z:b:xcCuUkAS:f:nvVh",
+                          "m:e:l:aD:d:z:b:xcCuUkAS:f:nvVHh",

 #endif
                           long_options, 0))
         != EOF)
 #endif
                           long_options, 0))
         != EOF)


@@ -3264,6 +3297,7 @@ main (ac, av)
        case 'e':
          exp_name = optarg;
          break;
        case 'e':
          exp_name = optarg;
          break;

+       case 'H':

        case 'h':
          usage (stdout, 0);
          break;
        case 'h':
          usage (stdout, 0);
          break;


@@ -3293,7 +3327,7 @@ main (ac, av)
          break;
        case 'b':
          base_file = fopen (optarg, FOPEN_RB);
          break;
        case 'b':
          base_file = fopen (optarg, FOPEN_RB);

-         
+

          if (!base_file)
            /* xgettext:c-format */
            fatal (_("Unable to open base-file: %s"), optarg);
          if (!base_file)
            /* xgettext:c-format */
            fatal (_("Unable to open base-file: %s"), optarg);


@@ -3339,13 +3373,13 @@ main (ac, av)
 
   if (as_name == NULL)
     as_name = deduce_name ("as");
 
   if (as_name == NULL)
     as_name = deduce_name ("as");

-  
+

   /* Don't use the default exclude list if we're reading only the
      symbols in the .drectve section.  The default excludes are meant
      to avoid exporting DLL entry point and Cygwin32 impure_ptr.  */
   if (! export_all_symbols)
     do_default_excludes = false;
   /* Don't use the default exclude list if we're reading only the
      symbols in the .drectve section.  The default excludes are meant
      to avoid exporting DLL entry point and Cygwin32 impure_ptr.  */
   if (! export_all_symbols)
     do_default_excludes = false;

-  
+

   if (do_default_excludes)
     set_default_excludes ();
 
   if (do_default_excludes)
     set_default_excludes ();
 


@@ -3364,30 +3398,30 @@ main (ac, av)
 
   if (exp_name)
     gen_exp_file ();
 
   if (exp_name)
     gen_exp_file ();

-  
+

   if (imp_name)
     {
   if (imp_name)
     {

-      /* Make imp_name safe for use as a label. */
+      /* Make imp_name safe for use as a label.  */

       char *p;
 
       imp_name_lab = xstrdup (imp_name);
       for (p = imp_name_lab; *p; p++)
        {
       char *p;
 
       imp_name_lab = xstrdup (imp_name);
       for (p = imp_name_lab; *p; p++)
        {

-         if (!isalpha ((unsigned char) *p) && !isdigit ((unsigned char) *p))
+         if (!ISALNUM (*p))

            *p = '_';
        }
       head_label = make_label("_head_", imp_name_lab);
       gen_lib_file ();
     }
            *p = '_';
        }
       head_label = make_label("_head_", imp_name_lab);
       gen_lib_file ();
     }

-  
+

   if (output_def)
     gen_def_file ();
   if (output_def)
     gen_def_file ();

-  
+

 #ifdef DLLTOOL_MCORE_ELF
   if (mcore_elf_out_file)
     mcore_elf_gen_out_file ();
 #endif
 #ifdef DLLTOOL_MCORE_ELF
   if (mcore_elf_out_file)
     mcore_elf_gen_out_file ();
 #endif

-  
+

   return 0;
 }
 
   return 0;
 }
 


@@ -3405,10 +3439,10 @@ look_for_prog (prog_name, prefix, end_prefix)
   struct stat s;
   char *cmd;
 
   struct stat s;
   char *cmd;
 

-  cmd = xmalloc (strlen (prefix) 
-                 + strlen (prog_name) 
+  cmd = xmalloc (strlen (prefix)
+                + strlen (prog_name)

 #ifdef HAVE_EXECUTABLE_SUFFIX
 #ifdef HAVE_EXECUTABLE_SUFFIX

-                 + strlen (EXECUTABLE_SUFFIX) 
+                + strlen (EXECUTABLE_SUFFIX)

 #endif
                 + 10);
   strcpy (cmd, prefix);
 #endif
                 + 10);
   strcpy (cmd, prefix);


@@ -3421,12 +3455,12 @@ look_for_prog (prog_name, prefix, end_prefix)
 
       found = (stat (cmd, &s) == 0
 #ifdef HAVE_EXECUTABLE_SUFFIX
 
       found = (stat (cmd, &s) == 0
 #ifdef HAVE_EXECUTABLE_SUFFIX

-               || stat (strcat (cmd, EXECUTABLE_SUFFIX), &s) == 0
+              || stat (strcat (cmd, EXECUTABLE_SUFFIX), &s) == 0

 #endif
               );
 
       if (! found)
 #endif
               );
 
       if (! found)

-        {
+       {

          /* xgettext:c-format */
          inform (_("Tried file: %s"), cmd);
          free (cmd);
          /* xgettext:c-format */
          inform (_("Tried file: %s"), cmd);
          free (cmd);


@@ -3443,24 +3477,24 @@ look_for_prog (prog_name, prefix, end_prefix)
 /* Deduce the name of the program we are want to invoke.
    PROG_NAME is the basic name of the program we want to run,
    eg "as" or "ld".  The catch is that we might want actually
 /* Deduce the name of the program we are want to invoke.
    PROG_NAME is the basic name of the program we want to run,
    eg "as" or "ld".  The catch is that we might want actually

-   run "i386-pe-as" or "ppc-pe-ld".  
+   run "i386-pe-as" or "ppc-pe-ld".

 
    If argv[0] contains the full path, then try to find the program
    in the same place, with and then without a target-like prefix.
 
    Given, argv[0] = /usr/local/bin/i586-cygwin32-dlltool,
 
    If argv[0] contains the full path, then try to find the program
    in the same place, with and then without a target-like prefix.
 
    Given, argv[0] = /usr/local/bin/i586-cygwin32-dlltool,

-   deduce_name("as") uses the following search order: 
+   deduce_name("as") uses the following search order:

 
      /usr/local/bin/i586-cygwin32-as
      /usr/local/bin/as
      as
 
      /usr/local/bin/i586-cygwin32-as
      /usr/local/bin/as
      as

-   
+

    If there's an EXECUTABLE_SUFFIX, it'll use that as well; for each
    name, it'll try without and then with EXECUTABLE_SUFFIX.
 
    Given, argv[0] = i586-cygwin32-dlltool, it will not even try "as"
    as the fallback, but rather return i586-cygwin32-as.
    If there's an EXECUTABLE_SUFFIX, it'll use that as well; for each
    name, it'll try without and then with EXECUTABLE_SUFFIX.
 
    Given, argv[0] = i586-cygwin32-dlltool, it will not even try "as"
    as the fallback, but rather return i586-cygwin32-as.

-     
+

    Oh, and given, argv[0] = dlltool, it'll return "as".
 
    Returns a dynamically allocated string.  */
    Oh, and given, argv[0] = dlltool, it'll return "as".
 
    Returns a dynamically allocated string.  */


@@ -3559,7 +3593,7 @@ mcore_elf_gen_out_file (void)
 
   if (mcore_elf_linker_flags != NULL)
     dyn_string_append (ds, mcore_elf_linker_flags);
 
   if (mcore_elf_linker_flags != NULL)
     dyn_string_append (ds, mcore_elf_linker_flags);

-  
+

   while (ptr->next != NULL)
     {
       dyn_string_append (ds, ptr->filename);
   while (ptr->next != NULL)
     {
       dyn_string_append (ds, ptr->filename);


@@ -3573,18 +3607,18 @@ mcore_elf_gen_out_file (void)
 
   if (mcore_elf_linker == NULL)
     mcore_elf_linker = deduce_name ("ld");
 
   if (mcore_elf_linker == NULL)
     mcore_elf_linker = deduce_name ("ld");

-  
+

   run (mcore_elf_linker, ds->s);
 
   dyn_string_delete (ds);
 
   run (mcore_elf_linker, ds->s);
 
   dyn_string_delete (ds);
 

-  /* Step two. Create a .exp file and a .lib file from the temporary file. 
-     Do this by recursively invoking dlltool....*/
+  /* Step two. Create a .exp file and a .lib file from the temporary file.
+     Do this by recursively invoking dlltool...  */

   ds = dyn_string_new (100);
 
   dyn_string_append (ds, "-S ");
   dyn_string_append (ds, as_name);
   ds = dyn_string_new (100);
 
   dyn_string_append (ds, "-S ");
   dyn_string_append (ds, as_name);

-  
+

   dyn_string_append (ds, " -e ");
   dyn_string_append (ds, MCORE_ELF_TMP_EXP);
   dyn_string_append (ds, " -l ");
   dyn_string_append (ds, " -e ");
   dyn_string_append (ds, MCORE_ELF_TMP_EXP);
   dyn_string_append (ds, " -l ");


@@ -3594,17 +3628,16 @@ mcore_elf_gen_out_file (void)
 
   if (verbose)
     dyn_string_append (ds, " -v");
 
   if (verbose)
     dyn_string_append (ds, " -v");

-  
+

   if (dontdeltemps)
     {
       dyn_string_append (ds, " -n");
   if (dontdeltemps)
     {
       dyn_string_append (ds, " -n");

-  
+

       if (dontdeltemps > 1)
        dyn_string_append (ds, " -n");
     }
 
   /* XXX - FIME: ought to check/copy other command line options as well.  */
       if (dontdeltemps > 1)
        dyn_string_append (ds, " -n");
     }
 
   /* XXX - FIME: ought to check/copy other command line options as well.  */

-  

   run (program_name, ds->s);
 
   dyn_string_delete (ds);
   run (program_name, ds->s);
 
   dyn_string_delete (ds);