Fix i386 build broken by the merge of ea400129c #12252
Closed
Conversation
This file contains 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
Signed-off-by: Martin Matuska <mm@FreeBSD.org> Closes openzfs#12244
behlendorf
pushed a commit
that referenced
this pull request
Jun 22, 2021
This replaces the generic libspl atomic.c atomics implementation with one based on builtin gcc atomics. This functionality was added as an experimental feature in gcc 4.4. Today even CentOS 7 ships with gcc 4.8 as the default compiler we can make this the default. Furthermore, the builtin atomics are as good or better than our hand-rolled implementation so it's reasonable to drop that custom code. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #11904 Closes #12252 Closes #12244
|
Thanks for catching this! I've gone ahead and applied the alternate fix of applying all of fef8bd4 to the 2.1 release branch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation and Context
The changes in ea40012 (More aggsum optimizations) expect the commit fef8bd4 (libspl: implement atomics in terms of atomics) to be landed.
Merge of ea40012 without fef8bd4 broke the build on i386 (#12244)
Description
Add missing bits to i386 assembler code.
As an alternative, fef8bd4 could be merged
How Has This Been Tested?
Already included as a (temporary) fix in FreeBSD 13-STABLE
Types of changes
Checklist:
Signed-off-by.