This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[LTO merge][committed][09/13] lto-plugin


lto-plugin/ChangeLog

2009-10-02  Diego Novillo  <dnovillo@google.com>

	* Makefile.am (AM_CPPFLAGS): Remove -D_LARGEFILE_SOURCE
	and -D_FILE_OFFSET_BITS=64.
	* configure.ac: Add AC_SYS_LARGEFILE.
	* configure: Regenerate.
	* Makefile.in: Regenerate.
	* lto-plugin.c: Fix copyright boilerplate.

2009-10-02  Diego Novillo  <dnovillo@google.com>

	* Makefile.am (ACLOCAL_AMFLAGS): Define.
	* aclocal.m4: Regenerate with aclocal-2.64
	* acinclude.m4: Remove.
	* Makefile.in: Regenerate with automake-1.11
	* configure.ac (AC_PREREQ): Update to 2.64.
	* configure: Regenerate.

2009-10-02  Diego Novillo  <dnovillo@google.com>

	* Makefile.am (AM_CPPFLAGS): Remove -D_LARGEFILE_SOURCE
	and -D_FILE_OFFSET_BITS=64.
	* configure.ac: Add AC_SYS_LARGEFILE.
	* configure: Regenerate.
	* Makefile.in: Regenerate.
	* lto-plugin.c: Fix copyright boilerplate.

2009-10-02  Diego Novillo  <dnovillo@google.com>

	* Makefile.am (ACLOCAL_AMFLAGS): Define.
	* aclocal.m4: Regenerate with aclocal-2.64
	* acinclude.m4: Remove.
	* Makefile.in: Regenerate with automake-1.11
	* configure.ac (AC_PREREQ): Update to 2.64.
	* configure: Regenerate.

2009-10-02  Rafael Avila de Espindola  <espindola@google.com>

	* Makefile.am (liblto_plugin_la_SOURCES): Remove
	$(top_srcdir)/../gcc/lto/common.c
	* Makefile.in: Regenerate.

2009-10-01  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (pass_through_items): New.
	(num_pass_through_items): New.
	(all_symbols_read_handler): Update to use the -pass-through option.
	(process_option): Replace -libgcc with -pass-through.
	
2009-09-30  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (onload): Return a ld_plugin_status. Don't require
	register_cleanup to be set.

2009-09-30  Rafael Avila de Espindola  <espindola@google.com>

	* Makefile.am: Remove all reference to ltosymtab.
	* Makefile.in: Regenerate.
	* lto-symtab.c: Remove.

2009-05-21  Diego Novillo  <dnovillo@google.com>

	* configure.ac: Remove call to AC_CHECK_GELF.
	Call AC_ARG_VAR for LIBELFLIBS and LIBELFINC.
	* acinclude.m4: Do not include ../config/libelf.m4
	* Makefile.am (LIBELFLIBS): Define.
	(LIBELFINC): Define.
	(AM_CPPFLAGS): Add $(LIBELFINC).
	(ltosymtab_LDADD): Add $(LIBELFLIBS).
	(liblto_plugin_la_LIBADD): Add $(LIBELFLIBS)
	* lto-plugin.c: Always include <gelf.h>
	* lto-symtab.c: Likewise.
	* configure: Regenerate.
	* Makefile.in: Regenerate.

2009-03-23  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (libgcc_filename): New.
	(all_symbols_read_handler): Pass libgcc to the linker.
	(all_symbols_read_handler): Parse -libgcc

2009-02-05  Rafael Avila de Espindola  <espindola@google.com>

	* Makefile.am (liblto_plugin_la_LIBADD): Link with libiberty.
	* Makefile.in: Regenerate.
	* lto-plugin.c (add_output_files): Argument is now a FILE.
	(exec_lto_wrapper): Use writeargv and pex.

2009-02-04  Rafael Avila de Espindola  <espindola@google.com>

	Revert:
	2009-02-04  Rafael Avila de Espindola  <espindola@google.com>
	* lto-plugin.c (exec_lto_wrapper): Use writeargv.


2009-02-04  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (exec_lto_wrapper): Use writeargv.

2009-01-29  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c: Include libiberty.h.
	(exec_lto_wrapper, claim_file_handler): Use asprintf instead of
	snprintf.

2009-01-29  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (exec_lto_wrapper): Write argv to a file. Pass that
	file to lto-wrapper.

2009-01-28  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (plugin_file_info): Remove fd and elf.
	(parse_table_entry): strdup entry->name and entry->comdat_key.
	(free_1): Free name and comdat_key. Don't close the file. Don't call
	elf_end.
	(claim_file_handler): Always call elf_end.

2008-12-23  Rafael Avila de Espindola  <espindola@google.com>

	* Makefile.am (AM_CPPFLAGS): Add -D_LARGEFILE_SOURCE
	-D_FILE_OFFSET_BITS=64
	* Makefile.in: Regenerate

2008-12-22  Rafael Avila de Espindola  <espindola@google.com>

	* Makefile.am (gcc_version, target_noncanonical, libexecsubdir): New.
	(lib_LTLIBRARIES): Rename to libexecsub_LTLIBRARIES.
	* Makefile.in: Regenerate.
	* acinclude.m4: Include ../config/acx.m4 and ../lt~obsolete.m4
	* configure: Regenerate.
	* configure.ac: Add AC_SUBST(target_noncanonical).

2008-12-08  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c: Include stdbool.h.
	(debug, nop): Declare as bool.

2008-12-08  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (nop): New.
	(use_original_files): New.
	(all_symbols_read_handler): Call use_original_files if nop is true.
	(process_option): Parse the -nop option.

2008-12-08  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (debug): New.
	(exec_lto_wrapper): Print argv if debug is true.
	(process_option): Process the -debug command line option.

2008-12-03  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (process_option): The argument is now a single option,
	not a space separated list.

2008-12-02  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c: Include sys/types.h and sys/wait.h
	(output_files, num_output_files, lto_wrapper_argv,
	lto_wrapper_num_args): New.
	(free_2): Free output_files.
	(write_resolution): Disable.
	(add_output_files): New.
	(exec_lto_wrapper): New.
	(all_symbols_read_handler): Run lto-wrapper.
	(claim_file_handler): Free lto_file.name and call elf_end.
	(process_option): New.

2008-11-26  Rafael Espindola  <espindola@google.com>

	* lto-plugin.c (add_input_file): New.
	(get_section): Return NULL if get_section fails.
	(write_resolution): New.
	(all_symbols_read_handler): Call add_input_file.
	(claim_file_handler): Unlink the correct file.
	(onload): Record add_input_file.

2008-09-23 Rafael Espindola  <espindola@google.com>

	* Makefile.am (ltosymtab_SOURCES, liblto_plugin_la_SOURCES):
	Update the location of common.c.
	* Makefile.in: Regenerate.
	* common.c: Moved to gcc/lto.
	* common.h: Moved to gcc/lto.
	* lto-plugin.c: Update the location of common.h.
	* lto-symtab.c: Update the location of common.h.

2008-09-23 Rafael Espindola  <espindola@google.com>

	* common.c: Include common.h.
	(lto_kind_str, lto_visibility_str, lto_resolution_str): Use explicit
	sizes.
	* common.h (lto_kind_str, lto_visibility_str, lto_resolution_str): Use
	explicit sizes.

2008-09-23 Rafael Espindola  <espindola@google.com>

	* lto-plugin.c (plugin_file_info): Add temp.
	(cleanup_handler): Only delete temporary files.
	(claim_file_handler): Initialize lto_file.temp.

2008-09-23  Rafael Espindola  <espindola@google.com>

        * plugin-api.h: Moved to include.

2008-09-23 Rafael Espindola  <espindola@google.com>

	* lto-plugin.c (all_symbols_read_handler): Print resolution in a new
	format.

2008-09-22 Rafael Espindola  <espindola@google.com>

	* plugin-api.h: Copy from binutils' cvs.

2008-09-22 Rafael Espindola  <espindola@google.com>

	* lto-symtab.c (get_symbols, add_symbols): Update signature.
	* plugin-api.h: Copy from binutils' cvs.

2008-09-22 Rafael Espindola  <espindola@google.com>

	* common.h (lto_kind_str, lto_visibility_str, lto_resolution_str):
	Make extern

2008-09-10 Rafael Espindola  <espindola@google.com>

	* lto-plugin.c (onload): add missing break statements and asserts.
	* lto-symtab.c (claim_file_handler): Make it static.
	(all_symbols_read_handler): Make it static.
	(all_file_handles): Make it static.
	(num_file_handles): Make it static.
	(register_claim_file): Make it static.
	(register_object): Indent properly.

2008-09-10  Rafael Avila de Espindola  <espindola@google.com>

	* Makefile.am (ltosymtab_LDADD): Add -lelf.
	* Makefiel.in: Regenerate.
	* lto-plugin.c: Include ar.h.
	(claim_file_handler): Handle file->offset != 0.
	* lto-symtab.c: Include gelf.h.
	(all_file_handles): Change type.
	(register_object): New.
	(register_file): Add support for archives.
	(resolve): Update to new type of all_file_handles.
	(print): Update to new type of all_file_handles.
	(free_all): Update to new type of all_file_handles.
	(main): Update to new type of all_file_handles.

2008-09-10  Rafael Avila de Espindola  <espindola@google.com>

	* lto-plugin.c (get_string_table): Remove.
	(get_section): Use elf_strptr instead of get_string_table.

2008-09-08  Doug Kwan  <dougkwan@google.com>

	* lto-plugin.c (all_symbols_read_handler): Widen fprintf arguments
	to 64-bit to fix a 32-bit bootstrap failure due to format warnings.

2008-09-08  Rafael Avila de Espindola  <espindola@google.com>

	* Makefile.am (ltosymtab_SOURCES): add common.c.
	(ltosymtab_CFLAGS): New.
	(liblto_plugin_la_SOURCES): Add common.c.
	* Makefile.in: Regenerate.
	* common.c: New.
	* common.h: New.
	* lto-plugin.c: Include stdio.h, inttypes.h and common.h.
	(plugin_symtab): New.
	(plugin_file_info): New.
	(register_all_symbols_read): New.
	(get_symbols): New.
	(claimed_files): New.
	(num_claimed_files): New.
	(translate): Don't drop the slot number.
	(free_1): New.
	(free_2): New.
	(all_symbols_read_handler): New.
	(claim_file_handler): Record every claimed file.
	(onload): Handle LDPT_REGISTER_ALL_SYMBOLS_READ_HOOK and
	LDPT_GET_SYMBOLS.
	* lto-symtab.c: Include stdlib.h, string.h and common.h.
	(current_file_handle): Remove.
	(ld_plugin_all_symbols_read_handler): New.
	(plugin_handle): New.
	(file_handle): New.
	(all_file_handles): New.
	(num_file_handles): New.
	(get_symbols): New.
	(register_all_symbols_read): New.
	(add_symbols): Don't print the symbols, just record them.
	(ld_plugin_tv): Add LDPT_REGISTER_ALL_SYMBOLS_READ_HOOK and
	LDPT_GET_SYMBOLS.
	(load_plugin): Use plugin_handle.
	(register_file): Add the file handle to all_file_handles.
	(resolve): New.
	(print): New.
	(unload_plugin): New.
	(free_all): New.
	(main): Call all_symbols_read_handler and free resources.

2008-09-03  Rafael Avila de Espindola  <espindola@google.com>

	* Makefile.am (AM_CFLAGS): New.
	(ltosymtab_LDADD): Remove -lelf. Add -ldl.
	(lib_LTLIBRARIES): New.
	(liblto_plugin_la_SOURCES): New.
	(liblto_plugin_la_LIBADD): New.
	* Makefile.in: Regenerate.
	* acinclude.m4: Don't include ../config/acx.m4 and
	../config/no-executables.m4.
	Include ../ltsugar.m4, ../ltoptions.m4, ../ltversion.m4 and
	../libtool.m4.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* configure.ac: Use AM_PROG_LIBTOOL.
	* lto-plugin.c: New.
	* lto-symtab.c: Rewrite to use the plugin.
	* plugin-api.h: New.

2008-08-25  Rafael Avila de Espindola  <espindola@google.com>

	* configure: Regenerate.
	* configure.ac: Use AC_CHECK_GELF.
	* lto-symtab.c: Include gelf.h.
	(get_string_table): Use size independent API.
	(printTable): Use lld to print 64 bit integers.

2008-08-22  Rafael Avila de Espindola  <espindola@google.com>

	* lto-symtab.c (parse_table_entry): Assert entry->kind and
	entry->visibility are valid.

2008-07-22  Rafael Avila de Espindola  <espindola@google.com>
	* lto-symtab.c (table_entry): Add comdat.
	(parse_table_entry): Read comdat.

2008-08-21  Rafael Espindola  <espindola@google.com>

	* Makefile.am: New.
	* Makefile.in: New.
	* acinclude.m4: New.
	* aclocal.m4: New.
	* configure: New.
	* configure.ac: New.
	* lto-symtab.c: New.

diff -rdupN --exclude=.svn --exclude=.git --exclude='*.diff*' --exclude='autom4te*' --exclude=tags --exclude=ChangeLog.lto /usr/local/google/homedirs/dnovillo/gcc/trunk/lto-plugin/Makefile.am /usr/local/google/homedirs/dnovillo/gcc/trunk.lto/lto-plugin/Makefile.am
--- /usr/local/google/homedirs/dnovillo/gcc/trunk/lto-plugin/Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ /usr/local/google/homedirs/dnovillo/gcc/trunk.lto/lto-plugin/Makefile.am	2009-10-03 07:34:20.000000000 -0400
@@ -0,0 +1,19 @@
+# Makefile.am is used by automake 1.11 to generate Makefile.in.
+
+ACLOCAL_AMFLAGS = -I .. -I ../config
+
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+target_noncanonical := @target_noncanonical@
+libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+
+# How to find libelf
+LIBELFLIBS = @LIBELFLIBS@
+LIBELFINC = @LIBELFINC@
+
+AM_CPPFLAGS = -I$(top_srcdir)/../include $(LIBELFINC)
+AM_CFLAGS = -Wall -Werror
+
+libexecsub_LTLIBRARIES = liblto_plugin.la
+
+liblto_plugin_la_SOURCES = lto-plugin.c
+liblto_plugin_la_LIBADD = $(LIBELFLIBS) -L../libiberty/pic -liberty
diff -rdupN --exclude=.svn --exclude=.git --exclude='*.diff*' --exclude='autom4te*' --exclude=tags --exclude=ChangeLog.lto /usr/local/google/homedirs/dnovillo/gcc/trunk/lto-plugin/configure.ac /usr/local/google/homedirs/dnovillo/gcc/trunk.lto/lto-plugin/configure.ac
--- /usr/local/google/homedirs/dnovillo/gcc/trunk/lto-plugin/configure.ac	1969-12-31 19:00:00.000000000 -0500
+++ /usr/local/google/homedirs/dnovillo/gcc/trunk.lto/lto-plugin/configure.ac	2009-10-03 07:34:20.000000000 -0400
@@ -0,0 +1,12 @@
+AC_PREREQ(2.64)
+AC_INIT([LTO plugin for ld], 0.1,,[lto-plugin])
+GCC_TOPLEV_SUBDIRS
+AM_INIT_AUTOMAKE([foreign])
+AC_PROG_CC
+AC_ARG_VAR(LIBELFLIBS,[How to link libelf])
+AC_ARG_VAR(LIBELFINC,[How to find libelf include files])
+AM_PROG_LIBTOOL
+AC_SUBST(target_noncanonical)
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT
+AC_SYS_LARGEFILE
diff -rdupN --exclude=.svn --exclude=.git --exclude='*.diff*' --exclude='autom4te*' --exclude=tags --exclude=ChangeLog.lto /usr/local/google/homedirs/dnovillo/gcc/trunk/lto-plugin/lto-plugin.c /usr/local/google/homedirs/dnovillo/gcc/trunk.lto/lto-plugin/lto-plugin.c
--- /usr/local/google/homedirs/dnovillo/gcc/trunk/lto-plugin/lto-plugin.c	1969-12-31 19:00:00.000000000 -0500
+++ /usr/local/google/homedirs/dnovillo/gcc/trunk.lto/lto-plugin/lto-plugin.c	2009-10-03 07:34:20.000000000 -0400
@@ -0,0 +1,689 @@
+/* LTO plugin for gold.
+   Copyright (C) 2009 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
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+/* The plugin has only one external function: onload. Gold passes it an array of
+   function that the plugin uses to communicate back to gold.
+
+   With the functions provided by gold, the plugin can be notified when
+   gold first analyzes a file and pass a symbol table back to gold. The plugin
+   is also notified when all symbols have been read and it is time to generate
+   machine code for the necessary symbols.
+
+   More information at http://gcc.gnu.org/wiki/whopr/driver.
+
+   This plugin should be passed the lto-wrapper options and will forward them.
+   It also has 2 options of its own:
+   -debug: Print the command line used to run lto-wrapper.
+   -nop: Instead of running lto-wrapper, pass the original to the plugin. This
+   only works if the input files are hybrid.  */
+
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <ar.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdbool.h>
+#include <libiberty.h>
+
+/* The presence of gelf.h is checked by the toplevel configure script.  */
+#include <gelf.h>
+
+#include "plugin-api.h"
+#include "../gcc/lto/common.h"
+
+/* 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 plugin_symtab
+{
+  int nsyms;
+  uint32_t *slots;
+  struct ld_plugin_symbol *syms;
+};
+
+/* All that we have to remember about a file. */
+
+struct plugin_file_info
+{
+  char *name;
+  void *handle;
+  struct plugin_symtab symtab;
+  unsigned char temp;
+};
+
+
+static char *temp_obj_dir_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 struct plugin_file_info *claimed_files = NULL;
+static unsigned int num_claimed_files = 0;
+
+static char **output_files = NULL;
+static unsigned int num_output_files = 0;
+
+static char **lto_wrapper_argv;
+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;
+
+/* 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)
+{
+  unsigned char t;
+  enum ld_plugin_symbol_kind translate_kind[] =
+    {
+      LDPK_DEF,
+      LDPK_WEAKDEF,
+      LDPK_UNDEF,
+      LDPK_WEAKUNDEF,
+      LDPK_COMMON
+    };
+
+  enum ld_plugin_symbol_visibility translate_visibility[] =
+    {
+      LDPV_DEFAULT,
+      LDPV_PROTECTED,
+      LDPV_INTERNAL,
+      LDPV_HIDDEN
+    };
+
+  entry->name = strdup (p);
+  while (*p)
+    p++;
+  p++;
+
+  entry->version = NULL;
+
+  entry->comdat_key = p;
+  while (*p)
+    p++;
+  p++;
+
+  if (strlen (entry->comdat_key) == 0)
+    entry->comdat_key = NULL;
+  else
+    entry->comdat_key = strdup (entry->comdat_key);
+
+  t = *p;
+  assert (t <= 4);
+  entry->def = translate_kind[t];
+  p++;
+
+  t = *p;
+  assert (t <= 3);
+  entry->visibility = translate_visibility[t];
+  p++;
+
+  entry->size = *(uint64_t *) p;
+  p += 8;
+
+  *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. */
+
+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;
+}
+
+/* Translate the IL symbol table SYMTAB. Write the slots and symbols in OUT. */
+
+static void
+translate (Elf_Data *symtab, struct plugin_symtab *out)
+{
+  uint32_t *slots = NULL;
+  char *data = symtab->d_buf;
+  char *end = data + symtab->d_size;
+  struct ld_plugin_symbol *syms = NULL;
+  int n = 0;
+
+  while (data < end)
+    {
+      n++;
+      syms = realloc (syms, n * sizeof (struct ld_plugin_symbol));
+      assert (syms);
+      slots = realloc (slots, n * sizeof (uint32_t));
+      assert (slots);
+      data = parse_table_entry (data, &syms[n - 1], &slots[n - 1]);
+    }
+
+  out->nsyms = n;
+  out->syms = syms;
+  out->slots = slots;
+}
+
+/* Free all memory that is no longer needed at the beginning of all_symbols_read. */
+
+static void
+free_1 (void)
+{
+  unsigned int i;
+  for (i = 0; i < num_claimed_files; i++)
+    {
+      struct plugin_file_info *info = &claimed_files[i];
+      struct plugin_symtab *symtab = &info->symtab;
+      unsigned int j;
+      for (j = 0; j < symtab->nsyms; j++)
+	{
+	  struct ld_plugin_symbol *s = &symtab->syms[j];
+	  free (s->name);
+	  if (s->comdat_key)
+	    free (s->comdat_key);
+	}
+      free (symtab->syms);
+      symtab->syms = NULL;
+    }
+}
+
+/* Free all remaining memory. */
+
+static void
+free_2 (void)
+{
+  unsigned int i;
+  for (i = 0; i < num_claimed_files; i++)
+    {
+      struct plugin_file_info *info = &claimed_files[i];
+      struct plugin_symtab *symtab = &info->symtab;
+      free (symtab->slots);
+      free (info->name);
+    }
+
+  for (i = 0; i < num_output_files; i++)
+    free (output_files[i]);
+  free (output_files);
+
+  free (claimed_files);
+  claimed_files = NULL;
+  num_claimed_files = 0;
+
+  free (temp_obj_dir_name);
+  temp_obj_dir_name = NULL;
+}
+
+/*  Writes the relocations to disk. */
+
+static void
+write_resolution (void)
+{
+  unsigned int i;
+  FILE *f;
+  /* FIXME: Disabled for now since we are not using the resolution file. */
+  return;
+
+
+  /* FIXME: This should be a temporary file. */
+  f = fopen ("resolution", "w");
+
+  fprintf (f, "%d\n", num_claimed_files);
+
+  for (i = 0; i < num_claimed_files; i++)
+    {
+      struct plugin_file_info *info = &claimed_files[i];
+      struct plugin_symtab *symtab = &info->symtab;
+      struct ld_plugin_symbol *syms = calloc (symtab->nsyms,
+					      sizeof (struct ld_plugin_symbol));
+      unsigned j;
+
+      assert (syms);
+      get_symbols (info->handle, symtab->nsyms, syms);
+
+      fprintf (f, "%s %d\n", info->name, info->symtab.nsyms);
+
+      for (j = 0; j < info->symtab.nsyms; j++)
+	{
+	  uint32_t slot = symtab->slots[j];
+	  unsigned int resolution = syms[j].resolution;
+	  fprintf (f, "%d %s\n", slot, lto_resolution_str[resolution]);
+	}
+      free (syms);
+    }
+  fclose (f);
+}
+
+/* Pass files generated by the lto-wrapper to the linker. FD is lto-wrapper's
+   stdout. */
+
+static void
+add_output_files (FILE *f)
+{
+  char fname[1000]; /* FIXME: Is this big enough? */
+
+  for (;;)
+    {
+      size_t len;
+      char *s = fgets (fname, sizeof (fname), f);
+      if (!s)
+	break;
+
+      len = strlen (s);
+      assert (s[len - 1] == '\n');
+      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);
+      add_input_file (output_files[num_output_files - 1]);
+    }
+}
+
+/* Execute the lto-wrapper. ARGV[0] is the binary. The rest of ARGV is the
+   argument list. */
+
+static void
+exec_lto_wrapper (char *argv[])
+{
+  int t;
+  int status;
+  char *at_args;
+  char *args_name;
+  FILE *args;
+  FILE *wrapper_output;
+  char *new_argv[3];
+  struct pex_obj *pex;
+  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);
+  assert (t >= 0);
+
+  args_name = at_args + 1;
+  args = fopen (args_name, "w");
+  assert (args);
+
+  t = writeargv (&argv[1], args);
+  assert (t == 0);
+  t = fclose (args);
+  assert (t == 0);
+
+  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");
+    }
+
+
+  pex = pex_init (PEX_USE_PIPES, "lto-wrapper", NULL);
+  assert (pex != NULL);
+
+  errmsg = pex_run (pex, 0, new_argv[0], new_argv, NULL, NULL, &t);
+  assert (errmsg == NULL);
+  assert (t == 0);
+
+  wrapper_output = pex_read_output (pex, 0);
+  assert (wrapper_output);
+
+  add_output_files (wrapper_output);
+
+  t = pex_get_status (pex, 1, &status);
+  assert (t == 1);
+  assert (WIFEXITED (status) && WEXITSTATUS (status) == 0);
+
+  pex_free (pex);
+
+  t = unlink (args_name);
+  assert (t == 0);
+  free (at_args);
+}
+
+/* Pass the original files back to the linker. */
+
+static void
+use_original_files (void)
+{
+  unsigned i;
+  for (i = 0; i < num_claimed_files; i++)
+    {
+      struct plugin_file_info *info = &claimed_files[i];
+      add_input_file (info->name);
+    }
+}
+
+
+/* Called by the linker once all symbols have been read. */
+
+static enum ld_plugin_status
+all_symbols_read_handler (void)
+{
+  unsigned i;
+  unsigned num_lto_args = num_claimed_files + lto_wrapper_num_args + 1;
+  char **lto_argv;
+  const char **lto_arg_ptr;
+  if (num_claimed_files == 0)
+    return LDPS_OK;
+
+  free_1 ();
+
+  if (nop)
+    {
+      use_original_files ();
+      return LDPS_OK;
+    }
+
+  lto_argv = (char **) calloc (sizeof (char *), num_lto_args);
+  lto_arg_ptr = (const char **) lto_argv;
+  assert (lto_wrapper_argv);
+
+  write_resolution ();
+
+  for (i = 0; i < lto_wrapper_num_args; i++)
+    *lto_arg_ptr++ = lto_wrapper_argv[i];
+
+  for (i = 0; i < num_claimed_files; i++)
+    {
+      struct plugin_file_info *info = &claimed_files[i];
+
+      *lto_arg_ptr++ = info->name;
+    }
+
+  *lto_arg_ptr++ = NULL;
+  exec_lto_wrapper (lto_argv);
+
+  free (lto_argv);
+
+  if (pass_through_items)
+    {
+      unsigned int i;
+      for (i = 0; i < num_pass_through_items; i++)
+        {
+          add_input_file (pass_through_items[i]);
+          free (pass_through_items[i]);
+          pass_through_items[i] = NULL;
+        }
+      free (pass_through_items);
+      pass_through_items = NULL;
+    }
+
+  return LDPS_OK;
+}
+
+/* Remove temporary files at the end of the link. */
+
+static enum ld_plugin_status
+cleanup_handler (void)
+{
+  int t;
+  unsigned i;
+
+  for (i = 0; i < num_claimed_files; i++)
+    {
+      struct plugin_file_info *info = &claimed_files[i];
+      if (info->temp)
+	{
+	  t = unlink (info->name);
+	  assert (t == 0);
+	}
+    }
+  t = rmdir (temp_obj_dir_name);
+  assert (t == 0);
+
+  free_2 ();
+  return LDPS_OK;
+}
+
+/* Callback used by gold to check if the plugin will claim FILE. Writes
+   the result in CLAIMED. */
+
+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_file_info lto_file;
+  Elf_Data *symtab;
+  int lto_file_fd;
+
+  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);
+      assert (t >= 0);
+      objnum++;
+
+      fd = open (objname, O_RDWR | O_CREAT, 0666);
+      assert (fd > 0);
+      offset = lseek (file->fd, file->offset, SEEK_SET);
+      assert (offset == file->offset);
+      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);
+	  assert (written = r);
+	  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;
+    }
+  elf = elf_begin (lto_file_fd, ELF_C_READ, NULL);
+
+  *claimed = 0;
+
+  if (!elf)
+    goto err;
+
+  symtab = get_symtab (elf);
+  if (!symtab)
+    goto err;
+
+  translate (symtab, &lto_file.symtab);
+
+  status = add_symbols (file->handle, lto_file.symtab.nsyms,
+			lto_file.symtab.syms);
+  assert (status == LDPS_OK);
+
+  *claimed = 1;
+  num_claimed_files++;
+  claimed_files =
+    realloc (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);
+      assert (t == 0);
+    }
+  free (lto_file.name);
+
+ cleanup:
+  if (elf)
+    elf_end (elf);
+
+  return LDPS_OK;
+}
+
+/* Parse the plugin options. */
+
+static void
+process_option (const char *option)
+{
+  if (strcmp (option, "-debug") == 0)
+    debug = 1;
+  else if (strcmp (option, "-nop") == 0)
+    nop = 1;
+  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[num_pass_through_items - 1] = strdup (option + strlen ("-pass-through="));
+    }
+  else
+    {
+      int size;
+      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);
+    }
+}
+
+/* Called by gold after loading the plugin. TV is the transfer vector. */
+
+enum ld_plugin_status
+onload (struct ld_plugin_tv *tv)
+{
+  struct ld_plugin_tv *p;
+  enum ld_plugin_status status;
+  char *t;
+
+  unsigned version = elf_version (EV_CURRENT);
+  assert (version != EV_NONE);
+
+  p = tv;
+  while (p->tv_tag)
+    {
+      switch (p->tv_tag)
+	{
+	case LDPT_REGISTER_CLAIM_FILE_HOOK:
+	  register_claim_file = p->tv_u.tv_register_claim_file;
+	  break;
+	case LDPT_ADD_SYMBOLS:
+	  add_symbols = p->tv_u.tv_add_symbols;
+	  break;
+	case LDPT_REGISTER_ALL_SYMBOLS_READ_HOOK:
+	  register_all_symbols_read = p->tv_u.tv_register_all_symbols_read;
+	  break;
+	case LDPT_GET_SYMBOLS:
+	  get_symbols = p->tv_u.tv_get_symbols;
+	  break;
+	case LDPT_REGISTER_CLEANUP_HOOK:
+	  register_cleanup = p->tv_u.tv_register_cleanup;
+	  break;
+	case LDPT_ADD_INPUT_FILE:
+	  add_input_file = p->tv_u.tv_add_input_file;
+	  break;
+	case LDPT_OPTION:
+	  process_option (p->tv_u.tv_string);
+	  break;
+	default:
+	  break;
+	}
+      p++;
+    }
+
+  assert (register_claim_file);
+  assert (add_symbols);
+  status = register_claim_file (claim_file_handler);
+  assert (status == LDPS_OK);
+
+  if (register_cleanup)
+    {
+      status = register_cleanup (cleanup_handler);
+      assert (status == LDPS_OK);
+    }
+
+  if (register_all_symbols_read)
+    {
+      assert (get_symbols);
+      status = register_all_symbols_read (all_symbols_read_handler);
+      assert (status == LDPS_OK);
+    }
+
+  temp_obj_dir_name = strdup ("tmp_objectsXXXXXX");
+  t = mkdtemp (temp_obj_dir_name);
+  assert (t == temp_obj_dir_name);
+  return LDPS_OK;
+}


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]