rui314/mold
1
1
Fork 0
mirror of https://github.com/rui314/mold.git synced 2024-09-22 10:27:48 +03:00
Code Issues Projects Releases Wiki Activity

temporary

Browse Source
This commit is contained in:
Rui Ueyama 2020-11-22 11:10:38 +09:00
parent 6e45d622b3
commit 1f6c8c1726
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
main.cc
View File

@ -311,8 +311,14 @@ static void check_undefined_symbols() {
for (int j = file->first_global; j < file->elf_syms.size(); j++) { for (int j = file->first_global; j < file->elf_syms.size(); j++) {
const ELF64LE::Sym &esym = file->elf_syms[j]; const ELF64LE::Sym &esym = file->elf_syms[j];
Symbol &sym = *file->symbols[j]; Symbol &sym = *file->symbols[j];
if (esym.isUndefined() && esym.getBinding() != STB_WEAK && bool is_weak = (esym.getBinding() == STB_WEAK);
(!sym.file || sym.is_placeholder)) {
if (esym.isUndefined() && !is_weak && (!sym.file || sym.is_placeholder)) {
has_errors[i] = true;
return;
}
if (esym.isDefined() && !is_weak && sym.file != file) {
has_errors[i] = true; has_errors[i] = true;
return; return;
} }
@ -331,10 +337,16 @@ static void check_undefined_symbols() {
for (int j = file->first_global; j < file->elf_syms.size(); j++) { for (int j = file->first_global; j < file->elf_syms.size(); j++) {
const ELF64LE::Sym &esym = file->elf_syms[j]; const ELF64LE::Sym &esym = file->elf_syms[j];
Symbol &sym = *file->symbols[j]; Symbol &sym = *file->symbols[j];
if (esym.isUndefined() && esym.getBinding() != STB_WEAK && bool is_weak = (esym.getBinding() == STB_WEAK);
(!sym.file || sym.is_placeholder))
if (esym.isUndefined() && !is_weak && (!sym.file || sym.is_placeholder))
llvm::errs() << "undefined symbol: " << toString(file) llvm::errs() << "undefined symbol: " << toString(file)
<< ": " << sym.name << "\n"; << ": " << sym.name << "\n";
if (esym.isDefined() && !is_weak && sym.file != file)
llvm::errs() << "duplicate symbol: " << toString(file)
<< ": " << toString(sym.file) << ": "
<< sym.name << "\n";
} }
} }
@ -762,13 +774,16 @@ int main(int argc, char **argv) {
out::chunks.push_back(out::strtab); out::chunks.push_back(out::strtab);
out::chunks.push_back(out::hash); out::chunks.push_back(out::hash);
// Set priorities to files // Set priorities to files. File priority 1 is reserved for the internal file.
int priority = 1; int priority = 2;
for (ObjectFile *file : out::files) for (ObjectFile *file : out::files)
if (!file->is_in_archive) if (!file->is_in_archive && !file->is_dso)
file->priority = priority++; file->priority = priority++;
for (ObjectFile *file : out::files) for (ObjectFile *file : out::files)
if (file->is_in_archive) if (file->is_in_archive && !file->is_dso)
file->priority = priority++;
for (ObjectFile *file : out::files)
if (file->is_dso)
file->priority = priority++; file->priority = priority++;
// Resolve symbols and fix the set of object files that are // Resolve symbols and fix the set of object files that are
@ -832,7 +847,7 @@ int main(int argc, char **argv) {
// Create a dummy file containing linker-synthesized symbols // Create a dummy file containing linker-synthesized symbols
// (e.g. `__bss_start`). // (e.g. `__bss_start`).
ObjectFile *internal_file = ObjectFile::create_internal_file(); ObjectFile *internal_file = ObjectFile::create_internal_file();
internal_file->priority = priority++; internal_file->priority = 1;
internal_file->resolve_symbols(); internal_file->resolve_symbols();
out::files.push_back(internal_file); out::files.push_back(internal_file);