[lld] 79412d6 - [lld-macho] Ignore `-mllvm` and its argument

[Jez Ng via llvm-commits]

Author: Jez Ng
Date: 2020-09-23T19:26:40-07:00
New Revision: 79412d6ca772c1c3913030cfef4b17f4afac110d

URL: https://github.com/llvm/llvm-project/commit/79412d6ca772c1c3913030cfef4b17f4afac110d
DIFF: https://github.com/llvm/llvm-project/commit/79412d6ca772c1c3913030cfef4b17f4afac110d.diff

LOG: [lld-macho] Ignore `-mllvm` and its argument

Test Plan:

Reviewed By: #lld-macho, compnerd, MaskRay

Differential Revision: https://reviews.llvm.org/D87803

Added: 
    

Modified: 
    lld/MachO/Options.td
    lld/test/MachO/silent-ignore.test

Removed: 
    


################################################################################
diff  --git a/lld/MachO/Options.td b/lld/MachO/Options.td
index ac6424b3f94a..2a05ddf5714d 100644
--- a/lld/MachO/Options.td
+++ b/lld/MachO/Options.td
@@ -857,6 +857,10 @@ def not_for_dyld_shared_cache : Flag<["-"], "not_for_dyld_shared_cache">,
      HelpText<"Prevent system dylibs from being placed into the dylib shared cache">,
      Flags<[HelpHidden]>,
      Group<grp_rare>;
+def mllvm : Separate<["-"], "mllvm">,
+     HelpText<"Options to pass to LLVM">,
+     Flags<[HelpHidden]>,
+     Group<grp_rare>;
 
 def grp_deprecated : OptionGroup<"deprecated">, HelpText<"DEPRECATED">;
 
@@ -1195,10 +1199,6 @@ def mcpu : Flag<["-"], "mcpu">,
      HelpText<"This option is undocumented in ld64">,
      Flags<[HelpHidden]>,
      Group<grp_undocumented>;
-def mllvm : Flag<["-"], "mllvm">,
-     HelpText<"This option is undocumented in ld64">,
-     Flags<[HelpHidden]>,
-     Group<grp_undocumented>;
 def no_compact_unwind : Flag<["-"], "no_compact_unwind">,
      HelpText<"This option is undocumented in ld64">,
      Flags<[HelpHidden]>,

diff  --git a/lld/test/MachO/silent-ignore.test b/lld/test/MachO/silent-ignore.test
index 0d2086386fa8..3ee3b82da602 100644
--- a/lld/test/MachO/silent-ignore.test
+++ b/lld/test/MachO/silent-ignore.test
@@ -5,6 +5,6 @@ RUN:   -no_deduplicate \
 RUN:   -lto_library /lib/foo \
 RUN:   -macosx_version_min 0 \
 RUN:   -dependency_info /path/to/dependency_info.dat \
-RUN:   -syslibroot /path/to/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+RUN:   -mllvm -time-passes
 RUN: not lld -flavor darwinnew -v --not-an-ignored-argument 2>&1 | FileCheck %s
 CHECK: error: unknown argument: --not-an-ignored-argument