From 177f7bcee86e478099a804a08a9fa5ce2fdb5fc5 Mon Sep 17 00:00:00 2001 From: George Rimar Date: Thu, 17 Mar 2016 11:00:27 +0000 Subject: [PATCH] Avoid using braces. NFC. llvm-svn: 263707 --- lld/ELF/Driver.cpp | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index eff2e8d..68dce6f 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -351,30 +351,27 @@ template void LinkerDriver::link(opt::InputArgList &Args) { Config->Rela = ELFT::Is64Bits; + // Add entry symbol. + // There is no entry symbol for AMDGPU binaries, so skip adding one to avoid + // having and undefined symbol. if (Config->Entry.empty() && !Config->Shared && !Config->Relocatable && - Config->EMachine != EM_AMDGPU) { - // Add entry symbol. - // - // There is no entry symbol for AMDGPU binaries, so skip adding one to avoid - // having and undefined symbol. + Config->EMachine != EM_AMDGPU) Config->Entry = Config->EMachine == EM_MIPS ? "__start" : "_start"; - } - if (!Config->Relocatable) { - // In the assembly for 32 bit x86 the _GLOBAL_OFFSET_TABLE_ symbol - // is magical and is used to produce a R_386_GOTPC relocation. - // The R_386_GOTPC relocation value doesn't actually depend on the - // symbol value, so it could use an index of STN_UNDEF which, according - // to the spec, means the symbol value is 0. - // Unfortunately both gas and MC keep the _GLOBAL_OFFSET_TABLE_ symbol in - // the object file. - // The situation is even stranger on x86_64 where the assembly doesn't - // need the magical symbol, but gas still puts _GLOBAL_OFFSET_TABLE_ as - // an undefined symbol in the .o files. - // Given that the symbol is effectively unused, we just create a dummy - // hidden one to avoid the undefined symbol error. + // In the assembly for 32 bit x86 the _GLOBAL_OFFSET_TABLE_ symbol + // is magical and is used to produce a R_386_GOTPC relocation. + // The R_386_GOTPC relocation value doesn't actually depend on the + // symbol value, so it could use an index of STN_UNDEF which, according + // to the spec, means the symbol value is 0. + // Unfortunately both gas and MC keep the _GLOBAL_OFFSET_TABLE_ symbol in + // the object file. + // The situation is even stranger on x86_64 where the assembly doesn't + // need the magical symbol, but gas still puts _GLOBAL_OFFSET_TABLE_ as + // an undefined symbol in the .o files. + // Given that the symbol is effectively unused, we just create a dummy + // hidden one to avoid the undefined symbol error. + if (!Config->Relocatable) Symtab.addIgnored("_GLOBAL_OFFSET_TABLE_"); - } if (!Config->Entry.empty()) { // Set either EntryAddr (if S is a number) or EntrySym (otherwise). -- 2.7.4