Page MenuHomeFreeBSD
Differential D26196

Fix -Werror,-Wmacro-redefined when building with CROSS_TOOLCHAIN=llvm10
AbandonedPublic
Actions

Authored by arichardson on Aug 26 2020, 3:37 PM.
Tags
None
Referenced Files
Unknown Object (File)
Dec 22 2023, 1:05 PM
Unknown Object (File)
Dec 20 2023, 5:11 AM
Unknown Object (File)
Nov 14 2023, 9:29 PM
Unknown Object (File)
Jun 24 2023, 7:02 AM
Unknown Object (File)
Jun 24 2023, 3:57 AM
Unknown Object (File)
May 6 2023, 9:33 AM
Unknown Object (File)
Mar 4 2023, 11:17 AM
Unknown Object (File)
Mar 3 2023, 9:39 AM
View All 11 Files
Subscribers
delphij
mahrens

Details

Reviewers
mmacy
freqlabs
Group Reviewers
ZFS
Summary

Those macros are also defined by the compiler-provided float.h which will be
included later on and trigger these warnings. Include <float.h> first and only
define the macros when missing to fix this problem.

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 33171
Build 30520: arc lint + arc unit

Event Timeline

arichardson created this revision.Aug 26 2020, 3:37 PM
Herald added a subscriber: delphij. · View Herald TranscriptAug 26 2020, 3:37 PM
arichardson requested review of this revision.Aug 26 2020, 3:37 PM
Harbormaster completed remote builds in B33171: Diff 76249.Aug 26 2020, 3:37 PM
arichardson updated this revision to Diff 76250.Aug 26 2020, 3:39 PM

Upload correct version of patch

Harbormaster completed remote builds in B33172: Diff 76250.Aug 26 2020, 3:39 PM
mahrens added a subscriber: mahrens.Aug 26 2020, 3:50 PM

Could we make this change upstream (in OpenZFS) rather than having to maintain the diff in freebsd? Or, would someone mind explaining when we would change the contrib files in FreeBSD vs changing them upstream?

mmacy added a comment.Aug 26 2020, 4:50 PM
In D26196#582060, @mahrens wrote:

Could we make this change upstream (in OpenZFS) rather than having to maintain the diff in freebsd? Or, would someone mind explaining when we would change the contrib files in FreeBSD vs changing them upstream?

Changes to contrib should always be made in the following order when possible:
a) update upstream
b) update vendor branch with latest changeset
c) merge vendor branch in to HEAD

Thus the first step is to open a PR with openzfs.

We may eventually relax the ordering if this proves too onerous for something as tightly coupled as ZFS and transition to "eventual consistency" whereby contrib + vendor + upstream are eventually the same.

mahrens added a comment.Aug 26 2020, 5:04 PM
In D26196#582083, @mmacy wrote:
In D26196#582060, @mahrens wrote:

Could we make this change upstream (in OpenZFS) rather than having to maintain the diff in freebsd? Or, would someone mind explaining when we would change the contrib files in FreeBSD vs changing them upstream?

Changes to contrib should always be made in the following order when possible:
a) update upstream
b) update vendor branch with latest changeset
c) merge vendor branch in to HEAD

Thus the first step is to open a PR with openzfs.

We may eventually relax the ordering if this proves too onerous for something as tightly coupled as ZFS and transition to "eventual consistency" whereby contrib + vendor + upstream are eventually the same.

Sounds like a good plan, thanks Matt.

arichardson abandoned this revision.Sep 9 2020, 1:56 PM

Committed upstream in https://github.com/openzfs/zfs/pull/10864

Revision Contents
Changeset List

PathSize
sys/
contrib/
openzfs/
lib/
libspl/
include/
4 lines

Diff 76249

View Options

sys/contrib/openzfs/lib/libspl/include/limits.h

Loading...