This is an archive of the discontinued LLVM Phabricator instance.

Differential D50105

Allow oformat option to accept elf format
ClosedPublic

Authored by rdhindsa on Jul 31 2018, 2:34 PM.

Details

Reviewers
ruiu
• espindola
Commits
rG9d9113fc13fe: Allow oformat to accept format starting with elf as acceptable format.
rL338445: Allow oformat to accept format starting with elf as acceptable format.
rLLD338445: Allow oformat to accept format starting with elf as acceptable format.
Summary

Allow oformat to accept format starting with elf as acceptable format. isOutputFormatBinary returns false in such case.
Example: --oformat elf64-x86-64

Diff Detail

Repository
rLLD LLVM Linker

Event Timeline

rdhindsa created this revision.Jul 31 2018, 2:34 PM
Herald added a reviewer: • espindola. · View Herald TranscriptJul 31 2018, 2:34 PM
Herald added subscribers: llvm-commits, arichardson, emaste. · View Herald Transcript
ruiu added inline comments.Jul 31 2018, 2:37 PM
lld/test/ELF/oformat-elf.s
7 ↗(On Diff #158388)

I don't think you have to verify the output because -oformat elf is essentially ignored. Please add one test line like this

  1. RUN: ld.lld -o /dev/null %t --oformat elf

to oformat-binary.s to verify that the command succeeds to complete.

rdhindsa updated this revision to Diff 158390.Jul 31 2018, 2:44 PM
rdhindsa marked an inline comment as done.
ruiu accepted this revision.Jul 31 2018, 2:51 PM

LGTM

This revision is now accepted and ready to land.Jul 31 2018, 2:51 PM
Closed by commit rLLD338445: Allow oformat to accept format starting with elf as acceptable format. (authored by rdhindsa). · Explain WhyJul 31 2018, 2:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
ELF/
2 lines
test/
ELF/
2 lines

Diff 158393

ELF/Driver.cpp

Show First 20 Lines • Show All 495 Lines • ▼ Show 20 Linesstatic Target2Policy getTarget2(opt::InputArgList &Args) {
return Target2Policy::GotRel; return Target2Policy::GotRel;
} }
static bool isOutputFormatBinary(opt::InputArgList &Args) { static bool isOutputFormatBinary(opt::InputArgList &Args) {
if (auto *Arg = Args.getLastArg(OPT_oformat)) { if (auto *Arg = Args.getLastArg(OPT_oformat)) {
StringRef S = Arg->getValue(); StringRef S = Arg->getValue();
if (S == "binary") if (S == "binary")
return true; return true;
if (S.startswith("elf"))
return false;
error("unknown --oformat value: " + S); error("unknown --oformat value: " + S);
} }
return false; return false;
} }
static DiscardPolicy getDiscard(opt::InputArgList &Args) { static DiscardPolicy getDiscard(opt::InputArgList &Args) {
if (Args.hasArg(OPT_relocatable)) if (Args.hasArg(OPT_relocatable))
return DiscardPolicy::None; return DiscardPolicy::None;
▲ Show 20 Lines • Show All 1,005 Lines • Show Last 20 Lines

test/ELF/oformat-binary.s

Show All 13 Lines
# RUN: echo "SECTIONS { }" > %t.script # RUN: echo "SECTIONS { }" > %t.script
# RUN: ld.lld -o %t2.out --script %t.script %t --oformat binary # RUN: ld.lld -o %t2.out --script %t.script %t --oformat binary
# RUN: od -t x1 -v %t2.out | FileCheck %s # RUN: od -t x1 -v %t2.out | FileCheck %s
# RUN: not ld.lld -o /dev/null %t --oformat foo 2>&1 \ # RUN: not ld.lld -o /dev/null %t --oformat foo 2>&1 \
# RUN: | FileCheck %s --check-prefix ERR # RUN: | FileCheck %s --check-prefix ERR
# ERR: unknown --oformat value: foo # ERR: unknown --oformat value: foo
# RUN: ld.lld -o /dev/null %t --oformat elf
.text .text
.align 4 .align 4
.globl _start .globl _start
_start: _start:
nop nop
.section .mysec.1,"ax" .section .mysec.1,"ax"
.byte 0x11 .byte 0x11
.section .mysec.2,"ax" .section .mysec.2,"ax"
.byte 0x22 .byte 0x22