Declares name1 as an exported symbol from the
DLL, with optional ordinal number <integer>
- IMPORTS ( [ <name> = ] <name> . <name> ) *
- Ignored for compatibility
+ IMPORTS ( ( <internal-name> = <module-name> . <integer> )
+ | ( [ <internal-name> = ] <module-name> . <external-name> )) *
+ Declares that <external-name> or the exported function whoes ordinal number
+ is <integer> is to be imported from the file <module-name>. If
+ <internal-name> is specified then this is the name that the imported
+ function will be refered to in the body of the DLL.
DESCRIPTION <string>
Puts <string> into output .exp file in the .rdata section
Example:
- file1.c:
+ file1.c:
asm (".section .drectve");
asm (".ascii \"-export:adef\"");
- adef(char *s)
+ void adef (char * s)
{
- printf("hello from the dll %s\n",s);
+ printf ("hello from the dll %s\n", s);
}
- bdef(char *s)
+ void bdef (char * s)
{
- printf("hello from the dll and the other entry point %s\n",s);
+ printf ("hello from the dll and the other entry point %s\n", s);
}
- file2.c:
+ file2.c:
asm (".section .drectve");
asm (".ascii \"-export:cdef\"");
asm (".ascii \"-export:ddef\"");
- cdef(char *s)
+
+ void cdef (char * s)
{
- printf("hello from the dll %s\n",s);
+ printf ("hello from the dll %s\n", s);
}
- ddef(char *s)
+ void ddef (char * s)
{
- printf("hello from the dll and the other entry point %s\n",s);
+ printf ("hello from the dll and the other entry point %s\n", s);
}
printf()
{
- return 9;
+ return 9;
}
- main.c
+ main.c
- main()
+ void main()
{
- cdef();
+ cdef();
}
- thedll.def
+ thedll.def
LIBRARY thedll
HEAPSIZE 0x40000, 0x2000
EXPORTS bdef @ 20
- cdef @ 30 NONAME
+ cdef @ 30 NONAME
SECTIONS donkey READ WRITE
aardvark EXECUTE
-
- # compile up the parts of the dll
+ # compile up the parts of the dll
gcc -c file1.c
gcc -c file2.c
- # put them in a library (you don't have to, you
- # could name all the .os on the dlltool line)
+ # put them in a library (you don't have to, you
+ # could name all the .os on the dlltool line)
ar qcv thedll.in file1.o file2.o
ranlib thedll.in
- # run this tool over the library and the def file
+ # run this tool over the library and the def file
./dlltool --def thedll.def --output-exp thedll.o --output-lib thedll.a
- # build the dll with the library with file1.o, file2.o and the export table
+ # build the dll with the library with file1.o, file2.o and the export table
ld -o thedll.dll thedll.o thedll.in
- # build the mainline
+ # build the mainline
gcc -c themain.c
- # link the executable with the import library
+ # link the executable with the import library
ld -e main -Tthemain.ld -o themain.exe themain.o thedll.a
*/
.idata$2 = Import Directory Table
= array of IMAGE_IMPORT_DESCRIPTOR's.
- DWORD Characteristics; - pointer to .idata$4
+ DWORD Import Lookup Table; - pointer to .idata$4
DWORD TimeDateStamp; - currently always 0
DWORD ForwarderChain; - currently always 0
DWORD Name; - pointer to dll's name
#include <ctype.h>
#include <time.h>
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+#ifdef DLLTOOL_ARM
+#include "coff/arm.h"
+#include "coff/internal.h"
+#endif
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
static iheadtype *import_list = NULL;
static char *as_name = "as";
+static char * as_flags = "";
static int no_idata4;
static int no_idata5;
static int add_underscore = 0;
static int dontdeltemps = 0;
+#ifdef DLLTOOL_ARM
+static int interwork = 0;
+#endif
+
+/* 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;
+
+/* True if we should exclude the symbols in DEFAULT_EXCLUDES when
+ exporting all symbols. */
+static boolean do_default_excludes;
+
+/* Default symbols to exclude when exporting all the symbols. */
+static const char *default_excludes = "DllMain@12,DllEntryPoint@0,impure_ptr";
+
static char *def_file;
-static char *program_name;
+extern char * program_name;
static int machine;
static int killat;
#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"
+
/* This bit of assemly does jmp * ....
s set how_jtab_roff to mark where the 32bit abs branch should go */
static const unsigned char i386_jtab[] =
0, 0, 0, 0
};
+static const unsigned char thumb_jtab[] =
+{
+ 0xc0, 0xb4,
+ 0x02, 0x4e,
+ 0x36, 0x68,
+ 0x01, 0x96,
+ 0x40, 0xbd,
+ 0xc0, 0x46,
+ 0, 0, 0, 0
+};
+
/* 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 */
static bfd_vma ppc_glue_insn = 0x80410004;
#endif
-static char outfile[PATHMAX];
+/* The outfile array must be big enough to contain a fully
+ qualified path name, plus an arbitary series of command
+ line switches. We hope that PATH_MAX times two will be
+ enough. */
+static char outfile [PATHMAX * 2];
struct mac
{
int how_jtab_roff; /* offset into it for the ind 32 reloc into idata 5 */
};
-static const struct mac mtable[] =
+static const struct mac
+mtable[] =
{
{
#define MARM 0
"arm", ".byte", ".short", ".long", ".asciz", "@",
"ldr\tip,[pc]\n\tldr\tpc,[ip]\n\t.long",
".global", ".space", ".align\t2",".align\t4","pe-arm-little", bfd_arch_arm,
- arm_jtab, sizeof(arm_jtab),8
+ arm_jtab, sizeof (arm_jtab), 8
}
,
{
#define M386 1
"i386", ".byte", ".short", ".long", ".asciz", "#", "jmp *", ".global", ".space", ".align\t2",".align\t4","pe-i386",bfd_arch_i386,
- i386_jtab,sizeof(i386_jtab),2,
+ i386_jtab, sizeof (i386_jtab), 2
}
,
{
#define MPPC 2
"ppc", ".byte", ".short", ".long", ".asciz", "#", "jmp *", ".global", ".space", ".align\t2",".align\t4","pe-powerpcle",bfd_arch_powerpc,
- ppc_jtab,sizeof(ppc_jtab),0,
+ ppc_jtab, sizeof (ppc_jtab), 0
+ }
+ ,
+ {
+#define MTHUMB 3
+ "thumb", ".byte", ".short", ".long", ".asciz", "@",
+ "push\t{r6, r7}\n\tldr\tr6, [pc, #8]\n\tldr\tr6, [r6]\n\tstr\tr6, [sp, #4]\n\tpop\t{r6, pc}\n\tnop",
+ ".global", ".space", ".align\t2",".align\t4","pe-arm-little", bfd_arch_arm,
+ thumb_jtab, sizeof (thumb_jtab), 12
}
,
{ 0}
}
export_type;
+/* A list of symbols which we should not export. */
+
+struct string_list
+{
+ struct string_list *next;
+ char *string;
+};
+
+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 basenames PARAMS ((bfd *));
+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 void generate_idata_ofile PARAMS ((FILE *));
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 bfd *make_one_lib_file PARAMS ((export_type *, int));
static bfd *make_head PARAMS ((void));
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 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
+#ifdef __STDC__
+inform (const char * message, ...)
+#else
+inform (message, va_alist)
+ const char * message;
+ va_dcl
+#endif
+{
+ va_list args;
+
+ if (!verbose)
+ return;
+
+#ifdef __STDC__
+ va_start (args, message);
+#else
+ va_start (args);
+#endif
+
+ 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);
+}
static const char *
rvaafter (machine)
switch (machine)
{
case MARM:
- return "";
case M386:
- return "";
case MPPC:
- return "";
+ case MTHUMB:
+ break;
+ default:
+ /* xgettext:c-format */
+ fatal (_("Internal error: Unknown machine type: %d\n"), machine);
+ break;
}
return "";
}
switch (machine)
{
case MARM:
- return ".rva\t";
case M386:
- return ".rva\t";
case MPPC:
+ case MTHUMB:
return ".rva\t";
+ default:
+ /* xgettext:c-format */
+ fatal (_("Internal error: Unknown machine type: %d\n"), machine);
+ break;
}
return "";
}
switch (machine)
{
case MARM:
- return "";
+ case MPPC:
+ case MTHUMB:
+ break;
case M386:
return "_";
- case MPPC:
- return "";
+ default:
+ /* xgettext:c-format */
+ fatal (_("Internal error: Unknown machine type: %d\n"), machine);
+ break;
}
return "";
}
const char *name;
{
FILE *f = fopen (name, FOPEN_RT);
+
if (!f)
- {
- fprintf (stderr, _("%s: Can't open def file %s\n"), program_name, name);
- exit (1);
- }
+ /* xgettext:c-format */
+ fatal (_("Can't open def file: %s"), name);
yyin = f;
+ /* xgettext:c-format */
+ inform (_("Processing def file: %s"), name);
+
yyparse ();
+
+ inform (_("Processed def file"));
}
/**********************************************************************/
yyerror (err)
const char *err;
{
- fprintf (stderr, _("%s: Syntax error in def file %s:%d\n"),
- program_name, def_file, linenumber);
+ /* xgettext:c-format */
+ warn (_("Syntax error in def file %s:%d\n"), def_file, linenumber);
+
return 0;
}
const char *name;
int base;
{
- if (verbose)
- fprintf (stderr, _("%s NAME %s base %x\n"), program_name, name, base);
+ /* xgettext:c-format */
+ inform (_("NAME: %s base: %x"), name, base);
+
if (d_is_dll)
- {
- fprintf (stderr, _("Can't have LIBRARY and NAME\n"));
- }
+ warn (_("Can't have LIBRARY and NAME\n"));
+
d_name = name;
d_is_exe = 1;
}
const char *name;
int base;
{
- if (verbose)
- printf (_("%s: LIBRARY %s base %x\n"), program_name, name, base);
+ /* xgettext:c-format */
+ inform (_("LIBRARY: %s base: %x"), name, base);
+
if (d_is_exe)
- {
- fprintf (stderr, _("%s: Can't have LIBRARY and NAME\n"), program_name);
- }
+ warn (_("%s: Can't have LIBRARY and NAME\n"), program_name);
+
d_name = name;
d_is_dll = 1;
}
else
application_name = "";
}
+
if (dllext != NULL)
{
buf = (char *) alloca (strlen (module) + strlen (dllext) + 2);
char *errmsg_fmt, *errmsg_arg;
char *temp_base = choose_temp_base ();
- if (verbose)
- fprintf (stderr, "%s %s\n", what, args);
+ inform ("run: %s %s\n", what, args);
/* Count the args */
i = 0;
s = args;
while (1)
{
+ while (*s == ' ')
+ ++s;
argv[i++] = s;
while (*s != ' ' && *s != 0)
s++;
if (pid == -1)
{
- int errno_val = errno;
-
- fprintf (stderr, "%s: ", program_name);
- fprintf (stderr, errmsg_fmt, errmsg_arg);
- fprintf (stderr, ": %s\n", strerror (errno_val));
- exit (1);
+ inform (strerror (errno));
+
+ fatal (errmsg_fmt, errmsg_arg);
}
- pid = pwait (pid, &wait_status, 0);
+ pid = pwait (pid, & wait_status, 0);
+
if (pid == -1)
{
- fprintf (stderr, _("%s: wait: %s\n"), program_name, strerror (errno));
- exit (1);
+ /* xgettext:c-format */
+ fatal (_("wait: %s"), strerror (errno));
}
else if (WIFSIGNALED (wait_status))
{
- fprintf (stderr, _("%s: subprocess got fatal signal %d\n"),
- program_name, WTERMSIG (wait_status));
- exit (1);
+ /* xgettext:c-format */
+ fatal (_("subprocess got fatal signal %d"), WTERMSIG (wait_status));
}
else if (WIFEXITED (wait_status))
{
if (WEXITSTATUS (wait_status) != 0)
- fprintf (stderr, _("%s: %s exited with status %d\n"),
- program_name, what, WEXITSTATUS (wait_status));
+ /* xgettext:c-format */
+ warn (_("%s exited with status %d\n"),
+ what, WEXITSTATUS (wait_status));
}
else
abort ();
}
-/* read in and block out the base relocations */
+/* Look for a list of symbols to export in the .drectve section of
+ ABFD. Pass each one to def_exports. */
+
static void
-basenames (abfd)
+scan_drectve_symbols (abfd)
bfd *abfd;
{
+ asection * s;
+ int size;
+ char * buf;
+ char * p;
+ char * e;
+
+ /* Look for .drectve's */
+ s = bfd_get_section_by_name (abfd, ".drectve");
+
+ 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 .drective section in %s\n"),
+ bfd_get_filename (abfd));
+
+ /* Search for -export: strings */
+ p = buf;
+ e = buf + size;
+ while (p < e)
+ {
+ if (p[0] == '-'
+ && strncmp (p, "-export:", 8) == 0)
+ {
+ char * name;
+ char * c;
+
+ p += 8;
+ name = p;
+ while (p < e && *p != ' ' && *p != '-')
+ p++;
+ c = xmalloc (p - name + 1);
+ memcpy (c, name, p - name);
+ c[p - name] = 0;
+ /* FIXME: The 5th arg is for the `constant' field.
+ What should it be? Not that it matters since it's not
+ currently useful. */
+ def_exports (c, 0, -1, 0, 0, 0);
+ }
+ else
+ p++;
+ }
+ free (buf);
}
+/* Look through the symbols in MINISYMS, and add each one to list of
+ symbols to export. */
+
static void
-scan_open_obj_file (abfd)
+scan_filtered_symbols (abfd, minisyms, symcount, size)
bfd *abfd;
+ PTR minisyms;
+ long symcount;
+ unsigned int size;
{
- /* Look for .drectve's */
- asection *s = bfd_get_section_by_name (abfd, ".drectve");
- if (s)
+ asymbol *store;
+ bfd_byte *from, *fromend;
+
+ store = bfd_make_empty_symbol (abfd);
+ if (store == NULL)
+ bfd_fatal (bfd_get_filename (abfd));
+
+ from = (bfd_byte *) minisyms;
+ fromend = from + symcount * size;
+ for (; from < fromend; from += size)
{
- int size = bfd_get_section_size_before_reloc (s);
- char *buf = xmalloc (size);
- char *p;
- char *e;
- bfd_get_section_contents (abfd, s, buf, 0, size);
- if (verbose)
- fprintf (stderr, _("%s: Sucking in info from %s\n"),
- program_name,
- bfd_get_filename (abfd));
-
- /* Search for -export: strings */
- p = buf;
- e = buf + size;
- while (p < e)
+ asymbol *sym;
+ const char *symbol_name;
+
+ sym = bfd_minisymbol_to_symbol (abfd, false, from, store);
+ if (sym == NULL)
+ bfd_fatal (bfd_get_filename (abfd));
+
+ symbol_name = bfd_asymbol_name (sym);
+ if (bfd_get_symbol_leading_char (abfd) == symbol_name[0])
+ ++symbol_name;
+
+ def_exports (xstrdup (symbol_name), 0, -1, 0, 0, 0);
+ }
+}
+
+/* Add a list of symbols to exclude. */
+
+static void
+add_excludes (new_excludes)
+ const char *new_excludes;
+{
+ char *local_copy;
+ char *exclude_string;
+
+ local_copy = xstrdup (new_excludes);
+
+ exclude_string = strtok (local_copy, ",:");
+ 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);
+ new_exclude->next = excludes;
+ excludes = new_exclude;
+
+ /* xgettext:c-format */
+ inform (_("Excluding symbol: %s\n"), exclude_string);
+ }
+
+ free (local_copy);
+}
+
+/* See if STRING is on the list of symbols to exclude. */
+
+static boolean
+match_exclude (string)
+ const char *string;
+{
+ struct string_list *excl_item;
+
+ for (excl_item = excludes; excl_item; excl_item = excl_item->next)
+ if (strcmp (string, excl_item->string) == 0)
+ return true;
+ return false;
+}
+
+/* Add the default list of symbols to exclude. */
+
+static void
+set_default_excludes (void)
+{
+ add_excludes (default_excludes);
+}
+
+/* Choose which symbols to export. */
+
+static long
+filter_symbols (abfd, minisyms, symcount, size)
+ bfd *abfd;
+ PTR minisyms;
+ long symcount;
+ unsigned int size;
+{
+ bfd_byte *from, *fromend, *to;
+ asymbol *store;
+
+ store = bfd_make_empty_symbol (abfd);
+ if (store == NULL)
+ bfd_fatal (bfd_get_filename (abfd));
+
+ from = (bfd_byte *) minisyms;
+ fromend = from + symcount * size;
+ to = (bfd_byte *) minisyms;
+
+ for (; from < fromend; from += size)
+ {
+ int keep = 0;
+ asymbol *sym;
+
+ sym = bfd_minisymbol_to_symbol (abfd, false, (const PTR) from, store);
+ if (sym == NULL)
+ bfd_fatal (bfd_get_filename (abfd));
+
+ /* Check for external and defined only symbols. */
+ keep = (((sym->flags & BSF_GLOBAL) != 0
+ || (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)
{
- if (p[0] == '-'
- && strncmp (p, "-export:", 8) == 0)
- {
- char *name;
- char *c;
- p += 8;
- name = p;
- while (p < e && *p != ' ' && *p != '-')
- p++;
- c = xmalloc (p - name + 1);
- memcpy (c, name, p - name);
- c[p - name] = 0;
- /* FIXME: The 5th arg is for the `constant' field.
- What should it be? Not that it matters since it's not
- currently useful. */
- def_exports (c, 0, -1, 0, 0, 0);
- }
- else
- p++;
+ memcpy (to, from, size);
+ to += size;
}
- free (buf);
}
- basenames (abfd);
+ return (to - (bfd_byte *) minisyms) / size;
+}
+
+/* Export all symbols in ABFD, except for ones we were told not to
+ export. */
+
+static void
+scan_all_symbols (abfd)
+ bfd *abfd;
+{
+ long symcount;
+ PTR minisyms;
+ unsigned int size;
+
+ /* Ignore bfds with an import descriptor table. We assume that any
+ such BFD contains symbols which are exported from another DLL,
+ and we don't want to reexport them from here. */
+ if (bfd_get_section_by_name (abfd, ".idata$4"))
+ return;
+
+ if (! (bfd_get_file_flags (abfd) & HAS_SYMS))
+ {
+ /* xgettext:c-format */
+ warn (_("%s: no symbols\n"), bfd_get_filename (abfd));
+ return;
+ }
+
+ symcount = bfd_read_minisymbols (abfd, false, &minisyms, &size);
+ if (symcount < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+
+ if (symcount == 0)
+ {
+ /* xgettext:c-format */
+ warn (_("%s: no symbols\n"), bfd_get_filename (abfd));
+ return;
+ }
+
+ /* Discard the symbols we don't want to export. It's OK to do this
+ in place; we'll free the storage anyway. */
+
+ symcount = filter_symbols (abfd, minisyms, symcount, size);
+ scan_filtered_symbols (abfd, minisyms, symcount, size);
+
+ free (minisyms);
+}
+
+/* Look at the object file to decide which symbols to export. */
+
+static void
+scan_open_obj_file (abfd)
+ bfd *abfd;
+{
+ if (export_all_symbols)
+ scan_all_symbols (abfd);
+ else
+ scan_drectve_symbols (abfd);
+
+ /* FIXME: we ought to read in and block out the base relocations */
- if (verbose)
- fprintf (stderr, _("%s: Done readin\n"),
- program_name);
+ /* xgettext:c-format */
+ inform (_("%s: Done reading %s\n"), bfd_get_filename (abfd));
}
static void
scan_obj_file (filename)
const char *filename;
{
- bfd *f = bfd_openr (filename, 0);
+ bfd * f = bfd_openr (filename, 0);
if (!f)
- {
- fprintf (stderr, _("%s: Unable to open object file %s\n"),
- program_name,
- filename);
- exit (1);
- }
+ /* xgettext:c-format */
+ fatal (_("Unable to open 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);
int i;
export_type *exp;
+ inform (_("Adding exports to output file"));
+
fprintf (output_def, ";");
for (i = 0; oav[i]; i++)
fprintf (output_def, " %s", oav[i]);
for (i = 0, exp = d_exports; exp; i++, exp = exp->next)
{
char *quote = strchr (exp->name, '.') ? "\"" : "";
+ char *res = cplus_demangle (exp->internal_name, DMGL_ANSI | DMGL_PARAMS);
+
fprintf (output_def, "\t%s%s%s @ %d%s%s ; %s\n",
quote,
exp->name,
exp->ordinal,
exp->noname ? " NONAME" : "",
exp->data ? " DATA" : "",
- cplus_demangle (exp->internal_name, DMGL_ANSI | DMGL_PARAMS));
+ res ? res : "");
+ if (res)
+ free (res);
}
+
+ inform (_("Added exports to output file"));
}
/* generate_idata_ofile generates the portable assembly source code
export_type *exp;
dlist_type *dl;
- sprintf (outfile, "t%s", exp_name);
-
- if (verbose)
- fprintf (stderr, _("%s: Generate exp file %s\n"),
- program_name, exp_name);
-
- f = fopen (outfile, FOPEN_WT);
+ /* xgettext:c-format */
+ inform (_("Generating export file: %s\n"), exp_name);
+
+ f = fopen (TMP_ASM, FOPEN_WT);
if (!f)
- {
- fprintf (stderr, _("%s: Unable to open output file %s\n"), program_name, outfile);
- exit (1);
- }
- if (verbose)
- {
- fprintf (stderr, _("%s: Opened file %s\n"),
- program_name, outfile);
- }
+ /* 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");
for (i = 0; (exp = d_exports_lexically[i]); i++)
{
if (!exp->noname || show_allnames)
- fprintf (f, "\t%sn%d%s\n", ASM_RVA_BEFORE, exp->ordinal, ASM_RVA_AFTER);
+ fprintf (f, "\t%sn%d%s\n",
+ ASM_RVA_BEFORE, exp->ordinal, ASM_RVA_AFTER);
}
fprintf (f,"%s Export Oridinal Table\n", ASM_C);
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, exp->name);
if (a_list)
{
fclose (f);
/* assemble the file */
- sprintf (outfile, "-o %s t%s", exp_name, exp_name);
+ sprintf (outfile, "%s -o %s %s", as_flags, exp_name, TMP_ASM);
+
+#ifdef DLLTOOL_ARM
+ if (interwork)
+ strcat (outfile, " -mthumb-interwork");
+#endif
+
run (as_name, outfile);
+
if (dontdeltemps == 0)
- {
- sprintf (outfile, "t%s", exp_name);
- unlink (outfile);
- }
+ unlink (TMP_ASM);
+
+ inform (_("Generated exports file"));
}
static const char *
/**********************************************************************/
+#if 0
+
static void
dump_iat (f, exp)
FILE *f;
}
}
+#endif
+
typedef struct
{
int id;
export_type *exp;
int i;
{
- if (0)
+#if 0
{
FILE *f;
char *prefix="d";
fclose (f);
+ sprintf (outfile, "%s -o %ss%d.o %ss%d.s",
+ as_flags, prefix, i, prefix, i);
- sprintf (outfile, "-o %ss%d.o %ss%d.s", prefix, i, prefix, i);
-
+#ifdef DLLTOOL_ARM
+ if (interwork)
+ strcat (outfile, " -mthumb-interwork");
+#endif
+
run (as_name, outfile);
-
}
- else
+#else /* if 0 */
{
-
- bfd *abfd;
-
- asymbol *exp_label;
- asymbol *iname, *iname2;
- asymbol *iname_lab;
- asymbol **iname_lab_pp;
- asymbol **iname_pp;
-
- /* Extra Symbols for PPC */
+ bfd * abfd;
+ asymbol * exp_label;
+ asymbol * iname;
+ asymbol * iname2;
+ asymbol * iname_lab;
+ asymbol ** iname_lab_pp;
+ asymbol ** iname_pp;
#ifdef DLLTOOL_PPC
-#define EXTRA 2
-#else
-#define EXTRA 0
+ asymbol ** fn_pp;
+ asymbol ** toc_pp;
+#define EXTRA 2
#endif
-
-#ifdef DLLTOOL_PPC
- asymbol **fn_pp;
- asymbol **toc_pp;
+#ifndef EXTRA
+#define EXTRA 0
#endif
+ asymbol * ptrs[NSECS + 4 + EXTRA + 1];
- asymbol *ptrs[NSECS + 4 + EXTRA + 1];
+ char * outname = xmalloc (10);
+ int oidx = 0;
- char *outname = xmalloc (10);
- int oidx = 0;
- sprintf (outname, "ds%d.o", i);
+
+ sprintf (outname, "%s%d.o", TMP_STUB, i);
+
abfd = bfd_openw (outname, HOW_BFD_TARGET);
+
if (!abfd)
- {
- fprintf (stderr, _("%s: bfd_open failed open output file %s\n"),
- program_name, outname);
- exit (1);
- }
+ /* 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);
-
+#ifdef DLLTOOL_ARM
+ if (interwork)
+ bfd_set_private_flags (abfd, F_INTERWORK);
+#endif
+
/* First make symbols for the sections */
for (i = 0; i < NSECS; i++)
{
exp_label->flags = BSF_GLOBAL;
exp_label->value = 0;
+#ifdef DLLTOOL_ARM
+ if (machine == MTHUMB)
+ bfd_coff_set_symbol_class (abfd, exp_label, C_THUMBEXT);
+#endif
ptrs[oidx++] = exp_label;
}
{
asymbol *toc_symbol; /* The .toc symbol */
- toc_symbol = bfd_make_empty_symbol(abfd);
+ toc_symbol = bfd_make_empty_symbol (abfd);
toc_symbol->name = make_label (".", "toc");
toc_symbol->section = (asection *)&bfd_und_section;
toc_symbol->flags = BSF_GLOBAL;
ptrs[oidx++] = toc_symbol;
}
#endif
-
+
ptrs[oidx] = 0;
for (i = 0; i < NSECS; i++)
si->data = xmalloc (HOW_JTAB_SIZE);
memcpy (si->data, HOW_JTAB, HOW_JTAB_SIZE);
- /* add the reloqc into idata$5 */
+ /* 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;
abfd = bfd_openr (outname, HOW_BFD_TARGET);
return abfd;
}
-
+#endif
}
static bfd *
make_head ()
{
- FILE * f = fopen ("dh.s", FOPEN_WT);
+ FILE * f = fopen (TMP_HEAD_S, FOPEN_WT);
fprintf (f, "%s IMAGE_IMPORT_DESCRIPTOR\n", ASM_C);
fprintf (f, "\t.section .idata$2\n");
}
fclose (f);
- sprintf (outfile, "-o dh.o dh.s");
+ sprintf (outfile, "%s -o %s %s", as_flags, TMP_HEAD_O, TMP_HEAD_S);
+
+#ifdef DLLTOOL_ARM
+ if (interwork)
+ strcat (outfile, " -mthumb-interwork");
+#endif
+
run (as_name, outfile);
- return bfd_openr ("dh.o", HOW_BFD_TARGET);
+ return bfd_openr (TMP_HEAD_O, HOW_BFD_TARGET);
}
static bfd *
make_tail ()
{
- FILE * f = fopen ("dt.s", FOPEN_WT);
+ FILE * f = fopen (TMP_TAIL_S, FOPEN_WT);
if (!no_idata4)
{
fclose (f);
- sprintf (outfile, "-o dt.o dt.s");
+ sprintf (outfile, "%s -o %s %s", as_flags, TMP_TAIL_O, TMP_TAIL_S);
+
+#ifdef DLLTOOL_ARM
+ if (interwork)
+ strcat (outfile, " -mthumb-interwork");
+#endif
+
run (as_name, outfile);
- return bfd_openr ("dt.o", HOW_BFD_TARGET);
+
+ return bfd_openr (TMP_TAIL_O, HOW_BFD_TARGET);
}
static void
outarch = bfd_openw (imp_name, HOW_BFD_TARGET);
if (!outarch)
- {
- fprintf (stderr, _("%s: Can't open .lib file %s\n"),
- program_name, imp_name);
- exit (1);
- }
+ /* xgettext:c-format */
+ fatal (_("Can't open .lib file: %s"), imp_name);
+
+ /* xgettext:c-format */
+ inform (_("Creating library file: %s\n"), imp_name);
+
bfd_set_format (outarch, bfd_archive);
outarch->has_armap = 1;
/* 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 */
ar_head->next = head;
if (! bfd_set_archive_head (outarch, head))
bfd_fatal ("bfd_set_archive_head");
+
if (! bfd_close (outarch))
bfd_fatal (imp_name);
if (dontdeltemps == 0)
{
- sprintf (outfile, "dh.o");
- unlink (outfile);
- sprintf (outfile, "dh.s");
- unlink (outfile);
- sprintf (outfile, "dt.o");
- unlink (outfile);
- sprintf (outfile, "dt.s");
- unlink (outfile);
+ unlink (TMP_HEAD_O);
+ unlink (TMP_HEAD_S);
+ unlink (TMP_TAIL_O);
+ unlink (TMP_TAIL_S);
}
if (dontdeltemps < 2)
{
for (i = 0, exp = d_exports; exp; i++, exp = exp->next)
{
- sprintf (outfile, "ds%d.o",i);
+ sprintf (outfile, "%s%d.o", TMP_STUB, i);
if (unlink (outfile) < 0)
- fprintf (stderr, _("%s: cannot delete %s: %s\n"), program_name,
- outfile, strerror (errno));
+ /* xgettext:c-format */
+ warn (_("cannot delete %s: %s\n"), outfile, strerror (errno));
}
}
+
+ inform (_("Created lib file"));
}
/**********************************************************************/
export_type *b = d_export_vec[i + 1];
more = 1;
- if (verbose)
- fprintf (stderr, _("Warning, ignoring duplicate EXPORT %s %d,%d\n"),
- a->name,
- a->ordinal,
- b->ordinal);
+
+ /* xgettext:c-format */
+ inform (_("Warning, ignoring duplicate EXPORT %s %d,%d\n"),
+ 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);
- fprintf (stderr, _("Error, duplicate EXPORT with oridinals %s\n"),
- a->name);
- exit (1);
- }
/* Merge attributes */
b->ordinal = a->ordinal > 0 ? a->ordinal : b->ordinal;
b->constant |= a->constant;
export_type **d_export_vec
= (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;
}
/* Build list in alpha order */
- d_exports_lexically = (export_type **)xmalloc (sizeof(export_type *)*(d_nfuncs+1));
+ d_exports_lexically = (export_type **)
+ xmalloc (sizeof (export_type *) * (d_nfuncs + 1));
for (i = 0, exp = d_exports; exp; i++, exp = exp->next)
{
if (!d_exports_lexically[i]->noname || show_allnames)
d_exports_lexically[i]->hint = hint++;
}
-
+
+ inform (_("Processed definitions"));
}
/**********************************************************************/
FILE *file;
int status;
{
+ /* xgetext:c-format */
fprintf (file, _("Usage %s <options> <object-files>\n"), program_name);
- fprintf (file, _(" --machine <machine>\n"));
- fprintf (file, _(" --output-exp <outname> Generate export file.\n"));
- fprintf (file, _(" --output-lib <outname> Generate input library.\n"));
- fprintf (file, _(" --add-indirect Add dll indirects to export file.\n"));
- fprintf (file, _(" --dllname <name> Name of input dll to put into output lib.\n"));
- fprintf (file, _(" --def <deffile> Name input .def file\n"));
- fprintf (file, _(" --output-def <deffile> Name output .def file\n"));
- fprintf (file, _(" --base-file <basefile> Read linker generated base file\n"));
- fprintf (file, _(" --no-idata4 Don't generate idata$4 section\n"));
- fprintf (file, _(" --no-idata5 Don't generate idata$5 section\n"));
- fprintf (file, _(" -v Verbose\n"));
- fprintf (file, _(" -U Add underscores to .lib\n"));
- fprintf (file, _(" -k Kill @<n> from exported names\n"));
- fprintf (file, _(" --as <name> Use <name> for assembler\n"));
- fprintf (file, _(" --nodelete Keep temp files.\n"));
+ /* xgetext:c-format */
+ fprintf (file, _(" -m --machine <machine> Create {arm, i386, ppc, thumb} DLL. [default: %s]\n"), mname);
+ fprintf (file, _(" -e --output-exp <outname> Generate an export file.\n"));
+ fprintf (file, _(" -l --output-lib <outname> Generate an interface library.\n"));
+ fprintf (file, _(" -a --add-indirect Add dll indirects to export file.\n"));
+ fprintf (file, _(" -D --dllname <name> Name of input dll to put into interface lib.\n"));
+ fprintf (file, _(" -d --input-def <deffile> Name of .def file to be read in.\n"));
+ fprintf (file, _(" -z --output-def <deffile> Name of .def file to be created.\n"));
+ fprintf (file, _(" --export-all-symbols Export all symbols to .def\n"));
+ fprintf (file, _(" --no-export-all-symbols Only export listed symbols\n"));
+ fprintf (file, _(" --exclude-symbols <list> Don't export <list>\n"));
+ fprintf (file, _(" --no-default-excludes Clear default exclude symbols\n"));
+ fprintf (file, _(" -b --base-file <basefile> Read linker generated base file.\n"));
+ fprintf (file, _(" -x --no-idata4 Don't generate idata$4 section.\n"));
+ fprintf (file, _(" -c --no-idata5 Don't generate idata$5 section.\n"));
+ fprintf (file, _(" -U --add-underscore Add underscores to symbols in interface library.\n"));
+ fprintf (file, _(" -k --kill-at Kill @<n> from exported names.\n"));
+ fprintf (file, _(" -S --as <name> Use <name> for assembler.\n"));
+ fprintf (file, _(" -f --as-flags <flags> Pass <flags> to the assembler.\n"));
+#ifdef DLLTOOL_ARM
+ fprintf (file, _(" -i --interwork Support ARM/Thumb interworking.\n"));
+#endif
+ fprintf (file, _(" -n --no-delete Keep temp files (repeat for extra preservation).\n"));
+ fprintf (file, _(" -v --verbose Be verbose.\n"));
+ fprintf (file, _(" -V --version Display the program version.\n"));
+ fprintf (file, _(" -h --help Display this information.\n"));
+
exit (status);
}
-#define OPTION_NO_IDATA4 'x'
-#define OPTION_NO_IDATA5 'c'
+#define OPTION_EXPORT_ALL_SYMS 150
+#define OPTION_NO_EXPORT_ALL_SYMS (OPTION_EXPORT_ALL_SYMS + 1)
+#define OPTION_EXCLUDE_SYMS (OPTION_NO_EXPORT_ALL_SYMS + 1)
+#define OPTION_NO_DEFAULT_EXCLUDES (OPTION_EXCLUDE_SYMS + 1)
+#define OPTION_NO_IDATA4 'x'
+#define OPTION_NO_IDATA5 'c'
+
static const struct option long_options[] =
{
- {"nodelete", no_argument, NULL, 'n'},
+ {"no-delete", no_argument, NULL, 'n'},
{"dllname", required_argument, NULL, 'D'},
{"no-idata4", no_argument, NULL, OPTION_NO_IDATA4},
{"no-idata5", no_argument, NULL, OPTION_NO_IDATA5},
{"output-exp", required_argument, NULL, 'e'},
{"output-def", required_argument, NULL, 'z'},
+ {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL_SYMS},
+ {"no-export-all-symbols", no_argument, NULL, OPTION_NO_EXPORT_ALL_SYMS},
+ {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMS},
+ {"no-default-excludes", no_argument, NULL, OPTION_NO_DEFAULT_EXCLUDES},
{"output-lib", required_argument, NULL, 'l'},
- {"def", required_argument, NULL, 'd'},
+ {"def", required_argument, NULL, 'd'}, /* for compatiblity with older versions */
+ {"input-def", required_argument, NULL, 'd'},
{"add-underscore", no_argument, NULL, 'U'},
- {"killat", no_argument, NULL, 'k'},
+ {"kill-at", no_argument, NULL, 'k'},
+ {"verbose", no_argument, NULL, 'v'},
+ {"version", no_argument, NULL, 'V'},
{"help", no_argument, NULL, 'h'},
{"machine", required_argument, NULL, 'm'},
{"add-indirect", no_argument, NULL, 'a'},
{"base-file", required_argument, NULL, 'b'},
{"as", required_argument, NULL, 'S'},
+ {"as-flags", required_argument, NULL, 'f'},
+#ifdef DLLTOOL_ARM
+ {"interwork", no_argument, NULL, 'i'},
+#endif
{0}
};
program_name = av[0];
oav = av;
+#ifdef HAVE_SETLOCALE
setlocale (LC_MESSAGES, "");
+#endif
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- while ((c = getopt_long (ac, av, "xcz:S:R:A:puaD:l:e:nkvbUh?m:yd:", long_options, 0))
+ while ((c = getopt_long (ac, av, "xcz:S:aD:l:e:nkvVb:Uh?m:d:f:i",
+ long_options, 0))
!= EOF)
{
switch (c)
case OPTION_NO_IDATA5:
no_idata5 = 1;
break;
+ case OPTION_EXPORT_ALL_SYMS:
+ export_all_symbols = true;
+ break;
+ case OPTION_NO_EXPORT_ALL_SYMS:
+ export_all_symbols = false;
+ break;
+ case OPTION_EXCLUDE_SYMS:
+ add_excludes (optarg);
+ break;
+ case OPTION_NO_DEFAULT_EXCLUDES:
+ do_default_excludes = false;
+ break;
case 'S':
as_name = optarg;
break;
+ case 'f':
+ as_flags = optarg;
+ break;
/* ignored for compatibility */
case 'u':
exp_name = optarg;
break;
case 'h':
- case '?':
- usage (stderr, 0);
+ usage (stdout, 0);
break;
case 'm':
mname = optarg;
case 'v':
verbose = 1;
break;
+ case 'V':
+ print_version (program_name);
+ break;
+#ifdef DLLTOOL_ARM
+ case 'i':
+ interwork = 1;
+ break;
+#endif
case 'y':
#if 0
/* We don't currently define YYDEBUG when building
break;
case 'b':
base_file = fopen (optarg, FOPEN_RB);
+
if (!base_file)
- {
- fprintf (stderr, _("%s: Unable to open base-file %s\n"),
- av[0],
- optarg);
- exit (1);
- }
+ /* xgettext:c-format */
+ fatal (_("Unable to open base-file: %s"), optarg);
+
break;
default:
usage (stderr, 1);
+ break;
}
}
-
for (i = 0; mtable[i].type; i++)
{
if (strcmp (mtable[i].type, mname) == 0)
}
if (!mtable[i].type)
- {
- fprintf (stderr, _("Machine not supported\n"));
- exit (1);
- }
- machine = i;
+ /* xgettext:c-format */
+ fatal (_("Machine '%s' not supported"), mname);
+ machine = i;
+#ifdef DLLTOOL_ARM
+ /* Always enable interworking for Thumb targets. */
+ if (machine == MTHUMB && (! interwork))
+ interwork = 1;
+#endif
+
if (!dll_name && exp_name)
{
int len = strlen (exp_name) + 5;
strcat (dll_name, ".dll");
}
+ /* 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 (def_file)
- {
- process_def_file (def_file);
- }
+ process_def_file (def_file);
+
while (optind < ac)
{
if (!firstarg)
if (exp_name)
gen_exp_file ();
+
if (imp_name)
{
/* Make imp_name safe for use as a label. */
head_label = make_label("_head_", imp_name_lab);
gen_lib_file ();
}
+
if (output_def)
gen_def_file ();
projects / deliverable / binutils-gdb.git / blobdiff