aboutsummaryrefslogtreecommitdiff
path: root/gold/archive.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gold/archive.cc')
-rw-r--r--gold/archive.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/gold/archive.cc b/gold/archive.cc
index 36e4862..202fc2c8e 100644
--- a/gold/archive.cc
+++ b/gold/archive.cc
@@ -853,11 +853,7 @@ Archive::include_member(Symbol_table* symtab, Layout* layout,
&& this->searched_for()
&& obj == NULL
&& unconfigured)
- {
- if (obj != NULL)
- delete obj;
- return false;
- }
+ return false;
if (obj == NULL)
return true;
@@ -874,7 +870,13 @@ Archive::include_member(Symbol_table* symtab, Layout* layout,
}
if (!input_objects->add_object(obj))
- delete obj;
+ {
+ // If this is an external member of a thin archive, unlock the
+ // file.
+ if (obj->offset() == 0)
+ obj->unlock(this->task_);
+ delete obj;
+ }
else
{
{