[PATCH] D98066: [lld-macho] Move a bunch of options into the "obsolete" category

[Jez Ng via Phabricator via llvm-commits]

int3 created this revision.
int3 added a reviewer: lld-macho.
Herald added a subscriber: dang.
Herald added a project: lld-macho.
int3 requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

These are mostly things that ld64 has itself marked obselete.
In the case of `-sectorder`, it's suggested in ld64's manpage that it
could be deprecated, so let's skip implementing it for now.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D98066

Files:
  lld/MachO/Options.td


Index: lld/MachO/Options.td
===================================================================
--- lld/MachO/Options.td
+++ lld/MachO/Options.td
@@ -202,11 +202,6 @@
      MetaVarName<"<file>">,
      HelpText<"Layout functions and data according to specification in <file>">,
      Group<grp_opts>;
-def sectorder : MultiArg<["-"], "sectorder", 3>,
-     MetaVarName<"<segname> <sectname> <orderfile>">,
-     HelpText<"Replaced by more general -order_file option">,
-     Flags<[HelpHidden]>,
-     Group<grp_opts>;
 def no_order_inits : Flag<["-"], "no_order_inits">,
      HelpText<"Disable default reordering of initializer and terminator functions">,
      Flags<[HelpHidden]>,
@@ -806,10 +801,6 @@
      HelpText<"Specify <current_path> as different from where a dylib normally resides at <install_path>">,
      Flags<[HelpHidden]>,
      Group<grp_rare>;
-def prebind : Flag<["-"], "prebind">,
-     HelpText<"This option is obsolete">,
-     Flags<[HelpHidden]>,
-     Group<grp_rare>;
 def weak_reference_mismatches : Separate<["-"], "weak_reference_mismatches">,
      MetaVarName<"<treatment>">,
      HelpText<"Resolve symbol imports of conflicting weakness according to <treatment> as weak, non-weak, or error (default is non-weak)">,
@@ -849,10 +840,6 @@
      HelpText<"Augment error and warning messages with the architecture name">,
      Flags<[HelpHidden]>,
      Group<grp_rare>;
-def twolevel_namespace_hints : Flag<["-"], "twolevel_namespace_hints">,
-     HelpText<"This option is obsolete">,
-     Flags<[HelpHidden]>,
-     Group<grp_rare>;
 def dot : Separate<["-"], "dot">,
      MetaVarName<"<path>">,
      HelpText<"Write a graph of symbol dependencies to <path> as a .dot file viewable with GraphViz">,
@@ -874,10 +861,6 @@
      HelpText<"On i386, make the __IMPORT segment of a final linked image read-only">,
      Flags<[HelpHidden]>,
      Group<grp_rare>;
-def slow_stubs : Flag<["-"], "slow_stubs">,
-     HelpText<"This option is obsolete">,
-     Flags<[HelpHidden]>,
-     Group<grp_rare>;
 def interposable_list : Separate<["-"], "interposable_list">,
      MetaVarName<"<path>">,
      HelpText<"Access global symbols listed in <path> indirectly">,
@@ -895,10 +878,6 @@
      MetaVarName<"<path>">,
      HelpText<"Retain any temporary mach-o file in <path> that would otherwise be deleted during LTO">,
      Group<grp_rare>;
-def lto_library : Separate<["-"], "lto_library">,
-     MetaVarName<"<path>">,
-     HelpText<"Deprecated & ignored. LLD supports LTO directly, without using an external dylib.">,
-     Group<grp_rare>;
 def cache_path_lto : Separate<["-"], "cache_path_lto">,
      MetaVarName<"<path>">,
      HelpText<"Use <path> as a directory for the incremental LTO cache">,
@@ -966,6 +945,14 @@
 
 def grp_obsolete : OptionGroup<"obsolete">, HelpText<"OBSOLETE">;
 
+def sectorder : MultiArg<["-"], "sectorder", 3>,
+     MetaVarName<"<segname> <sectname> <orderfile>">,
+     HelpText<"Obsolete. Replaced by more general -order_file option">,
+     Group<grp_obsolete>;
+def lto_library : Separate<["-"], "lto_library">,
+     MetaVarName<"<path>">,
+     HelpText<"Obsolete. LLD supports LTO directly, without using an external dylib.">,
+     Group<grp_obsolete>;
 def y : Joined<["-"], "y">,
      MetaVarName<"<symbol>">,
      HelpText<"This option is obsolete in ld64">,
@@ -1094,6 +1081,18 @@
      HelpText<"This option is obsolete in ld64">,
      Flags<[HelpHidden]>,
      Group<grp_obsolete>;
+def prebind : Flag<["-"], "prebind">,
+     HelpText<"This option is obsolete in ld64">,
+     Flags<[HelpHidden]>,
+     Group<grp_obsolete>;
+def twolevel_namespace_hints : Flag<["-"], "twolevel_namespace_hints">,
+     HelpText<"This option is obsolete in ld64">,
+     Flags<[HelpHidden]>,
+     Group<grp_obsolete>;
+def slow_stubs : Flag<["-"], "slow_stubs">,
+     HelpText<"This option is obsolete in ld64">,
+     Flags<[HelpHidden]>,
+     Group<grp_obsolete>;
 
 def grp_undocumented : OptionGroup<"undocumented">, HelpText<"UNDOCUMENTED">;
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D98066.328607.patch
Type: text/x-patch
Size: 4025 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210305/e638eed9/attachment.bin>