mirror of
https://github.com/rui314/mold.git
synced 2024-11-14 07:18:42 +03:00
temporary
This commit is contained in:
parent
a6f24a830a
commit
d32ec60c8e
@ -212,9 +212,6 @@ private:
|
||||
std::atomic_flag &lock;
|
||||
};
|
||||
|
||||
std::atomic_int do_not_skip;
|
||||
std::atomic_int skip;
|
||||
|
||||
void ObjectFile::register_defined_symbols() {
|
||||
for (int i = 0; i < symbols.size(); i++) {
|
||||
const ELF64LE::Sym &esym = elf_syms[first_global + i];
|
||||
@ -231,18 +228,15 @@ void ObjectFile::register_defined_symbols() {
|
||||
isec = sections[shndx];
|
||||
|
||||
bool is_weak = (esym.getBinding() == STB_WEAK);
|
||||
Spinlock lock(sym.lock);
|
||||
std::lock_guard lock(sym.mu);
|
||||
|
||||
if (!sym.file || this->priority < sym.file->priority ||
|
||||
(sym.is_weak && !is_weak)) {
|
||||
do_not_skip++;
|
||||
sym.file = this;
|
||||
sym.input_section = isec;
|
||||
sym.value = esym.st_value;
|
||||
sym.visibility = esym.getVisibility();
|
||||
sym.is_weak = is_weak;
|
||||
} else {
|
||||
skip++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
7
main.cc
7
main.cc
@ -435,13 +435,6 @@ int main(int argc, char **argv) {
|
||||
});
|
||||
}
|
||||
|
||||
{
|
||||
extern std::atomic_int do_not_skip;
|
||||
extern std::atomic_int skip;
|
||||
llvm::outs() << "do_not_skip=" << do_not_skip
|
||||
<< " skip=" << skip << "\n";
|
||||
}
|
||||
|
||||
// Eliminate unused archive members.
|
||||
files.erase(std::remove_if(files.begin(), files.end(),
|
||||
[](ObjectFile *file){ return !file->is_alive; }),
|
||||
|
3
mold.h
3
mold.h
@ -21,6 +21,7 @@
|
||||
#include "tbb/parallel_reduce.h"
|
||||
#include "tbb/parallel_sort.h"
|
||||
#include "tbb/partitioner.h"
|
||||
#include "tbb/spin_mutex.h"
|
||||
#include "tbb/task_arena.h"
|
||||
#include "tbb/task_group.h"
|
||||
|
||||
@ -164,7 +165,7 @@ public:
|
||||
return map.insert(name, Symbol(name));
|
||||
}
|
||||
|
||||
std::atomic_flag lock = ATOMIC_FLAG_INIT;
|
||||
tbb::spin_mutex mu;
|
||||
StringRef name;
|
||||
ObjectFile *file = nullptr;
|
||||
InputSection *input_section = nullptr;
|
||||
|
Loading…
Reference in New Issue
Block a user