ELF: Rename Configuration::Static to Bstatic. NFCI.

[pcc]

Summary

The name of this field is a little misleading, partly because it does not
match the name of its command line flag. Rename it to match.

[ruiu]

Maybe we should also update the helptext of Bstatic? It currently says that "Do not link against shared libraries" which doesn't sound like it captures the exact meaning of the option.

[grimar]

In D59333#1428331, @ruiu wrote:

Maybe we should also update the helptext of Bstatic? It currently says that "Do not link against shared libraries" which doesn't sound like it captures the exact meaning of the option.

"Do not search for dynamic libraries when linking"?

lld/ELF/Driver.cpp

227

Not sure if we might want to improve the error reporting here later too.
I guess it would not be clear to understand what is wrong in case of this error.

[MaskRay]

In D59333#1432433, @grimar wrote:

In D59333#1428331, @ruiu wrote:

Maybe we should also update the helptext of Bstatic? It currently says that "Do not link against shared libraries" which doesn't sound like it captures the exact meaning of the option.

"Do not search for dynamic libraries when linking"?

Is it worth mentioning the positional behavior? "Do not search for shared libraries mentioned on the command line after the option"

[grimar]

In D59333#1432442, @MaskRay wrote:

In D59333#1432433, @grimar wrote:

In D59333#1428331, @ruiu wrote:

Maybe we should also update the helptext of Bstatic? It currently says that "Do not link against shared libraries" which doesn't sound like it captures the exact meaning of the option.

"Do not search for dynamic libraries when linking"?

Is it worth mentioning the positional behavior? "Do not search for shared libraries mentioned on the command line after the option"

The default behavior can be restored with -Bdynamic, which makes the wording
"mentioned on the command line after the option" not so precise perhaps?
We do not mention the position for other positional options as far I can see too (like for -as-needed and -whole-archive).

For -whole-archive we have just:
"Force load of all members in a static library."

And then for -no-whole-archive:
"Restores the default behavior of loading archive members."

Maybe use words "disable/enable", i.e change the -Bstatic to
"Disable the lookup of dynamic libraries when linking".

and then -Bdynamic to something like
"Enable the lookup of dynamic libraries when linking (default)"?

[MaskRay]

In D59333#1432520, @grimar wrote:

In D59333#1432442, @MaskRay wrote:

In D59333#1432433, @grimar wrote:

In D59333#1428331, @ruiu wrote:

Maybe we should also update the helptext of Bstatic? It currently says that "Do not link against shared libraries" which doesn't sound like it captures the exact meaning of the option.

"Do not search for dynamic libraries when linking"?

Is it worth mentioning the positional behavior? "Do not search for shared libraries mentioned on the command line after the option"

The default behavior can be restored with -Bdynamic, which makes the wording
"mentioned on the command line after the option" not so precise perhaps?
We do not mention the position for other positional options as far I can see too (like for -as-needed and -whole-archive).

For -whole-archive we have just:
"Force load of all members in a static library."

And then for -no-whole-archive:
"Restores the default behavior of loading archive members."

Maybe use words "disable/enable", i.e change the -Bstatic to
"Disable the lookup of dynamic libraries when linking".

and then -Bdynamic to something like
"Enable the lookup of dynamic libraries when linking (default)"?

SG

Regarding the description

The name of this field is a little misleading, partly because it does not match the name of its command line flag. Rename it to match.

Does not match the name of the compiler option -static?

lld/ELF/Config.h

llvm::MapVector<std::pair<const InputSectionBase *, const InputSectionBase *>,
       CallGraphProfile;
   bool AllowMultipleDefinition;
   bool AllowShlibUndefined;
   bool AndroidPackDynRelocs;
   bool ARMHasBlx = false;
   bool ARMHasMovtMovw = false;
   bool ARMJ1J2BranchEncoding = false;
   bool AsNeeded = false;
+  bool Bstatic = false;
   bool Bsymbolic;
   bool BsymbolicFunctions;
   bool CallGraphProfileSort;
   bool CheckSections;
   bool CompressDebugSections;
   bool Cref;
   bool DefineCommon;
   bool Demangle = true;
struct Configuration {
   bool Pie;
   bool PrintGcSections;
   bool PrintIcfSections;
   bool Relocatable;
   bool RelrPackDynRelocs;
   bool SaveTemps;
   bool SingleRoRx;
   bool Shared;
-  bool Static = false;
   bool SysvHash = false;
   bool Target1Rel;
   bool Trace;
   bool ThinLTOEmitImportsFiles;
   bool ThinLTOIndexOnly;
   bool TocOptimize;
   bool UndefinedVersion;
   bool UseAndroidRelrTags = false;

lld/ELF/Driver.cpp

if (!File->isEmpty() && !File->hasSymbolTable()) {
       return;
     }
 
     // Handle the regular case.
     Files.push_back(make<ArchiveFile>(std::move(File)));
     return;
   }
   case file_magic::elf_shared_object:
-    if (Config->Static || Config->Relocatable) {
+    if (Config->Bstatic || Config->Relocatable) {
       error("attempted static link of dynamic object " + Path);
       return;
     }
 
     // DSOs usually have DT_SONAME tags in their ELF headers, and the
     // sonames are used to identify DSOs. But if they are missing,
     // they are identified by filenames. We don't know whether the new
     // file has a DT_SONAME or not because we haven't parsed it yet.
     // Here, we set the default soname for the file because we might
case OPT_as_needed:
       break;
     case OPT_format:
       Config->FormatBinary = isFormatBinary(Arg->getValue());
       break;
     case OPT_no_as_needed:
       Config->AsNeeded = false;
       break;
     case OPT_Bstatic:
-      Config->Static = true;
+      Config->Bstatic = true;
       break;
     case OPT_Bdynamic:
-      Config->Static = false;
+      Config->Bstatic = false;
       break;
     case OPT_whole_archive:
       InWholeArchive = true;
       break;
     case OPT_no_whole_archive:
       InWholeArchive = false;
       break;
     case OPT_just_symbols:
for (auto *Arg : Args) {
     case OPT_end_lib:
       if (!InLib)
         error("stray --end-lib");
       InLib = false;
       InputFile::IsInGroup = false;
       ++InputFile::NextGroupId;
       break;
     case OPT_push_state:
-      Stack.emplace_back(Config->AsNeeded, Config->Static, InWholeArchive);
+      Stack.emplace_back(Config->AsNeeded, Config->Bstatic, InWholeArchive);
       break;
     case OPT_pop_state:
       if (Stack.empty()) {
         error("unbalanced --push-state/--pop-state");
         break;
       }
-      std::tie(Config->AsNeeded, Config->Static, InWholeArchive) = Stack.back();
+      std::tie(Config->AsNeeded, Config->Bstatic, InWholeArchive) = Stack.back();
       Stack.pop_back();
       break;
     }
   }
 
   if (Files.empty() && errorCount() == 0)
     error("no input files");
 }

lld/ELF/DriverUtils.cpp

 
 // This is for -lfoo. We'll look for libfoo.so or libfoo.a from
 // search paths.
 Optional<std::string> elf::searchLibrary(StringRef Name) {
   if (Name.startswith(":"))
     return findFromSearchPaths(Name.substr(1));
 
   for (StringRef Dir : Config->SearchPaths) {
-    if (!Config->Static)
+    if (!Config->Bstatic)
       if (Optional<std::string> S = findFile(Dir, "lib" + Name + ".so"))
         return S;
     if (Optional<std::string> S = findFile(Dir, "lib" + Name + ".a"))
       return S;
   }
   return None;
 }
 
 // If a linker/version script doesn't exist in the current directory, we also
 // look for the script in the '-L' search paths. This matches the behaviour of
 // '-T', --version-script=, and linker script INPUT() command in ld.bfd.
 Optional<std::string> elf::searchScript(StringRef Name) {
   if (fs::exists(Name))
     return Name.str();
   return findFromSearchPaths(Name);
 }