This is an archive of the discontinued LLVM Phabricator instance.

Differential D14133

[Driver] Accept both -m <emulation> and -m<emulation>
ClosedPublic

Authored by atanasyan on Oct 27 2015, 3:11 PM.

Details

Reviewers
ruiu
• rafael
Commits
rG07fe7a943fb2: [Driver] Accept both -m <emulation> and -m<emulation>
rLLD251497: [Driver] Accept both -m <emulation> and -m<emulation>
rL251497: [Driver] Accept both -m <emulation> and -m<emulation>
Summary

GNU linkers accept both separate and joined variants and at least for MIPS target gcc passes joined variant of the '-m' option.

Diff Detail

Repository
rL LLVM

Event Timeline

atanasyan updated this revision to Diff 38602.Oct 27 2015, 3:11 PM
atanasyan retitled this revision from to [Driver] Accept both -m <emulation> and -m<emulation>.
atanasyan updated this object.
atanasyan added reviewers: ruiu, • rafael.
atanasyan set the repository for this revision to rL LLVM.
atanasyan added a project: lld.
atanasyan added a subscriber: llvm-commits.
Herald added a subscriber: dsanders. · View Herald TranscriptOct 27 2015, 3:11 PM
ruiu accepted this revision.Oct 27 2015, 3:30 PM
ruiu edited edge metadata.

LGTM

This revision is now accepted and ready to land.Oct 27 2015, 3:30 PM
Closed by commit rL251497: [Driver] Accept both -m <emulation> and -m<emulation> (authored by atanasyan). · Explain WhyOct 27 2015, 10:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
ELF/
2 lines
lib/
Driver/
2 lines
test/
elf/
Mips/
2 lines
elf2/
2 lines

Diff 38628

lld/trunk/ELF/Options.td

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Linesdef gc_sections : Flag<["--"], "gc-sections">,
HelpText<"Enable garbage collection of unused sections">; HelpText<"Enable garbage collection of unused sections">;
def init : Separate<["-"], "init">, MetaVarName<"<symbol>">, def init : Separate<["-"], "init">, MetaVarName<"<symbol>">,
HelpText<"Specify an initializer function">; HelpText<"Specify an initializer function">;
def l : JoinedOrSeparate<["-"], "l">, MetaVarName<"<libName>">, def l : JoinedOrSeparate<["-"], "l">, MetaVarName<"<libName>">,
HelpText<"Root name of library to use">; HelpText<"Root name of library to use">;
def m : Separate<["-"], "m">, def m : JoinedOrSeparate<["-"], "m">,
HelpText<"Set target emulation">; HelpText<"Set target emulation">;
def no_allow_shlib_undefined : Flag<["--"], "no-allow-shlib-undefined">; def no_allow_shlib_undefined : Flag<["--"], "no-allow-shlib-undefined">;
def no_as_needed : Flag<["--"], "no-as-needed">; def no_as_needed : Flag<["--"], "no-as-needed">;
def no_whole_archive : Flag<["--"], "no-whole-archive">, def no_whole_archive : Flag<["--"], "no-whole-archive">,
HelpText<"Restores the default behavior of loading archive members">; HelpText<"Restores the default behavior of loading archive members">;
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines

lld/trunk/lib/Driver/GnuLdOptions.td

Show First 20 Lines • Show All 65 Lines • ▼ Show 20 Lines
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// General Options /// General Options
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
def grp_general : OptionGroup<"opts">, def grp_general : OptionGroup<"opts">,
HelpText<"GENERAL OPTIONS">; HelpText<"GENERAL OPTIONS">;
def output : Separate<["-"], "o">, MetaVarName<"<path>">, def output : Separate<["-"], "o">, MetaVarName<"<path>">,
HelpText<"Path to file to write output">, HelpText<"Path to file to write output">,
Group<grp_general>; Group<grp_general>;
def m : Separate<["-"], "m">, MetaVarName<"<emulation>">, def m : JoinedOrSeparate<["-"], "m">, MetaVarName<"<emulation>">,
HelpText<"Select target emulation">, HelpText<"Select target emulation">,
Group<grp_general>; Group<grp_general>;
def build_id : Flag<["--"], "build-id">, def build_id : Flag<["--"], "build-id">,
HelpText<"Request creation of \".note.gnu.build-id\" ELF note section">, HelpText<"Request creation of \".note.gnu.build-id\" ELF note section">,
Group<grp_general>; Group<grp_general>;
def sysroot : Joined<["--"], "sysroot=">, def sysroot : Joined<["--"], "sysroot=">,
HelpText<"Set the system root">, HelpText<"Set the system root">,
Group<grp_general>; Group<grp_general>;
▲ Show 20 Lines • Show All 293 Lines • Show Last 20 Lines

lld/trunk/test/elf/Mips/opt-emulation.test

# Check MIPS specific arguments of the -m command line option. # Check MIPS specific arguments of the -m command line option.
# RUN: yaml2obj -format=elf %s > %t-obj # RUN: yaml2obj -format=elf %s > %t-obj
# RUN: lld -flavor gnu -target mipsel -m elf32ltsmip -o %t-exe %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: 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: Class: 32-bit (0x1)
# LE-O32: DataEncoding: LittleEndian (0x1) # LE-O32: DataEncoding: LittleEndian (0x1)
# LE-O32: FileVersion: 1 # LE-O32: FileVersion: 1
# LE-O32: OS/ABI: SystemV (0x0) # LE-O32: OS/ABI: SystemV (0x0)
# LE-O32: ABIVersion: 1 # LE-O32: ABIVersion: 1
# LE-O32: Machine: EM_MIPS (0x8) # LE-O32: Machine: EM_MIPS (0x8)
# LE-O32: Version: 1 # LE-O32: Version: 1
Show All 28 Lines

lld/trunk/test/elf2/emulation.s

Show First 20 Lines • Show All 112 Lines • ▼ Show 20 Lines
# MIPS-NEXT: ProgramHeaderOffset: 0x34 # MIPS-NEXT: ProgramHeaderOffset: 0x34
# MIPS-NEXT: SectionHeaderOffset: 0x11C # MIPS-NEXT: SectionHeaderOffset: 0x11C
# MIPS-NEXT: Flags [ (0x0) # MIPS-NEXT: Flags [ (0x0)
# MIPS-NEXT: ] # MIPS-NEXT: ]
# RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %tmipsel # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s -o %tmipsel
# RUN: lld -flavor gnu2 -m elf32ltsmip -e _start %tmipsel -o %t2mipsel # RUN: lld -flavor gnu2 -m elf32ltsmip -e _start %tmipsel -o %t2mipsel
# RUN: llvm-readobj -file-headers %t2mipsel | FileCheck --check-prefix=MIPSEL %s # 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: lld -flavor gnu2 %tmipsel -e _start -o %t3mipsel
# RUN: llvm-readobj -file-headers %t3mipsel | FileCheck --check-prefix=MIPSEL %s # RUN: llvm-readobj -file-headers %t3mipsel | FileCheck --check-prefix=MIPSEL %s
# MIPSEL: ElfHeader { # MIPSEL: ElfHeader {
# MIPSEL-NEXT: Ident { # MIPSEL-NEXT: Ident {
# MIPSEL-NEXT: Magic: (7F 45 4C 46) # MIPSEL-NEXT: Magic: (7F 45 4C 46)
# MIPSEL-NEXT: Class: 32-bit (0x1) # MIPSEL-NEXT: Class: 32-bit (0x1)
# MIPSEL-NEXT: DataEncoding: LittleEndian (0x1) # MIPSEL-NEXT: DataEncoding: LittleEndian (0x1)
# MIPSEL-NEXT: FileVersion: 1 # MIPSEL-NEXT: FileVersion: 1
Show All 17 Lines