X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=lto-plugin%2Flto-plugin.c;h=5ca4c9a27a31269df761b6cde3fdffd06adfc3a3;hb=13ac7a0f8ccbc9b5c1edb8e23ff43d62b0ba0534;hp=3a51441c43311c2c8390e69aa85843bdc2a4dced;hpb=13cc45c4de3324454a59a2b446f8354950c10ee2;p=pf3gnuchains%2Fgcc-fork.git diff --git a/lto-plugin/lto-plugin.c b/lto-plugin/lto-plugin.c index 3a51441c433..5ca4c9a27a3 100644 --- a/lto-plugin/lto-plugin.c +++ b/lto-plugin/lto-plugin.c @@ -1,5 +1,5 @@ -/* LTO plugin for gold. - Copyright (C) 2009 Free Software Foundation, Inc. +/* LTO plugin for gold and/or GNU ld. + Copyright (C) 2009, 2010 Free Software Foundation, Inc. Contributed by Rafael Avila de Espindola (espindola@google.com). This program is free software; you can redistribute it and/or modify @@ -32,35 +32,78 @@ along with this program; see the file COPYING3. If not see -nop: Instead of running lto-wrapper, pass the original to the plugin. This only works if the input files are hybrid. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#if HAVE_STDINT_H +#include +#endif #include #include #include #include #include -#include #include #include #include #include +#ifdef HAVE_SYS_WAIT_H #include -#include +#endif +#ifndef WIFEXITED +#define WIFEXITED(S) (((S) & 0xff) == 0) +#endif +#ifndef WEXITSTATUS +#define WEXITSTATUS(S) (((S) & 0xff00) >> 8) +#endif #include +#include +#include "../gcc/lto/common.h" +#include "simple-object.h" +#include "plugin-api.h" -/* The presence of gelf.h is checked by the toplevel configure script. */ -#include +/* Handle opening elf files on hosts, such as Windows, that may use + text file handling that will break binary access. */ +#ifndef O_BINARY +# define O_BINARY 0 +#endif -#include "plugin-api.h" -#include "../gcc/lto/common.h" +/* Segment name for LTO sections. This is only used for Mach-O. + FIXME: This needs to be kept in sync with darwin.c. */ + +#define LTO_SEGMENT_NAME "__GNU_LTO" + +/* LTO magic section name. */ + +#define LTO_SECTION_PREFIX ".gnu.lto_.symtab" +#define LTO_SECTION_PREFIX_LEN (sizeof (LTO_SECTION_PREFIX) - 1) /* The part of the symbol table the plugin has to keep track of. Note that we must keep SYMS until all_symbols_read is called to give the linker time to copy the symbol information. */ +struct sym_aux +{ + uint32_t slot; + unsigned id; + unsigned next_conflict; +}; + struct plugin_symtab { int nsyms; - uint32_t *slots; + struct sym_aux *aux; struct ld_plugin_symbol *syms; + unsigned id; +}; + +/* Encapsulates object file data during symbol scan. */ +struct plugin_objfile +{ + int found; + simple_object_read *objfile; + struct plugin_symtab *out; + const struct ld_plugin_input_file *file; }; /* All that we have to remember about a file. */ @@ -70,19 +113,28 @@ struct plugin_file_info char *name; void *handle; struct plugin_symtab symtab; - unsigned char temp; + struct plugin_symtab conflicts; }; +/* Until ASM_OUTPUT_LABELREF can be hookized and decoupled from + stdio file streams, we do simple label translation here. */ + +enum symbol_style +{ + ss_none, /* No underscore prefix. */ + ss_win32, /* Underscore prefix any symbol not beginning with '@'. */ + ss_uscore, /* Underscore prefix all symbols. */ +}; -static char *temp_obj_dir_name; +static char *arguments_file_name; static ld_plugin_register_claim_file register_claim_file; -static ld_plugin_add_symbols add_symbols; static ld_plugin_register_all_symbols_read register_all_symbols_read; static ld_plugin_get_symbols get_symbols; static ld_plugin_register_cleanup register_cleanup; static ld_plugin_add_input_file add_input_file; static ld_plugin_add_input_library add_input_library; static ld_plugin_message message; +static ld_plugin_add_symbols add_symbols; static struct plugin_file_info *claimed_files = NULL; static unsigned int num_claimed_files = 0; @@ -96,12 +148,17 @@ static int lto_wrapper_num_args; static char **pass_through_items = NULL; static unsigned int num_pass_through_items; -static bool debug; -static bool nop; +static char debug; +static char nop; static char *resolution_file = NULL; +/* Set by default from configure.ac, but can be overridden at runtime + by using -plugin-opt=-sym-style={none,win32,underscore|uscore} + (in fact, only first letter of style arg is checked.) */ +static enum symbol_style sym_style = SYM_STYLE; + static void -check (bool gate, enum ld_plugin_level level, const char *text) +check_1 (int gate, enum ld_plugin_level level, const char *text) { if (gate) return; @@ -117,12 +174,18 @@ check (bool gate, enum ld_plugin_level level, const char *text) } } +/* This little wrapper allows check to be called with a non-integer + first argument, such as a pointer that must be non-NULL. We can't + use c99 bool type to coerce it into range, so we explicitly test. */ +#define check(GATE, LEVEL, TEXT) check_1 (((GATE) != 0), (LEVEL), (TEXT)) + /* Parse an entry of the IL symbol table. The data to be parsed is pointed by P and the result is written in ENTRY. The slot number is stored in SLOT. Returns the address of the next entry. */ static char * -parse_table_entry (char *p, struct ld_plugin_symbol *entry, uint32_t *slot) +parse_table_entry (char *p, struct ld_plugin_symbol *entry, + struct sym_aux *aux) { unsigned char t; enum ld_plugin_symbol_kind translate_kind[] = @@ -142,7 +205,24 @@ parse_table_entry (char *p, struct ld_plugin_symbol *entry, uint32_t *slot) LDPV_HIDDEN }; - entry->name = strdup (p); + switch (sym_style) + { + case ss_win32: + if (p[0] == '@') + { + /* cf. Duff's device. */ + case ss_none: + entry->name = xstrdup (p); + break; + } + /* FALL-THROUGH. */ + case ss_uscore: + entry->name = concat ("_", p, NULL); + break; + default: + check (0, LDPL_FATAL, "invalid symbol style requested"); + break; + } while (*p) p++; p++; @@ -157,7 +237,7 @@ parse_table_entry (char *p, struct ld_plugin_symbol *entry, uint32_t *slot) if (strlen (entry->comdat_key) == 0) entry->comdat_key = NULL; else - entry->comdat_key = strdup (entry->comdat_key); + entry->comdat_key = xstrdup (entry->comdat_key); t = *p; check (t <= 4, LDPL_FATAL, "invalid symbol kind found"); @@ -172,79 +252,44 @@ parse_table_entry (char *p, struct ld_plugin_symbol *entry, uint32_t *slot) entry->size = *(uint64_t *) p; p += 8; - *slot = *(uint32_t *) p; + aux->slot = *(uint32_t *) p; p += 4; entry->resolution = LDPR_UNKNOWN; - return p; -} - -/* Return the section in ELF that is named NAME. */ - -static Elf_Scn * -get_section (Elf *elf, const char *name) -{ - Elf_Scn *section = 0; - GElf_Ehdr header; - GElf_Ehdr *t = gelf_getehdr (elf, &header); - if (t == NULL) - return NULL; - assert (t == &header); - - while ((section = elf_nextscn(elf, section)) != 0) - { - GElf_Shdr shdr; - GElf_Shdr *tshdr = gelf_getshdr (section, &shdr); - const char *t; - assert (tshdr == &shdr); - t = elf_strptr (elf, header.e_shstrndx, shdr.sh_name); - assert (t != NULL); - if (strcmp (t, name) == 0) - return section; - } - return NULL; -} - -/* Returns the IL symbol table of file ELF. */ + aux->next_conflict = -1; -static Elf_Data * -get_symtab (Elf *elf) -{ - Elf_Data *data = 0; - Elf_Scn *section = get_section (elf, ".gnu.lto_.symtab"); - if (!section) - return NULL; - - data = elf_getdata (section, data); - assert (data); - return data; + return p; } -/* Translate the IL symbol table SYMTAB. Write the slots and symbols in OUT. */ +/* Translate the IL symbol table located between DATA and END. Append the + slots and symbols to OUT. */ static void -translate (Elf_Data *symtab, struct plugin_symtab *out) +translate (char *data, char *end, struct plugin_symtab *out) { - uint32_t *slots = NULL; - char *data = symtab->d_buf; - char *end = data + symtab->d_size; + struct sym_aux *aux; struct ld_plugin_symbol *syms = NULL; - int n = 0; - - while (data < end) - { - n++; - syms = realloc (syms, n * sizeof (struct ld_plugin_symbol)); - check (syms, LDPL_FATAL, "could not allocate memory"); - slots = realloc (slots, n * sizeof (uint32_t)); - check (slots, LDPL_FATAL, "could not allocate memory"); - data = parse_table_entry (data, &syms[n - 1], &slots[n - 1]); + int n, len; + + /* This overestimates the output buffer sizes, but at least + the algorithm is O(1) now. */ + + len = (end - data)/8 + out->nsyms + 1; + syms = xrealloc (out->syms, len * sizeof (struct ld_plugin_symbol)); + aux = xrealloc (out->aux, len * sizeof (struct sym_aux)); + + for (n = out->nsyms; data < end; n++) + { + aux[n].id = out->id; + data = parse_table_entry (data, &syms[n], &aux[n]); } + assert(n < len); + out->nsyms = n; out->syms = syms; - out->slots = slots; + out->aux = aux; } /* Free all memory that is no longer needed after writing the symbol @@ -281,7 +326,7 @@ free_2 (void) { struct plugin_file_info *info = &claimed_files[i]; struct plugin_symtab *symtab = &info->symtab; - free (symtab->slots); + free (symtab->aux); free (info->name); } @@ -293,16 +338,87 @@ free_2 (void) claimed_files = NULL; num_claimed_files = 0; - free (temp_obj_dir_name); - temp_obj_dir_name = NULL; + if (arguments_file_name) + free (arguments_file_name); + arguments_file_name = NULL; +} + +/* Dump SYMTAB to resolution file F. */ - if (resolution_file) +static void +dump_symtab (FILE *f, struct plugin_symtab *symtab) +{ + unsigned j; + + for (j = 0; j < symtab->nsyms; j++) { - free (resolution_file); - resolution_file = NULL; + uint32_t slot = symtab->aux[j].slot; + unsigned int resolution = symtab->syms[j].resolution; + + assert (resolution != LDPR_UNKNOWN); + + fprintf (f, "%u %x %s %s\n", (unsigned int) slot, symtab->aux[j].id, + lto_resolution_str[resolution], + symtab->syms[j].name); } } +/* Finish the conflicts' resolution information after the linker resolved + the original symbols */ + +static void +finish_conflict_resolution (struct plugin_symtab *symtab, + struct plugin_symtab *conflicts) +{ + int i, j; + + if (conflicts->nsyms == 0) + return; + + for (i = 0; i < symtab->nsyms; i++) + { + int resolution = LDPR_UNKNOWN; + + if (symtab->aux[i].next_conflict == -1) + continue; + + switch (symtab->syms[i].def) + { + case LDPK_DEF: + case LDPK_COMMON: /* ??? */ + resolution = LDPR_RESOLVED_IR; + break; + case LDPK_WEAKDEF: + resolution = LDPR_PREEMPTED_IR; + break; + case LDPK_UNDEF: + case LDPK_WEAKUNDEF: + resolution = symtab->syms[i].resolution; + break; + default: + assert (0); + } + + assert (resolution != LDPR_UNKNOWN); + + for (j = symtab->aux[i].next_conflict; + j != -1; + j = conflicts->aux[j].next_conflict) + conflicts->syms[j].resolution = resolution; + } +} + +/* Free symbol table SYMTAB. */ + +static void +free_symtab (struct plugin_symtab *symtab) +{ + free (symtab->syms); + symtab->syms = NULL; + free (symtab->aux); + symtab->aux = NULL; +} + /* Writes the relocations to disk. */ static void @@ -311,9 +427,7 @@ write_resolution (void) unsigned int i; FILE *f; - if (!resolution_file) - return; - + check (resolution_file, LDPL_FATAL, "resolution file not specified"); f = fopen (resolution_file, "w"); check (f, LDPL_FATAL, "could not open file"); @@ -324,18 +438,17 @@ write_resolution (void) struct plugin_file_info *info = &claimed_files[i]; struct plugin_symtab *symtab = &info->symtab; struct ld_plugin_symbol *syms = symtab->syms; - unsigned j; - assert (syms); get_symbols (info->handle, symtab->nsyms, syms); - fprintf (f, "%s %d\n", info->name, info->symtab.nsyms); + finish_conflict_resolution (symtab, &info->conflicts); - for (j = 0; j < info->symtab.nsyms; j++) + fprintf (f, "%s %d\n", info->name, symtab->nsyms + info->conflicts.nsyms); + dump_symtab (f, symtab); + if (info->conflicts.nsyms) { - uint32_t slot = symtab->slots[j]; - unsigned int resolution = syms[j].resolution; - fprintf (f, "%d %s\n", slot, lto_resolution_str[resolution]); + dump_symtab (f, &info->conflicts); + free_symtab (&info->conflicts); } } fclose (f); @@ -347,22 +460,32 @@ write_resolution (void) static void add_output_files (FILE *f) { - char fname[1000]; /* FIXME: Remove this restriction. */ - for (;;) { + const unsigned piece = 32; + char *buf, *s = xmalloc (piece); size_t len; - char *s = fgets (fname, sizeof (fname), f); - if (!s) - break; + buf = s; +cont: + if (!fgets (buf, piece, f)) + { + free (s); + break; + } len = strlen (s); - check (s[len - 1] == '\n', LDPL_FATAL, "file name too long"); + if (s[len - 1] != '\n') + { + s = xrealloc (s, len + piece); + buf = s + len; + goto cont; + } s[len - 1] = '\0'; num_output_files++; - output_files = realloc (output_files, num_output_files * sizeof (char *)); - output_files[num_output_files - 1] = strdup (s); + output_files + = xrealloc (output_files, num_output_files * sizeof (char *)); + output_files[num_output_files - 1] = s; add_input_file (output_files[num_output_files - 1]); } } @@ -373,10 +496,9 @@ add_output_files (FILE *f) static void exec_lto_wrapper (char *argv[]) { - int t; + int t, i; int status; char *at_args; - char *args_name; FILE *args; FILE *wrapper_output; char *new_argv[3]; @@ -384,11 +506,11 @@ exec_lto_wrapper (char *argv[]) const char *errmsg; /* Write argv to a file to avoid a command line that is too long. */ - t = asprintf (&at_args, "@%s/arguments", temp_obj_dir_name); - check (t >= 0, LDPL_FATAL, "asprintf failed"); + arguments_file_name = make_temp_file (""); + check (arguments_file_name, LDPL_FATAL, + "Failed to generate a temorary file name"); - args_name = at_args + 1; - args = fopen (args_name, "w"); + args = fopen (arguments_file_name, "w"); check (args, LDPL_FATAL, "could not open arguments file"); t = writeargv (&argv[1], args); @@ -396,13 +518,27 @@ exec_lto_wrapper (char *argv[]) t = fclose (args); check (t == 0, LDPL_FATAL, "could not close arguments file"); + at_args = concat ("@", arguments_file_name, NULL); + check (at_args, LDPL_FATAL, "could not allocate"); + + for (i = 1; argv[i]; i++) + { + char *a = argv[i]; + if (a[0] == '-' && a[1] == 'v' && a[2] == '\0') + { + for (i = 0; argv[i]; i++) + fprintf (stderr, "%s ", argv[i]); + fprintf (stderr, "\n"); + break; + } + } + new_argv[0] = argv[0]; new_argv[1] = at_args; new_argv[2] = NULL; if (debug) { - int i; for (i = 0; new_argv[i]; i++) fprintf (stderr, "%s ", new_argv[i]); fprintf (stderr, "\n"); @@ -428,8 +564,6 @@ exec_lto_wrapper (char *argv[]) pex_free (pex); - t = unlink (args_name); - check (t == 0, LDPL_FATAL, "could not unlink arguments file"); free (at_args); } @@ -465,7 +599,7 @@ all_symbols_read_handler (void) return LDPS_OK; } - lto_argv = (char **) calloc (sizeof (char *), num_lto_args); + lto_argv = (char **) xcalloc (sizeof (char *), num_lto_args); lto_arg_ptr = (const char **) lto_argv; assert (lto_wrapper_argv); @@ -512,39 +646,186 @@ all_symbols_read_handler (void) static enum ld_plugin_status cleanup_handler (void) { + unsigned int i; int t; - unsigned i; - char *arguments; - struct stat buf; - for (i = 0; i < num_claimed_files; i++) - { - struct plugin_file_info *info = &claimed_files[i]; - if (info->temp) - { - t = unlink (info->name); - check (t == 0, LDPL_FATAL, "could not unlink temporary file"); - } - } + if (debug) + return LDPS_OK; - /* If we are being called from an error handler, it is possible - that the arguments file is still exists. */ - t = asprintf (&arguments, "%s/arguments", temp_obj_dir_name); - check (t >= 0, LDPL_FATAL, "asprintf failed"); - if (stat(arguments, &buf) == 0) + if (arguments_file_name) { - t = unlink (arguments); + t = unlink (arguments_file_name); check (t == 0, LDPL_FATAL, "could not unlink arguments file"); } - free (arguments); - t = rmdir (temp_obj_dir_name); - check (t == 0, LDPL_FATAL, "could not remove temporary directory"); + for (i = 0; i < num_output_files; i++) + { + t = unlink (output_files[i]); + check (t == 0, LDPL_FATAL, "could not unlink output file"); + } free_2 (); return LDPS_OK; } +#define SWAP(type, a, b) \ + do { type tmp_; tmp_ = (a); (a) = (b); (b) = tmp_; } while(0) + +/* Compare two hash table entries */ + +static int eq_sym (const void *a, const void *b) +{ + const struct ld_plugin_symbol *as = (const struct ld_plugin_symbol *)a; + const struct ld_plugin_symbol *bs = (const struct ld_plugin_symbol *)b; + + return !strcmp (as->name, bs->name); +} + +/* Hash a symbol */ + +static hashval_t hash_sym (const void *a) +{ + const struct ld_plugin_symbol *as = (const struct ld_plugin_symbol *)a; + + return htab_hash_string (as->name); +} + +/* Determine how strong a symbol is */ + +static int symbol_strength (struct ld_plugin_symbol *s) +{ + switch (s->def) + { + case LDPK_UNDEF: + case LDPK_WEAKUNDEF: + return 0; + case LDPK_WEAKDEF: + return 1; + default: + return 2; + } +} + +/* In the ld -r case we can get dups in the LTO symbol tables, where + the same symbol can have different resolutions (e.g. undefined and defined). + + We have to keep that in the LTO symbol tables, but the dups confuse + gold and then finally gcc by supplying incorrect resolutions. + + Problem is that the main gold symbol table doesn't know about subids + and does not distingush the same symbols in different states. + + So we drop duplicates from the linker visible symbol table + and keep them in a private table. Then later do own symbol + resolution for the duplicated based on the results for the + originals. + + Then when writing out the resolution file readd the dropped symbols. + + XXX how to handle common? */ + +static void +resolve_conflicts (struct plugin_symtab *t, struct plugin_symtab *conflicts) +{ + htab_t symtab = htab_create (t->nsyms, hash_sym, eq_sym, NULL); + int i; + int out; + int outlen; + + outlen = t->nsyms; + conflicts->syms = xmalloc (sizeof (struct ld_plugin_symbol) * outlen); + conflicts->aux = xmalloc (sizeof (struct sym_aux) * outlen); + + /* Move all duplicate symbols into the auxillary conflicts table. */ + out = 0; + for (i = 0; i < t->nsyms; i++) + { + struct ld_plugin_symbol *s = &t->syms[i]; + struct sym_aux *aux = &t->aux[i]; + void **slot; + + slot = htab_find_slot (symtab, s, INSERT); + if (*slot != NULL) + { + int cnf; + struct ld_plugin_symbol *orig = (struct ld_plugin_symbol *)*slot; + struct sym_aux *orig_aux = &t->aux[orig - t->syms]; + + /* Always let the linker resolve the strongest symbol */ + if (symbol_strength (orig) < symbol_strength (s)) + { + SWAP (struct ld_plugin_symbol, *orig, *s); + SWAP (uint32_t, orig_aux->slot, aux->slot); + SWAP (unsigned, orig_aux->id, aux->id); + /* Don't swap conflict chain pointer */ + } + + /* Move current symbol into the conflicts table */ + cnf = conflicts->nsyms++; + conflicts->syms[cnf] = *s; + conflicts->aux[cnf] = *aux; + aux = &conflicts->aux[cnf]; + + /* Update conflicts chain of the original symbol */ + aux->next_conflict = orig_aux->next_conflict; + orig_aux->next_conflict = cnf; + + continue; + } + + /* Remove previous duplicates in the main table */ + if (out < i) + { + t->syms[out] = *s; + t->aux[out] = *aux; + } + + /* Put original into the hash table */ + *slot = &t->syms[out]; + out++; + } + + assert (conflicts->nsyms <= outlen); + assert (conflicts->nsyms + out == t->nsyms); + + t->nsyms = out; + htab_delete (symtab); +} + +/* Process one section of an object file. */ + +static int +process_symtab (void *data, const char *name, off_t offset, off_t length) +{ + struct plugin_objfile *obj = (struct plugin_objfile *)data; + char *s; + char *secdata; + + if (strncmp (name, LTO_SECTION_PREFIX, LTO_SECTION_PREFIX_LEN) != 0) + return 1; + + s = strrchr (name, '.'); + if (s) + sscanf (s, ".%x", &obj->out->id); + secdata = xmalloc (length); + offset += obj->file->offset; + if (offset != lseek (obj->file->fd, offset, SEEK_SET) + || length != read (obj->file->fd, secdata, length)) + { + if (message) + message (LDPL_FATAL, "%s: corrupt object file", obj->file->name); + /* Force claim_file_handler to abandon this file. */ + obj->found = 0; + free (secdata); + return 0; + } + + translate (secdata, secdata + length, obj->out); + obj->found++; + free (secdata); + return 1; +} + /* Callback used by gold to check if the plugin will claim FILE. Writes the result in CLAIMED. */ @@ -552,63 +833,62 @@ static enum ld_plugin_status claim_file_handler (const struct ld_plugin_input_file *file, int *claimed) { enum ld_plugin_status status; - Elf *elf; + struct plugin_objfile obj; struct plugin_file_info lto_file; - Elf_Data *symtab; - int lto_file_fd; + int err; + const char *errmsg; + + memset (<o_file, 0, sizeof (struct plugin_file_info)); if (file->offset != 0) { - /* FIXME lto: lto1 should know how to handle archives. */ - int fd; - off_t size = file->filesize; - off_t offset; - - static int objnum = 0; char *objname; - int t = asprintf (&objname, "%s/obj%d.o", - temp_obj_dir_name, objnum); + /* We pass the offset of the actual file, not the archive header. + Can't use PRIx64, because that's C99, so we have to print the + 64-bit hex int as two 32-bit ones. */ + int lo, hi; + lo = file->offset & 0xffffffff; + hi = ((int64_t)file->offset >> 32) & 0xffffffff; + int t = hi ? asprintf (&objname, "%s@0x%x%08x", file->name, lo, hi) + : asprintf (&objname, "%s@0x%x", file->name, lo); check (t >= 0, LDPL_FATAL, "asprintf failed"); - objnum++; - - fd = open (objname, O_RDWR | O_CREAT, 0666); - check (fd > 0, LDPL_FATAL, "could not open/create temporary file"); - offset = lseek (file->fd, file->offset, SEEK_SET); - check (offset == file->offset, LDPL_FATAL, "could not seek"); - while (size > 0) - { - ssize_t r, written; - char buf[1000]; - off_t s = sizeof (buf) < size ? sizeof (buf) : size; - r = read (file->fd, buf, s); - written = write (fd, buf, r); - check (written == r, LDPL_FATAL, "could not write to temporary file"); - size -= r; - } lto_file.name = objname; - lto_file_fd = fd; - lto_file.handle = file->handle; - lto_file.temp = 1; } else { - lto_file.name = strdup (file->name); - lto_file_fd = file->fd; - lto_file.handle = file->handle; - lto_file.temp = 0; + lto_file.name = xstrdup (file->name); } - elf = elf_begin (lto_file_fd, ELF_C_READ, NULL); + lto_file.handle = file->handle; *claimed = 0; - - if (!elf) + obj.file = file; + obj.found = 0; + obj.out = <o_file.symtab; + errmsg = NULL; + obj.objfile = simple_object_start_read (file->fd, file->offset, LTO_SEGMENT_NAME, + &errmsg, &err); + /* No file, but also no error code means unrecognized format; just skip it. */ + if (!obj.objfile && !err) goto err; - symtab = get_symtab (elf); - if (!symtab) + if (obj.objfile) + errmsg = simple_object_find_sections (obj.objfile, process_symtab, &obj, &err); + + if (!obj.objfile || errmsg) + { + if (err && message) + message (LDPL_FATAL, "%s: %s: %s", file->name, errmsg, + xstrerror (err)); + else if (message) + message (LDPL_FATAL, "%s: %s", file->name, errmsg); + goto err; + } + + if (obj.found == 0) goto err; - translate (symtab, <o_file.symtab); + if (obj.found > 1) + resolve_conflicts (<o_file.symtab, <o_file.conflicts); status = add_symbols (file->handle, lto_file.symtab.nsyms, lto_file.symtab.syms); @@ -617,23 +897,18 @@ claim_file_handler (const struct ld_plugin_input_file *file, int *claimed) *claimed = 1; num_claimed_files++; claimed_files = - realloc (claimed_files, - num_claimed_files * sizeof (struct plugin_file_info)); + xrealloc (claimed_files, + num_claimed_files * sizeof (struct plugin_file_info)); claimed_files[num_claimed_files - 1] = lto_file; goto cleanup; err: - if (file->offset != 0) - { - int t = unlink (lto_file.name); - check (t == 0, LDPL_FATAL, "could not unlink file"); - } free (lto_file.name); cleanup: - if (elf) - elf_end (elf); + if (obj.objfile) + simple_object_release_read (obj.objfile); return LDPS_OK; } @@ -647,25 +922,39 @@ process_option (const char *option) debug = 1; else if (strcmp (option, "-nop") == 0) nop = 1; - else if (!strncmp (option, "-resolution=", strlen("-resolution="))) - { - resolution_file = strdup (option + strlen("-resolution=")); - } else if (!strncmp (option, "-pass-through=", strlen("-pass-through="))) { num_pass_through_items++; - pass_through_items = realloc (pass_through_items, - num_pass_through_items * sizeof (char *)); + pass_through_items = xrealloc (pass_through_items, + num_pass_through_items * sizeof (char *)); pass_through_items[num_pass_through_items - 1] = - strdup (option + strlen ("-pass-through=")); + xstrdup (option + strlen ("-pass-through=")); + } + else if (!strncmp (option, "-sym-style=", sizeof ("-sym-style=") - 1)) + { + switch (option[sizeof ("-sym-style=") - 1]) + { + case 'w': + sym_style = ss_win32; + break; + case 'u': + sym_style = ss_uscore; + break; + default: + sym_style = ss_none; + break; + } } else { int size; + char *opt = xstrdup (option); lto_wrapper_num_args += 1; size = lto_wrapper_num_args * sizeof (char *); - lto_wrapper_argv = (char **) realloc (lto_wrapper_argv, size); - lto_wrapper_argv[lto_wrapper_num_args - 1] = strdup(option); + lto_wrapper_argv = (char **) xrealloc (lto_wrapper_argv, size); + lto_wrapper_argv[lto_wrapper_num_args - 1] = opt; + if (strncmp (option, "-fresolution=", sizeof ("-fresolution=") - 1) == 0) + resolution_file = opt + sizeof ("-fresolution=") - 1; } } @@ -676,10 +965,6 @@ onload (struct ld_plugin_tv *tv) { struct ld_plugin_tv *p; enum ld_plugin_status status; - char *t; - - unsigned version = elf_version (EV_CURRENT); - check (version != EV_NONE, LDPL_FATAL, "invalid ELF version"); p = tv; while (p->tv_tag) @@ -740,8 +1025,5 @@ onload (struct ld_plugin_tv *tv) "could not register the all_symbols_read callback"); } - temp_obj_dir_name = strdup ("tmp_objectsXXXXXX"); - t = mkdtemp (temp_obj_dir_name); - assert (t == temp_obj_dir_name); return LDPS_OK; }