diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp --- a/lld/MachO/Driver.cpp +++ b/lld/MachO/Driver.cpp @@ -780,6 +780,8 @@ case OPT_grp_ignored: warn("Option `" + opt.getPrefixedName() + "' is ignored."); break; + case OPT_grp_ignored_silently: + break; default: warn("Option `" + opt.getPrefixedName() + "' is not yet implemented. Stay tuned..."); diff --git a/lld/MachO/Options.td b/lld/MachO/Options.td --- a/lld/MachO/Options.td +++ b/lld/MachO/Options.td @@ -1277,10 +1277,6 @@ HelpText<"This option is undocumented in ld64">, Flags<[HelpHidden]>, Group; -def objc_abi_version : Separate<["-"], "objc_abi_version">, - HelpText<"This option is undocumented in ld64">, - Flags<[HelpHidden]>, - Group; def pause : Flag<["-"], "pause">, HelpText<"This option is undocumented in ld64">, Flags<[HelpHidden]>, @@ -1324,3 +1320,10 @@ HelpText<"This option is ignored in ld64">, Flags<[HelpHidden]>, Group; + +def grp_ignored_silently : OptionGroup<"ignored_silently">, HelpText<"IGNORED SILENTLY">; + +def objc_abi_version : Separate<["-"], "objc_abi_version">, + HelpText<"This option only applies to i386 in ld64">, + Flags<[HelpHidden]>, + Group; diff --git a/lld/test/MachO/silent-ignore.s b/lld/test/MachO/silent-ignore.s new file mode 100644 --- /dev/null +++ b/lld/test/MachO/silent-ignore.s @@ -0,0 +1,23 @@ +# REQUIRES: x86 + +# RUN: %lld --version \ +# RUN: -dynamic \ +# RUN: -no_deduplicate \ +# RUN: -lto_library /lib/foo \ +# RUN: -macosx_version_min 0 \ +# RUN: -no_dtrace_dof \ +# RUN: -dependency_info /path/to/dependency_info.dat \ +# RUN: -lto_library ../lib/libLTO.dylib \ +# RUN: -mllvm -time-passes \ +# RUN: -objc_abi_version 2 \ +# RUN: -ios_simulator_version_min 9.0.0 \ +# RUN: -sdk_version 13.2 +# RUN: not %lld -v --not-an-ignored-argument 2>&1 | FileCheck %s +# CHECK: error: unknown argument '--not-an-ignored-argument' + +# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o +# RUN: %lld %t.o -o /dev/null -objc_abi_version 2 + +.globl _main +_main: + ret diff --git a/lld/test/MachO/silent-ignore.test b/lld/test/MachO/silent-ignore.test deleted file mode 100644 --- a/lld/test/MachO/silent-ignore.test +++ /dev/null @@ -1,14 +0,0 @@ -RUN: %lld --version \ -RUN: -dynamic \ -RUN: -no_deduplicate \ -RUN: -lto_library /lib/foo \ -RUN: -macosx_version_min 0 \ -RUN: -no_dtrace_dof \ -RUN: -dependency_info /path/to/dependency_info.dat \ -RUN: -lto_library ../lib/libLTO.dylib \ -RUN: -mllvm -time-passes \ -RUN: -objc_abi_version 2 \ -RUN: -ios_simulator_version_min 9.0.0 \ -RUN: -sdk_version 13.2 -RUN: not %lld -v --not-an-ignored-argument 2>&1 | FileCheck %s -CHECK: error: unknown argument '--not-an-ignored-argument'