This is an archive of the discontinued LLVM Phabricator instance.

Differential D107748

[MC][ELF] Mark Solaris objects as ELFOSABI_SOLARIS
ClosedPublic

Authored by ro on Aug 9 2021, 1:13 AM.

Details

Reviewers
MaskRay
Commits
rG8738c5b0fe0a: [MC][ELF] Mark Solaris objects as ELFOSABI_SOLARIS
Summary

Prompted by D107747, it seems prudent to mark objects as ELFOSABI_SOLARIS on
Solaris.

Tested on amd64-pc-solaris2.11 and sparcv9-sun-solaris2.11.

Diff Detail

Event Timeline

ro created this revision.Aug 9 2021, 1:13 AM
Herald added subscribers: fedor.sergeev, jyknight. · View Herald TranscriptAug 9 2021, 1:13 AM
ro requested review of this revision.Aug 9 2021, 1:13 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 9 2021, 1:13 AM
Harbormaster completed remote builds in B118631: Diff 365120.Aug 9 2021, 4:13 AM
MaskRay added a comment.Aug 9 2021, 9:56 AM

Needs a test. test/MC/ELF/section-gnu.s is a reference.

MaskRay mentioned this in D107747: [ELF] Don't emit SHF_GNU_RETAIN on Solaris.Aug 9 2021, 10:10 AM
ro updated this revision to Diff 365967.Aug 12 2021, 4:45 AM

Add testcase.

Herald added a subscriber: emaste. · View Herald TranscriptAug 12 2021, 4:45 AM
ro added a comment.Aug 12 2021, 4:47 AM
In D107748#2934871, @MaskRay wrote:

Needs a test. test/MC/ELF/section-gnu.s is a reference.

Like the attached? Right now, we cannot do much more than check that ELFOSABI_SOLARIS is emitted for *-solaris triples.

Harbormaster completed remote builds in B119234: Diff 365967.Aug 12 2021, 5:32 AM
MaskRay accepted this revision.Aug 12 2021, 4:12 PM

LGTM.

llvm/test/MC/ELF/osabi-solaris.s
2

Drop. The whole directory requires x86.

3

-triple=amd64-solaris

Use = or consistently

6

unneeded

This revision is now accepted and ready to land.Aug 12 2021, 4:12 PM
ro marked 3 inline comments as done.Aug 13 2021, 5:26 AM
ro added inline comments.
llvm/test/MC/ELF/osabi-solaris.s
2

Ah, I missed the lit.local.cfg file.

3

I've gone for ' ', but the whole directory is a mess:

-filetype: 228 x '=', 4 x ' '
-triple: 41 x '=', 223 x ' '

ro updated this revision to Diff 366252.Aug 13 2021, 5:28 AM
ro marked 2 inline comments as done.

Incorporate review comments for osabi-solaris.s.

This revision was landed with ongoing or failed builds.Aug 13 2021, 5:32 AM
Closed by commit rG8738c5b0fe0a: [MC][ELF] Mark Solaris objects as ELFOSABI_SOLARIS (authored by ro). · Explain Why
This revision was automatically updated to reflect the committed changes.
ro added a commit: rG8738c5b0fe0a: [MC][ELF] Mark Solaris objects as ELFOSABI_SOLARIS.
Harbormaster completed remote builds in B119428: Diff 366252.Aug 13 2021, 6:07 AM

Revision Contents

PathSize
llvm/
include/
llvm/
MC/
2 lines
test/
MC/
ELF/
2 lines

Diff 366254

llvm/include/llvm/MC/MCELFObjectWriter.h

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines static uint8_t getOSABI(Triple::OSType OSType) {
switch (OSType) { switch (OSType) {
case Triple::CloudABI: case Triple::CloudABI:
return ELF::ELFOSABI_CLOUDABI; return ELF::ELFOSABI_CLOUDABI;
case Triple::HermitCore: case Triple::HermitCore:
return ELF::ELFOSABI_STANDALONE; return ELF::ELFOSABI_STANDALONE;
case Triple::PS4: case Triple::PS4:
case Triple::FreeBSD: case Triple::FreeBSD:
return ELF::ELFOSABI_FREEBSD; return ELF::ELFOSABI_FREEBSD;
case Triple::Solaris:
return ELF::ELFOSABI_SOLARIS;
default: default:
return ELF::ELFOSABI_NONE; return ELF::ELFOSABI_NONE;
} }
} }
virtual unsigned getRelocType(MCContext &Ctx, const MCValue &Target, virtual unsigned getRelocType(MCContext &Ctx, const MCValue &Target,
const MCFixup &Fixup, bool IsPCRel) const = 0; const MCFixup &Fixup, bool IsPCRel) const = 0;
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines

llvm/test/MC/ELF/osabi-solaris.s

  • This file was added.
# RUN: llvm-mc -filetype obj -triple amd64-solaris %s | llvm-readobj -hS - | FileCheck %s
# CHECK: OS/ABI: Solaris
MaskRayUnsubmitted
Done
ReplyInline Actions

Drop. The whole directory requires x86.

MaskRay: Drop. The whole directory requires x86.
roAuthorUnsubmitted
Done
ReplyInline Actions

Ah, I missed the lit.local.cfg file.

ro: Ah, I missed the `lit.local.cfg` file.
MaskRayUnsubmitted
Done
ReplyInline Actions

-triple=amd64-solaris

Use = or consistently

MaskRay: -triple=amd64-solaris Use `=` or ` ` consistently
roAuthorUnsubmitted
Done
ReplyInline Actions

I've gone for ' ', but the whole directory is a mess:

-filetype: 228 x '=', 4 x ' '
-triple: 41 x '=', 223 x ' '

ro: I've gone for ' ', but the whole directory is a mess: `-filetype`: 228 x '=', 4 x ' ' `…
MaskRayUnsubmitted
Done
ReplyInline Actions

unneeded

MaskRay: unneeded