/* dlltool.c -- tool to generate stuff for PE style DLLs
- Copyright 1995, 1996, 1997, 1998, 1999, 2000
+ Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
Free Software Foundation, Inc.
This file is part of GNU Binutils.
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)
asm (".section .drectve");
asm (".ascii \"-export:cdef\"");
asm (".ascii \"-export:ddef\"");
-
+
void cdef (char * s)
{
printf ("hello from the dll %s\n", s);
# 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
-
+
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 -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
-
+
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
-
- ld -o thedll.dll thedll.exp file1.o file2.o
- */
+
+ ld -o thedll.dll thedll.exp file1.o file2.o */
/* .idata section description
= 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__
#include "demangle.h"
#include "dyn-string.h"
#include "dlltool.h"
+#include "safe-ctype.h"
-#include <ctype.h>
#include <time.h>
#include <sys/stat.h>
#endif
/* Forward references. */
-static char *look_for_prog PARAMS ((const char *, const char *, int));
-static char *deduce_name PARAMS ((const char *));
+static char *look_for_prog
+ PARAMS ((const char *, const char *, int));
+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
-
+
#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
-#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)
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
{
- 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
static char *as_name = NULL;
static char * as_flags = "";
+static char *tmp_prefix = "d";
+
static int no_idata4;
static int no_idata5;
static char *exp_name;
static int add_underscore = 0;
static int dontdeltemps = 0;
-/* True if we should export all symbols. Otherwise, we only export
+/* TRUE if we should export all symbols. Otherwise, we only export
symbols listed in .drectve sections or in the def file. */
-static boolean export_all_symbols;
+static bfd_boolean export_all_symbols;
-/* True if we should exclude the symbols in DEFAULT_EXCLUDES when
+/* TRUE if we should exclude the symbols in DEFAULT_EXCLUDES when
exporting all symbols. */
-static boolean do_default_excludes=true;
+static bfd_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";
-/* 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;
+static bfd_boolean create_compat_implib;
static char *def_file;
#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_HEAD_O "dh.o"
-#define TMP_TAIL_S "dt.s"
-#define TMP_TAIL_O "dt.o"
-#define TMP_STUB "ds"
+char *tmp_asm_buf;
+char *tmp_head_s_buf;
+char *tmp_head_o_buf;
+char *tmp_tail_s_buf;
+char *tmp_tail_o_buf;
+char *tmp_stub_buf;
-/* This bit of assemly does jmp * .... */
+#define TMP_ASM dlltmp (tmp_asm_buf, "%sc.s")
+#define TMP_HEAD_S dlltmp (tmp_head_s_buf, "%sh.s")
+#define TMP_HEAD_O dlltmp (tmp_head_o_buf, "%sh.o")
+#define TMP_TAIL_S dlltmp (tmp_tail_s_buf, "%st.s")
+#define TMP_TAIL_O dlltmp (tmp_tail_o_buf, "%st.o")
+#define TMP_STUB dlltmp (tmp_stub_buf, "%ss")
+
+/* This bit of assemly does jmp * .... */
static const unsigned char i386_jtab[] =
{
0xff, 0x25, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90
static const unsigned char mcore_be_jtab[] =
{
0x71, 0x02, /* lrw r1,2 */
- 0x81, 0x01, /* ld.w r1,(r1,0) */
+ 0x81, 0x01, /* ld.w r1,(r1,0) */
0x00, 0xC1, /* jmp r1 */
0x12, 0x00, /* nop */
- 0x00, 0x00, 0x00, 0x00 /* <address> */
+ 0x00, 0x00, 0x00, 0x00 /* <address> */
};
static const unsigned char mcore_le_jtab[] =
{
0x02, 0x71, /* lrw r1,2 */
- 0x01, 0x81, /* ld.w r1,(r1,0) */
+ 0x01, 0x81, /* ld.w r1,(r1,0) */
0xC1, 0x00, /* jmp r1 */
0x00, 0x12, /* nop */
- 0x00, 0x00, 0x00, 0x00 /* <address> */
+ 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) */
};
#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
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
int noname;
int data;
int hint;
- int forward; /* number of forward label, 0 means no forward */
+ 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 string_list
{
struct string_list *next;
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 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 scan_filtered_symbols PARAMS ((bfd *, PTR, long, unsigned int));
-static void add_excludes PARAMS ((const char *));
-static boolean match_exclude PARAMS ((const char *));
-static void set_default_excludes PARAMS ((void));
-static long filter_symbols PARAMS ((bfd *, PTR, long, unsigned int));
-static void scan_all_symbols PARAMS ((bfd *));
-static void scan_open_obj_file PARAMS ((bfd *));
-static void scan_obj_file PARAMS ((const char *));
-static void dump_def_info PARAMS ((FILE *));
-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 gen_exp_file PARAMS ((void));
-static const char *xlate PARAMS ((const char *));
+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 scan_filtered_symbols
+ PARAMS ((bfd *, PTR, long, unsigned int));
+static void add_excludes
+ PARAMS ((const char *));
+static bfd_boolean match_exclude
+ PARAMS ((const char *));
+static void set_default_excludes
+ PARAMS ((void));
+static long filter_symbols
+ PARAMS ((bfd *, PTR, long, unsigned int));
+static void scan_all_symbols
+ PARAMS ((bfd *));
+static void scan_open_obj_file
+ PARAMS ((bfd *));
+static void scan_obj_file
+ PARAMS ((const char *));
+static void dump_def_info
+ PARAMS ((FILE *));
+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 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 *));
+static void dump_iat
+ PARAMS ((FILE *, export_type *));
#endif
-static char *make_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 void gen_lib_file PARAMS ((void));
-static int pfunc PARAMS ((const void *, const void *));
-static int nfunc PARAMS ((const void *, const void *));
-static void remove_null_names PARAMS ((export_type **));
-static void dtab PARAMS ((export_type **));
-static void process_duplicates PARAMS ((export_type **));
-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 void inform PARAMS ((const char *, ...));
+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 void gen_lib_file
+ PARAMS ((void));
+static int pfunc
+ PARAMS ((const void *, const void *));
+static int nfunc
+ PARAMS ((const void *, const void *));
+static void remove_null_names
+ PARAMS ((export_type **));
+static void dtab
+ PARAMS ((export_type **));
+static void process_duplicates
+ PARAMS ((export_type **));
+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 void inform
+ PARAMS ((const char *, ...));
+static char *
+dlltmp PARAMS ((char *buf, const char *fmt))
+{
+ if (!buf)
+ buf = malloc (strlen (tmp_prefix) + 17);
+ sprintf (buf, fmt, tmp_prefix);
+ return buf;
+}
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;
-#ifdef __STDC__
- va_start (args, message);
-#else
- va_start (args);
-#endif
-
report (message, args);
-
- va_end (args);
+
+ VA_CLOSE (args);
}
static const char *
static char **oav;
-void
+static void
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);
/* xgettext:c-format */
inform (_("Processing def file: %s"), name);
-
+
yyparse ();
inform (_("Processed def file"));
/**********************************************************************/
-/* 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 int d_nforwards = 0; /* Number of forwarded exports */
+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;
{
/* xgettext:c-format */
non_fatal (_("Syntax error in def file %s:%d"), def_file, linenumber);
-
+
return 0;
}
p->next = d_exports;
d_exports = p;
d_nfuncs++;
-
- if ((internal_name != NULL)
+
+ if ((internal_name != NULL)
&& (strchr (internal_name, '.') != NULL))
p->forward = ++d_nforwards;
else
{
/* xgettext:c-format */
inform (_("NAME: %s base: %x"), name, base);
-
+
if (d_is_dll)
non_fatal (_("Can't have LIBRARY and 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;
{
/* xgettext:c-format */
inform (_("LIBRARY: %s base: %x"), name, base);
-
+
if (d_is_exe)
non_fatal (_("Can't have LIBRARY and 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;
d_list = d;
}
-void
+static void
new_directive (dir)
char *dir;
{
else
application_name = "";
}
-
+
if (dllext != NULL)
{
buf = (char *) alloca (strlen (module) + strlen (dllext) + 2);
if (pid == -1)
{
inform (strerror (errno));
-
+
fatal (errmsg_fmt, errmsg_arg);
}
pid = pwait (pid, & wait_status, 0);
-
+
if (pid == -1)
{
/* xgettext:c-format */
/* Look for .drectve's */
s = bfd_get_section_by_name (abfd, DRECTVE_SECTION_NAME);
-
+
if (s == NULL)
return;
-
+
size = bfd_get_section_size_before_reloc (s);
buf = xmalloc (size);
bfd_get_section_contents (abfd, s, buf, 0, size);
-
+
/* xgettext:c-format */
inform (_("Sucking in info from %s section in %s"),
DRECTVE_SECTION_NAME, bfd_get_filename (abfd));
char * name;
char * c;
flagword flags = BSF_FUNCTION;
-
+
p += 8;
name = p;
while (p < e && *p != ',' && *p != ' ' && *p != '-')
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 != '-')
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. */
asymbol *sym;
const char *symbol_name;
- sym = bfd_minisymbol_to_symbol (abfd, false, from, store);
+ sym = bfd_minisymbol_to_symbol (abfd, FALSE, from, store);
if (sym == NULL)
bfd_fatal (bfd_get_filename (abfd));
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';
- /* 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);
}
}
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);
- /* 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;
/* See if STRING is on the list of symbols to exclude. */
-static boolean
+static bfd_boolean
match_exclude (string)
const char *string;
{
for (excl_item = excludes; excl_item; excl_item = excl_item->next)
if (strcmp (string, excl_item->string) == 0)
- return true;
- return false;
+ return TRUE;
+ return FALSE;
}
/* Add the default list of symbols to exclude. */
int keep = 0;
asymbol *sym;
- sym = bfd_minisymbol_to_symbol (abfd, false, (const PTR) from, store);
+ sym = bfd_minisymbol_to_symbol (abfd, FALSE, (const PTR) from, store);
if (sym == NULL)
bfd_fatal (bfd_get_filename (abfd));
|| (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)
return;
}
- symcount = bfd_read_minisymbols (abfd, false, &minisyms, &size);
+ symcount = bfd_read_minisymbols (abfd, FALSE, &minisyms, &size);
if (symcount < 0)
bfd_fatal (bfd_get_filename (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 */
inform (_("Done reading %s"), bfd_get_filename (abfd));
/* 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);
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);
}
}
-/* Generate the .exp file */
+/* Generate the .exp file. */
static int
sfunc (a, b)
{
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,
ASM_LONG,
(on_page * 2) + (on_page & 1) * 2 + 8,
ASM_C);
-
+
for (i = 0; i < on_page; i++)
{
long needed = need[i];
-
+
if (needed)
needed = ((needed - page_addr) | 0x3000) & 0xffff;
-
+
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);
export_type *exp;
inform (_("Adding exports to output file"));
-
+
fprintf (output_def, ";");
for (i = 0; oav[i]; i++)
fprintf (output_def, " %s", oav[i]);
char *quote = strchr (exp->name, '.') ? "\"" : "";
char *res = cplus_demangle (exp->internal_name, DMGL_ANSI | DMGL_PARAMS);
+ if (res)
+ {
+ fprintf (output_def,";\t%s\n", res);
+ free (res);
+ }
+
if (strcmp (exp->name, exp->internal_name) == 0)
- {
+ {
- fprintf (output_def, "\t%s%s%s @ %d%s%s ; %s\n",
+ fprintf (output_def, "\t%s%s%s @ %d%s%s\n",
quote,
exp->name,
quote,
exp->ordinal,
exp->noname ? " NONAME" : "",
- exp->data ? " DATA" : "",
- res ? res : "");
+ exp->data ? " DATA" : "");
}
- 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",
+ fprintf (output_def, "\t%s%s%s = %s%s%s @ %d%s%s\n",
quote,
exp->name,
quote,
quote1,
exp->ordinal,
exp->noname ? " NONAME" : "",
- exp->data ? " DATA" : "",
- res ? res : "");
+ exp->data ? " DATA" : "");
}
- if (res)
- free (res);
}
-
+
inform (_("Added exports to output file"));
}
}
}
-/* Assemble the specified file. */
+/* Assemble the specified file. */
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);
/* xgettext:c-format */
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);
-
+
/* 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 (exp->forward == 0)
- 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->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);
if (!exp->noname || show_allnames)
{
fprintf (f, "n%d: %s \"%s\"\n",
- exp->ordinal, ASM_TEXT, exp->name);
+ 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);
fprintf (f, "\t%s\t\"%s\"\n", ASM_TEXT, dl->text);
}
}
-
+
if (d_list)
{
fprintf (f, "\t.section .rdata\n");
{
char *p;
int l;
-
+
/* We don't output as ascii because there can
be quote characters in the string. */
l = 0;
}
}
- /* 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;
fclose (f);
- /* assemble the file */
+ /* Assemble the file. */
assemble_file (TMP_ASM, exp_name);
if (dontdeltemps == 0)
unlink (TMP_ASM);
-
+
inform (_("Generated exports file"));
}
xlate (name)
const char *name;
{
- if (add_underscore)
+ int lead_at = (*name == '@');
+
+ if (add_underscore && !lead_at)
{
char *copy = xmalloc (strlen (name) + 2);
+
copy[0] = '_';
strcpy (copy + 1, name);
name = copy;
if (killat)
{
char *p;
+
+ name += lead_at;
p = strchr (name, '@');
if (p)
*p = 0;
asymbol *sym;
asymbol **sympp;
int size;
- unsigned char *data;
+ unsigned char *data;
} sinfo;
#ifndef DLLTOOL_PPC
#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
#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
.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:
stw r2,4(r1)
mtctr r12
lwz r2,4(r11)
- bctr
-*/
+ bctr */
static char *
make_label (prefix, name)
{
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;
}
+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;
char * outname = xmalloc (10);
int oidx = 0;
-
+
sprintf (outname, "%s%05d.o", TMP_STUB, i);
-
+
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);
-
+
bfd_set_format (abfd, bfd_object);
bfd_set_arch_mach (abfd, HOW_BFD_ARCH, 0);
if (machine == MARM_INTERWORK || machine == MTHUMB)
bfd_set_private_flags (abfd, F_INTERWORK);
#endif
-
+
applicable = bfd_applicable_section_flags (abfd);
-
- /* First make symbols for the sections */
+
+ /* First make symbols for the sections. */
for (i = 0; i < NSECS; i++)
{
sinfo *si = secdata + i;
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
- points to the .toc */
+ points to the .toc. */
#ifdef DLLTOOL_PPC
if (machine == MPPC)
exp_label->section = secdata[RDATA].sec;
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);
- 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;
iname_lab->flags = 0;
iname_lab->value = 0;
-
iname_pp = ptrs + oidx;
if (create_compat_implib)
ptrs[oidx++] = iname;
ptrs[oidx++] = iname_lab;
#ifdef DLLTOOL_PPC
- /* The symbol refering to the code (.text) */
+ /* The symbol refering to the code (.text). */
{
asymbol *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");
ptrs[oidx++] = toc_symbol;
}
#endif
-
+
ptrs[oidx] = 0;
for (i = 0; i < NSECS; i++)
/* add the reloc into idata$5 */
rel = xmalloc (sizeof (arelent));
-
+
rpp = xmalloc (sizeof (arelent *) * 2);
rpp[0] = rel;
rpp[1] = 0;
-
+
rel->address = HOW_JTAB_ROFF;
rel->addend = 0;
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;
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);
#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 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;
- /* 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;
- 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));
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;
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;
- /* 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);
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);
{
bfd_vma vma = 0;
- /* Size up all the sections */
+ /* Size up all the sections. */
for (i = 0; i < NSECS; i++)
{
sinfo *si = secdata + i;
/* vma += si->size;*/
}
}
- /* Write them out */
+ /* Write them out. */
for (i = 0; i < NSECS; i++)
{
sinfo *si = secdata + i;
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, "\t%s\t0\n", ASM_LONG);
fprintf (f, "fthunk:\n");
}
-
+
if (!no_idata4)
{
fprintf (f, "\t.section\t.idata$4\n");
fprintf (f, "\t.section .idata$4\n");
fprintf (f, "hname:\n");
}
-
+
fclose (f);
assemble_file (TMP_HEAD_S, TMP_HEAD_O);
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_idata5)
{
fprintf (f, "\t.section .idata$5\n");
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);
#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");
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
/* xgettext:c-format */
inform (_("Creating library file: %s"), imp_name);
-
+
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;
-
+
for (i = 0; (exp = d_exports_lexically[i]); i++)
{
bfd *n = make_one_lib_file (exp, i);
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");
-
+
if (! bfd_close (outarch))
bfd_fatal (imp_name);
head = n;
}
- /* Delete all the temp files */
-
+ /* Delete all the temp files. */
if (dontdeltemps == 0)
{
unlink (TMP_HEAD_O);
non_fatal (_("cannot delete %s: %s"), name, strerror (errno));
}
}
-
+
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;
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)
{
int src;
int dst;
+
for (dst = src = 0; src < d_nfuncs; src++)
{
if (ptr[src])
{
int more = 1;
int i;
+
while (more)
{
more = 0;
- /* Remove duplicates */
+ /* Remove duplicates. */
qsort (d_export_vec, d_nfuncs, sizeof (export_type *), nfunc);
dtab (d_export_vec);
export_type *b = d_export_vec[i + 1];
more = 1;
-
+
/* xgettext:c-format */
inform (_("Warning, ignoring duplicate EXPORT %s %d,%d"),
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);
- /* Merge attributes */
+ /* Merge attributes. */
b->ordinal = a->ordinal > 0 ? a->ordinal : b->ordinal;
b->constant |= a->constant;
b->noname |= a->noname;
}
- /* Count the names */
+ /* Count the names. */
for (i = 0; i < d_nfuncs; i++)
{
if (!d_export_vec[i]->noname)
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);
- /* 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;
+
if (lowest == -1 || d_export_vec[i]->ordinal < lowest)
- {
- lowest = d_export_vec[i]->ordinal;
- }
+ lowest = d_export_vec[i]->ordinal;
}
}
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;
- /* 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)
{
goto done;
}
- /* Then try before the range. */
+ /* Then try before the range. */
for (j = lowest; j >0; j--)
if (ptr[j] == 0)
{
free (ptr);
- /* And resort */
-
+ /* And resort. */
qsort (d_export_vec, d_nfuncs, sizeof (export_type *), pfunc);
/* Work out the lowest and highest ordinal numbers. */
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 **) xmalloc (sizeof (export_type *) * d_nfuncs);
inform (_("Processing definitions"));
-
+
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);
- /* 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 = 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[i] = exp;
- }
+ d_exports_lexically[i] = exp;
+
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++)
- {
- 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"));
}
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"));
{"as-flags", required_argument, NULL, 'f'},
{"mcore-elf", required_argument, NULL, 'M'},
{"compat-implib", no_argument, NULL, 'C'},
+ {"temp-prefix", required_argument, NULL, 't'},
{NULL,0,NULL,0}
};
+int main PARAMS ((int, char **));
+
int
main (ac, av)
int ac;
#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,
-#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
- "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)
switch (c)
{
case OPTION_EXPORT_ALL_SYMS:
- export_all_symbols = true;
+ export_all_symbols = TRUE;
break;
case OPTION_NO_EXPORT_ALL_SYMS:
- export_all_symbols = false;
+ export_all_symbols = FALSE;
break;
case OPTION_EXCLUDE_SYMS:
add_excludes (optarg);
break;
case OPTION_NO_DEFAULT_EXCLUDES:
- do_default_excludes = false;
+ do_default_excludes = FALSE;
break;
case 'x':
no_idata4 = 1;
case 'S':
as_name = optarg;
break;
+ case 't':
+ tmp_prefix = optarg;
+ break;
case 'f':
as_flags = optarg;
break;
case 'e':
exp_name = optarg;
break;
+ case 'H':
case 'h':
usage (stdout, 0);
break;
break;
case 'b':
base_file = fopen (optarg, FOPEN_RB);
-
+
if (!base_file)
/* xgettext:c-format */
fatal (_("Unable to open base-file: %s"), optarg);
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;
-
+ do_default_excludes = FALSE;
+
if (do_default_excludes)
set_default_excludes ();
if (exp_name)
gen_exp_file ();
-
+
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++)
{
- if (!isalpha ((unsigned char) *p) && !isdigit ((unsigned char) *p))
+ if (!ISALNUM (*p))
*p = '_';
}
head_label = make_label("_head_", imp_name_lab);
gen_lib_file ();
}
-
+
if (output_def)
gen_def_file ();
-
+
#ifdef DLLTOOL_MCORE_ELF
if (mcore_elf_out_file)
mcore_elf_gen_out_file ();
#endif
-
+
return 0;
}
struct stat s;
char *cmd;
- cmd = xmalloc (strlen (prefix)
- + strlen (prog_name)
+ cmd = xmalloc (strlen (prefix)
+ + strlen (prog_name)
#ifdef HAVE_EXECUTABLE_SUFFIX
- + strlen (EXECUTABLE_SUFFIX)
+ + strlen (EXECUTABLE_SUFFIX)
#endif
+ 10);
strcpy (cmd, prefix);
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)
- {
+ {
/* xgettext:c-format */
inform (_("Tried file: %s"), cmd);
free (cmd);
/* 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,
- 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
-
+
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. */
ptr = & fnames;
ds = dyn_string_new (100);
- dyn_string_append (ds, "-r ");
+ dyn_string_append_cstr (ds, "-r ");
if (mcore_elf_linker_flags != NULL)
- dyn_string_append (ds, mcore_elf_linker_flags);
-
+ dyn_string_append_cstr (ds, mcore_elf_linker_flags);
+
while (ptr->next != NULL)
{
- dyn_string_append (ds, ptr->filename);
- dyn_string_append (ds, " ");
+ dyn_string_append_cstr (ds, ptr->filename);
+ dyn_string_append_cstr (ds, " ");
ptr = ptr->next;
}
- dyn_string_append (ds, "-o ");
- dyn_string_append (ds, MCORE_ELF_TMP_OBJ);
+ dyn_string_append_cstr (ds, "-o ");
+ dyn_string_append_cstr (ds, MCORE_ELF_TMP_OBJ);
if (mcore_elf_linker == NULL)
mcore_elf_linker = deduce_name ("ld");
-
+
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);
-
- dyn_string_append (ds, " -e ");
- dyn_string_append (ds, MCORE_ELF_TMP_EXP);
- dyn_string_append (ds, " -l ");
- dyn_string_append (ds, MCORE_ELF_TMP_LIB);
- dyn_string_append (ds, " " );
- dyn_string_append (ds, MCORE_ELF_TMP_OBJ);
+ dyn_string_append_cstr (ds, "-S ");
+ dyn_string_append_cstr (ds, as_name);
+
+ dyn_string_append_cstr (ds, " -e ");
+ dyn_string_append_cstr (ds, MCORE_ELF_TMP_EXP);
+ dyn_string_append_cstr (ds, " -l ");
+ dyn_string_append_cstr (ds, MCORE_ELF_TMP_LIB);
+ dyn_string_append_cstr (ds, " " );
+ dyn_string_append_cstr (ds, MCORE_ELF_TMP_OBJ);
if (verbose)
- dyn_string_append (ds, " -v");
-
+ dyn_string_append_cstr (ds, " -v");
+
if (dontdeltemps)
{
- dyn_string_append (ds, " -n");
-
+ dyn_string_append_cstr (ds, " -n");
+
if (dontdeltemps > 1)
- dyn_string_append (ds, " -n");
+ dyn_string_append_cstr (ds, " -n");
}
/* XXX - FIME: ought to check/copy other command line options as well. */
-
run (program_name, ds->s);
dyn_string_delete (ds);
/* Step four. Feed the .exp and object files to ld -shared to create the dll. */
ds = dyn_string_new (100);
- dyn_string_append (ds, "-shared ");
+ dyn_string_append_cstr (ds, "-shared ");
if (mcore_elf_linker_flags)
- dyn_string_append (ds, mcore_elf_linker_flags);
-
- dyn_string_append (ds, " ");
- dyn_string_append (ds, MCORE_ELF_TMP_EXP);
- dyn_string_append (ds, " ");
- dyn_string_append (ds, MCORE_ELF_TMP_OBJ);
- dyn_string_append (ds, " -o ");
- dyn_string_append (ds, mcore_elf_out_file);
+ dyn_string_append_cstr (ds, mcore_elf_linker_flags);
+
+ dyn_string_append_cstr (ds, " ");
+ dyn_string_append_cstr (ds, MCORE_ELF_TMP_EXP);
+ dyn_string_append_cstr (ds, " ");
+ dyn_string_append_cstr (ds, MCORE_ELF_TMP_OBJ);
+ dyn_string_append_cstr (ds, " -o ");
+ dyn_string_append_cstr (ds, mcore_elf_out_file);
run (mcore_elf_linker, ds->s);
projects / binutils-gdb.git / blobdiff