Revert: 35fd2ddeb1d90f1750401cfb6d01fe055656b88d

  PR 20814

1 files changed, 9 insertions, 3 deletions

diff --git a/ld/plugin.c b/ld/plugin.c
index 13d29d6..8107841 100644
--- a/ld/plugin.c
+++ b/ld/plugin.c
@@ -928,7 +928,7 @@ add_input_file (const char *pathname)
 			    NULL);
   if (!is)
     return LDPS_ERR;
-  is->flags.lto_output = 1;
+  is->plugin = called_plugin;
   return LDPS_OK;
 }
 
@@ -943,17 +943,23 @@ add_input_library (const char *pathname)
 			    NULL);
   if (!is)
     return LDPS_ERR;
-  is->flags.lto_output = 1;
+  is->plugin = called_plugin;
   return LDPS_OK;
 }
 
 /* Set the extra library path to be used by libraries added via
    add_input_library.  */
+
 static enum ld_plugin_status
 set_extra_library_path (const char *path)
 {
+  search_dirs_type * sdt;
+
   ASSERT (called_plugin);
-  ldfile_add_library_path (xstrdup (path), false);
+  sdt = ldfile_add_library_path (xstrdup (path), search_dir_plugin);
+  if (sdt == NULL)
+    return LDPS_ERR;
+  sdt->plugin = called_plugin;
   return LDPS_OK;
 }