diff options
| -rw-r--r-- | lld/ELF/Options.td | 2 | ||||
| -rw-r--r-- | lld/lib/Driver/GnuLdOptions.td | 2 | ||||
| -rw-r--r-- | lld/test/elf/Mips/opt-emulation.test | 2 | ||||
| -rw-r--r-- | lld/test/elf2/emulation.s | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/lld/ELF/Options.td b/lld/ELF/Options.td index 25b50d89543..4cac5b65fee 100644 --- a/lld/ELF/Options.td +++ b/lld/ELF/Options.td @@ -60,7 +60,7 @@ def init : Separate<["-"], "init">, MetaVarName<"<symbol>">, def l : JoinedOrSeparate<["-"], "l">, MetaVarName<"<libName>">, HelpText<"Root name of library to use">; -def m : Separate<["-"], "m">, +def m : JoinedOrSeparate<["-"], "m">, HelpText<"Set target emulation">; def no_allow_shlib_undefined : Flag<["--"], "no-allow-shlib-undefined">; diff --git a/lld/lib/Driver/GnuLdOptions.td b/lld/lib/Driver/GnuLdOptions.td index b3c3d90c168..02a4d1ad9a3 100644 --- a/lld/lib/Driver/GnuLdOptions.td +++ b/lld/lib/Driver/GnuLdOptions.td @@ -71,7 +71,7 @@ def grp_general : OptionGroup<"opts">, def output : Separate<["-"], "o">, MetaVarName<"<path>">, HelpText<"Path to file to write output">, Group<grp_general>; -def m : Separate<["-"], "m">, MetaVarName<"<emulation>">, +def m : JoinedOrSeparate<["-"], "m">, MetaVarName<"<emulation>">, HelpText<"Select target emulation">, Group<grp_general>; def build_id : Flag<["--"], "build-id">, diff --git a/lld/test/elf/Mips/opt-emulation.test b/lld/test/elf/Mips/opt-emulation.test index caf9c81793a..32315c44b31 100644 --- a/lld/test/elf/Mips/opt-emulation.test +++ b/lld/test/elf/Mips/opt-emulation.test @@ -3,6 +3,8 @@ # RUN: yaml2obj -format=elf %s > %t-obj # RUN: lld -flavor gnu -target mipsel -m elf32ltsmip -o %t-exe %t-obj # RUN: llvm-readobj -file-headers %t-exe | FileCheck -check-prefix=LE-O32 %s +# RUN: lld -flavor gnu -target mipsel -melf32ltsmip -o %t-exe %t-obj +# RUN: llvm-readobj -file-headers %t-exe | FileCheck -check-prefix=LE-O32 %s # LE-O32: Class: 32-bit (0x1) # LE-O32: DataEncoding: LittleEndian (0x1) diff --git a/lld/test/elf2/emulation.s b/lld/test/elf2/emulation.s index 64bbbc457b8..e3f40622380 100644 --- a/lld/test/elf2/emulation.s +++ b/lld/test/elf2/emulation.s @@ -118,6 +118,8 @@ # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %tmipsel # RUN: lld -flavor gnu2 -m elf32ltsmip -e _start %tmipsel -o %t2mipsel # RUN: llvm-readobj -file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s +# RUN: lld -flavor gnu2 -melf32ltsmip -e _start %tmipsel -o %t2mipsel +# RUN: llvm-readobj -file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s # RUN: lld -flavor gnu2 %tmipsel -e _start -o %t3mipsel # RUN: llvm-readobj -file-headers %t3mipsel | FileCheck --check-prefix=MIPSEL %s # MIPSEL: ElfHeader { |
