[MC] set OpenBSD's ELFOSABI by default #98158
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ericson2314
changed the title
Member
Author
|
Note to self: #97122 (comment) applies to this PR, since I split it. |
Ericson2314
force-pushed
the
llvm-elfosabi-openbsd
branch
from
bd7871b to
9da46ac
Compare
Member
|
@llvm/pr-subscribers-mc Author: John Ericson (Ericson2314) ChangesThis matches what is done for FreeBSD. OpenBSD has a few special program header types, and other such ELF extensions. Setting the ELFOSABI like so will allow LLD to support them without needlessly impacting non-OpenBSD ELFs. Leveraged by #97122 Full diff: https://github.com/llvm/llvm-project/pull/98158.diff 3 Files Affected:
diff --git a/llvm/include/llvm/MC/MCELFObjectWriter.h b/llvm/include/llvm/MC/MCELFObjectWriter.h
index d7c223cdcc07f..12237094ad86a 100644
--- a/llvm/include/llvm/MC/MCELFObjectWriter.h
+++ b/llvm/include/llvm/MC/MCELFObjectWriter.h
@@ -78,6 +78,8 @@ class MCELFObjectTargetWriter : public MCObjectTargetWriter {
return ELF::ELFOSABI_FREEBSD;
case Triple::Solaris:
return ELF::ELFOSABI_SOLARIS;
+ case Triple::OpenBSD:
+ return ELF::ELFOSABI_OPENBSD;
default:
return ELF::ELFOSABI_NONE;
}
diff --git a/llvm/test/MC/ELF/osabi-freebsd.s b/llvm/test/MC/ELF/osabi-freebsd.s
new file mode 100644
index 0000000000000..0dbef293772e9
--- /dev/null
+++ b/llvm/test/MC/ELF/osabi-freebsd.s
@@ -0,0 +1,2 @@
+# RUN: llvm-mc -filetype obj -triple amd64-freebsd %s | llvm-readobj -hS - | FileCheck %s
+# CHECK: OS/ABI: FreeBSD
diff --git a/llvm/test/MC/ELF/osabi-openbsd.s b/llvm/test/MC/ELF/osabi-openbsd.s
new file mode 100644
index 0000000000000..f501dfa7bb126
--- /dev/null
+++ b/llvm/test/MC/ELF/osabi-openbsd.s
@@ -0,0 +1,2 @@
+# RUN: llvm-mc -filetype obj -triple amd64-openbsd %s | llvm-readobj -hS - | FileCheck %s
+# CHECK: OS/ABI: OpenBSD
|
MaskRay
reviewed
Jul 10, 2024
llvm/test/MC/ELF/osabi-freebsd.s
Outdated
| @@ -0,0 +1,2 @@ | |||
| # RUN: llvm-mc -filetype obj -triple amd64-freebsd %s | llvm-readobj -hS - | FileCheck %s | |||
Member
There was a problem hiding this comment.
I added osabi.s to unify FreeBSD/Linux/Solaris testing. Consider adding OpenBSD tests there instead of adding a new file.
MaskRay
approved these changes
Jul 10, 2024
Member
|
This matches what is done for FreeBSD. OpenBSD has a few special program header types, and other such ELF extensions. Setting the ELFOSABI like so will allow LLD to support them without needlessly impacting non-OpenBSD ELFs. Testing strategy matches 06cecdc.
Ericson2314
changed the title
Ericson2314
force-pushed
the
llvm-elfosabi-openbsd
branch
from
9da46ac to
6c2b893
Compare
Member
Author
|
Thanks @MaskRay! Did each of those things. |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/153/builds/2651 Here is the relevant piece of the build log for the reference: |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/16/builds/1575 Here is the relevant piece of the build log for the reference: |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/60/builds/2230 Here is the relevant piece of the build log for the reference: |
Collaborator
|
The failure is legit, unless there is a pending fix we should revert. |
joker-eph
added a commit
that referenced
this pull request
Jul 11, 2024
This reverts commit b64c1de.
joker-eph
added a commit
that referenced
this pull request
Jul 11, 2024
Reverts #98158 bot is broken.
Member
Author
|
Sorry about that. So the failure broke |
Ericson2314
added a commit
to obsidiansystems/llvm-project
that referenced
this pull request
Jul 11, 2024
Member
Author
|
#98553 is the next attempt. |
Ericson2314
added a commit
that referenced
this pull request
Jul 11, 2024
This matches what is done for FreeBSD. OpenBSD has a few special program header types, and other such ELF extensions. Setting the ELFOSABI like so will allow LLD to support them without needlessly impacting non-OpenBSD ELFs. Testing strategy matches 06cecdc. Take two of #98158 / b64c1de, which was reverted in #98494 / c026135. Preexisting test is fixed now.
Ericson2314
added a commit
that referenced
this pull request
Jul 11, 2024
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/33/builds/580 Here is the relevant piece of the build log for the reference: |
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
This matches what is done for FreeBSD. OpenBSD has a few special program header types, and other such ELF extensions. Setting the ELFOSABI like so will allow LLD to support them without needlessly impacting non-OpenBSD ELFs. Testing strategy matches 06cecdc.
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
Reverts llvm#98158 bot is broken.
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
This matches what is done for FreeBSD. OpenBSD has a few special program header types, and other such ELF extensions. Setting the ELFOSABI like so will allow LLD to support them without needlessly impacting non-OpenBSD ELFs. Testing strategy matches 06cecdc. Take two of llvm#98158 / b64c1de, which was reverted in llvm#98494 / c026135. Preexisting test is fixed now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This matches what is done for FreeBSD.
OpenBSD has a few special program header types, and other such ELF extensions. Setting the ELFOSABI like so will allow LLD to support them without needlessly impacting non-OpenBSD ELFs.
Testing strategy matches 06cecdc.
Leveraged by #97122