From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 75EAF38582B9; Fri, 8 Jul 2022 08:01:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 75EAF38582B9 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/lto-plugin-get_symbols_v3-v4)] lto-plugin: implement LDPT_GET_API_VERSION X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/lto-plugin-get_symbols_v3-v4 X-Git-Oldrev: d89fa97ff318b1f892e2629c5a249313872a01b1 X-Git-Newrev: c105ee05439929f1c1fd22d15f56cf398b5a8a0d Message-Id: <20220708080131.75EAF38582B9@sourceware.org> Date: Fri, 8 Jul 2022 08:01:31 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jul 2022 08:01:31 -0000 https://gcc.gnu.org/g:c105ee05439929f1c1fd22d15f56cf398b5a8a0d commit c105ee05439929f1c1fd22d15f56cf398b5a8a0d Author: Martin Liska Date: Mon May 16 14:01:52 2022 +0200 lto-plugin: implement LDPT_GET_API_VERSION include/ChangeLog: * plugin-api.h (enum linker_api_version): New enum. (ld_plugin_get_api_version): New. (enum ld_plugin_tag): Add LDPT_GET_API_VERSION. (struct ld_plugin_tv): Add tv_get_api_version. lto-plugin/ChangeLog: * lto-plugin.c (negotiate_api_version): New. (onload): Negotiate API version. * Makefile.am: Add -DBASE_VERSION. * Makefile.in: Regenerate. Diff: --- include/plugin-api.h | 32 ++++++++++++++++++++++++++++++++ lto-plugin/Makefile.am | 2 +- lto-plugin/Makefile.in | 2 +- lto-plugin/lto-plugin.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/include/plugin-api.h b/include/plugin-api.h index 8aebe2ff267..1deda680081 100644 --- a/include/plugin-api.h +++ b/include/plugin-api.h @@ -483,6 +483,36 @@ enum ld_plugin_level LDPL_FATAL }; +/* Contract between a plug-in and a linker. */ + +enum linker_api_version +{ + /* The linker/plugin do not implement any of the API levels below, the API + is determined solely via the transfer vector. */ + LAPI_UNSPECIFIED = 0, + + /* API level v1. The linker provides get_symbols_v3, add_symbols_v2, + the plugin will use that and not any lower versions. + claim_file is thread-safe on the plugin side and + add_symbols on the linker side. */ + LAPI_V1 = 1 +}; + +/* The linker's interface for API version negotiation. A plug-in calls + the function (with its IDENTIFIER and VERSION), plus minimal and maximal + version of linker_api_version is provided. Linker then returns selected + API version and provides its IDENTIFIER and VERSION. + Identifier pointers remain valid as long as the plugin is loaded. */ + +typedef +enum linker_api_version +(*ld_plugin_get_api_version) (const char *plugin_identifier, + const char *plugin_version, + enum linker_api_version minimal_api_supported, + enum linker_api_version maximal_api_supported, + const char **linker_identifier, + const char **linker_version); + /* Values for the tv_tag field of the transfer vector. */ enum ld_plugin_tag @@ -521,6 +551,7 @@ enum ld_plugin_tag LDPT_REGISTER_NEW_INPUT_HOOK, LDPT_GET_WRAP_SYMBOLS, LDPT_ADD_SYMBOLS_V2, + LDPT_GET_API_VERSION, }; /* The plugin transfer vector. */ @@ -556,6 +587,7 @@ struct ld_plugin_tv ld_plugin_get_input_section_size tv_get_input_section_size; ld_plugin_register_new_input tv_register_new_input; ld_plugin_get_wrap_symbols tv_get_wrap_symbols; + ld_plugin_get_api_version tv_get_api_version; } tv_u; }; diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am index 81362eafc36..482946e4dd5 100644 --- a/lto-plugin/Makefile.am +++ b/lto-plugin/Makefile.am @@ -8,7 +8,7 @@ target_noncanonical := @target_noncanonical@ libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix) AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) -AM_CFLAGS = @ac_lto_plugin_warn_cflags@ $(CET_HOST_FLAGS) +AM_CFLAGS = @ac_lto_plugin_warn_cflags@ $(CET_HOST_FLAGS) -DBASE_VERSION='"$(gcc_version)"' # The plug-in depends on pthreads. AM_LDFLAGS = -pthread @ac_lto_plugin_ldflags@ AM_LIBTOOLFLAGS = --tag=disable-static diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in index 2033dd9b7c2..9453bc7d607 100644 --- a/lto-plugin/Makefile.in +++ b/lto-plugin/Makefile.in @@ -343,7 +343,7 @@ AUTOMAKE_OPTIONS = no-dependencies gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix) AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) -AM_CFLAGS = @ac_lto_plugin_warn_cflags@ $(CET_HOST_FLAGS) +AM_CFLAGS = @ac_lto_plugin_warn_cflags@ $(CET_HOST_FLAGS) -DBASE_VERSION='"$(gcc_version)"' # The plug-in depends on pthreads. AM_LDFLAGS = -pthread @ac_lto_plugin_ldflags@ AM_LIBTOOLFLAGS = --tag=disable-static diff --git a/lto-plugin/lto-plugin.c b/lto-plugin/lto-plugin.c index 7927dca60a4..aad17b403e1 100644 --- a/lto-plugin/lto-plugin.c +++ b/lto-plugin/lto-plugin.c @@ -180,6 +180,10 @@ 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, add_symbols_v2; +static ld_plugin_get_api_version get_api_version; + +/* By default, use version LAPI_UNSPECIFIED if there is not negotiation. */ +static enum linker_api_version api_version = LAPI_UNSPECIFIED; static struct plugin_file_info *claimed_files = NULL; static unsigned int num_claimed_files = 0; @@ -1428,6 +1432,38 @@ process_option (const char *option) verbose = verbose || debug; } +/* Negotiate linker API version. */ + +static void +negotiate_api_version (void) +{ + const char *linker_identifier; + const char *linker_version; + + enum linker_api_version supported_api = LAPI_UNSPECIFIED; +#if HAVE_PTHREAD_LOCKING + supported_api = LAPI_V1; +#endif + + api_version = get_api_version ("GCC", BASE_VERSION, LAPI_UNSPECIFIED, + supported_api, &linker_identifier, &linker_version); + + switch (api_version) + { + case LAPI_UNSPECIFIED: + break; + case LAPI_V1: + check (get_symbols_v3, LDPL_FATAL, + "get_symbols_v3 required for API version 1"); + check (add_symbols_v2, LDPL_FATAL, + "add_symbols_v2 required for API version 1"); + break; + default: + fprintf (stderr, "unsupported API version\n"); + abort (); + } +} + /* Called by a linker after loading the plugin. TV is the transfer vector. */ enum ld_plugin_status @@ -1496,12 +1532,18 @@ onload (struct ld_plugin_tv *tv) /* We only use this to make user-friendly temp file names. */ link_output_name = p->tv_u.tv_string; break; + case LDPT_GET_API_VERSION: + get_api_version = p->tv_u.tv_get_api_version; + break; default: break; } p++; } + if (get_api_version) + negotiate_api_version (); + check (register_claim_file, LDPL_FATAL, "register_claim_file not found"); check (add_symbols, LDPL_FATAL, "add_symbols not found"); status = register_claim_file (claim_file_handler);