Accepting request 775267 from home:marxin:branches:devel:gcc
- Update fix-try_load_plugin.patch to latest version. Patch version: https://sourceware.org/bugzilla/show_bug.cgi?id=25355#c55 OBS-URL: https://build.opensuse.org/request/show/775267 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=333
This commit is contained in:
parent
39ae550e77
commit
769c7a80d0
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 18 16:12:52 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Update fix-try_load_plugin.patch to latest version.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
Tue Feb 18 12:48:26 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From e5310c1cd5735c5dc29988583871be8c59c11cea Mon Sep 17 00:00:00 2001
|
From d9d92bacb7adb4bab0c26eb7458203345a0faf13 Mon Sep 17 00:00:00 2001
|
||||||
From: "H.J. Lu" <hjl.tools@gmail.com>
|
From: "H.J. Lu" <hjl.tools@gmail.com>
|
||||||
Date: Tue, 18 Feb 2020 04:22:34 -0800
|
Date: Tue, 18 Feb 2020 04:22:34 -0800
|
||||||
Subject: [PATCH] plugin: Call dlclose before return in try_load_plugin
|
Subject: [PATCH] plugin: Call dlclose before return in try_load_plugin
|
||||||
@ -10,11 +10,11 @@ before return.
|
|||||||
* plugin.c (plugin_list_entry): Remove handle.
|
* plugin.c (plugin_list_entry): Remove handle.
|
||||||
(try_load_plugin): Call dlclose before return.
|
(try_load_plugin): Call dlclose before return.
|
||||||
---
|
---
|
||||||
bfd/plugin.c | 43 ++++++++++++++++++-------------------------
|
bfd/plugin.c | 39 ++++++++++++++++++---------------------
|
||||||
1 file changed, 18 insertions(+), 25 deletions(-)
|
1 file changed, 18 insertions(+), 21 deletions(-)
|
||||||
|
|
||||||
diff --git a/bfd/plugin.c b/bfd/plugin.c
|
diff --git a/bfd/plugin.c b/bfd/plugin.c
|
||||||
index 47c3439042c..84b96a20733 100644
|
index 47c3439042..93d562b9fe 100644
|
||||||
--- a/bfd/plugin.c
|
--- a/bfd/plugin.c
|
||||||
+++ b/bfd/plugin.c
|
+++ b/bfd/plugin.c
|
||||||
@@ -126,7 +126,6 @@ message (int level ATTRIBUTE_UNUSED,
|
@@ -126,7 +126,6 @@ message (int level ATTRIBUTE_UNUSED,
|
||||||
@ -25,7 +25,7 @@ index 47c3439042c..84b96a20733 100644
|
|||||||
ld_plugin_claim_file_handler claim_file;
|
ld_plugin_claim_file_handler claim_file;
|
||||||
ld_plugin_all_symbols_read_handler all_symbols_read;
|
ld_plugin_all_symbols_read_handler all_symbols_read;
|
||||||
ld_plugin_all_symbols_read_handler cleanup_handler;
|
ld_plugin_all_symbols_read_handler cleanup_handler;
|
||||||
@@ -596,22 +595,12 @@ try_load_plugin (const char *pname,
|
@@ -596,22 +595,18 @@ try_load_plugin (const char *pname,
|
||||||
struct plugin_list_entry *plugin_list_iter,
|
struct plugin_list_entry *plugin_list_iter,
|
||||||
bfd *abfd, bfd_boolean build_list_p)
|
bfd *abfd, bfd_boolean build_list_p)
|
||||||
{
|
{
|
||||||
@ -35,10 +35,11 @@ index 47c3439042c..84b96a20733 100644
|
|||||||
int i;
|
int i;
|
||||||
ld_plugin_onload onload;
|
ld_plugin_onload onload;
|
||||||
enum ld_plugin_status status;
|
enum ld_plugin_status status;
|
||||||
-
|
+ int result = 0;
|
||||||
- /* NB: Each object is independent. Reuse the previous plugin from
|
|
||||||
- the last run will lead to wrong result. */
|
/* NB: Each object is independent. Reuse the previous plugin from
|
||||||
- if (current_plugin)
|
the last run will lead to wrong result. */
|
||||||
|
if (current_plugin)
|
||||||
- {
|
- {
|
||||||
- if (current_plugin->handle)
|
- if (current_plugin->handle)
|
||||||
- dlclose (current_plugin->handle);
|
- dlclose (current_plugin->handle);
|
||||||
@ -46,11 +47,12 @@ index 47c3439042c..84b96a20733 100644
|
|||||||
- offsetof (struct plugin_list_entry, next));
|
- offsetof (struct plugin_list_entry, next));
|
||||||
- current_plugin = NULL;
|
- current_plugin = NULL;
|
||||||
- }
|
- }
|
||||||
+ int result = 0;
|
+ memset (current_plugin, 0,
|
||||||
|
+ offsetof (struct plugin_list_entry, next));
|
||||||
|
|
||||||
if (plugin_list_iter)
|
if (plugin_list_iter)
|
||||||
pname = plugin_list_iter->plugin_name;
|
pname = plugin_list_iter->plugin_name;
|
||||||
@@ -628,12 +617,12 @@ try_load_plugin (const char *pname,
|
@@ -628,12 +623,12 @@ try_load_plugin (const char *pname,
|
||||||
size_t length_plugin_name = strlen (pname) + 1;
|
size_t length_plugin_name = strlen (pname) + 1;
|
||||||
char *plugin_name = bfd_malloc (length_plugin_name);
|
char *plugin_name = bfd_malloc (length_plugin_name);
|
||||||
if (plugin_name == NULL)
|
if (plugin_name == NULL)
|
||||||
@ -65,7 +67,7 @@ index 47c3439042c..84b96a20733 100644
|
|||||||
}
|
}
|
||||||
/* Make a copy of PNAME since PNAME from load_plugin () will be
|
/* Make a copy of PNAME since PNAME from load_plugin () will be
|
||||||
freed. */
|
freed. */
|
||||||
@@ -644,13 +633,13 @@ try_load_plugin (const char *pname,
|
@@ -644,13 +639,13 @@ try_load_plugin (const char *pname,
|
||||||
plugin_list = plugin_list_iter;
|
plugin_list = plugin_list_iter;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,7 +84,7 @@ index 47c3439042c..84b96a20733 100644
|
|||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
tv[i].tv_tag = LDPT_MESSAGE;
|
tv[i].tv_tag = LDPT_MESSAGE;
|
||||||
@@ -703,28 +692,32 @@ try_load_plugin (const char *pname,
|
@@ -703,28 +698,30 @@ try_load_plugin (const char *pname,
|
||||||
tv[i].tv_tag = LDPT_NULL;
|
tv[i].tv_tag = LDPT_NULL;
|
||||||
tv[i].tv_u.tv_val = 0;
|
tv[i].tv_u.tv_val = 0;
|
||||||
|
|
||||||
@ -115,8 +117,6 @@ index 47c3439042c..84b96a20733 100644
|
|||||||
+ result = 1;
|
+ result = 1;
|
||||||
+
|
+
|
||||||
+short_circuit:
|
+short_circuit:
|
||||||
+ /* NB: Each object is independent. Reuse the previous plugin from
|
|
||||||
+ the last run will lead to wrong result. */
|
|
||||||
+ dlclose (plugin_handle);
|
+ dlclose (plugin_handle);
|
||||||
+ return result;
|
+ return result;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user