0.21 Backports #25318

pull fanquake wants to merge 2 commits into bitcoin:0.21 from fanquake:0_21_backports changing 2 files +6 −1

fanquake commented at 11:56 AM on June 9, 2022: member
There might not be another 0.21.x release, however these are both straight forward changes. If this isn't merged, then the pulls can remain untagged for needing backport.

Backports:
- #23045
- https://github.com/bitcoin/bitcoin/pull/23335

refactor: include a missing <limits> header in fs.cpp

... needed for std::numeric_limits<T>::max on WIN32

Github-Pull: #23335
Rebased-From: 077a875d94b51e3c87381133657be98989c8643e

cfb08c342e

build: Restrict check for CRC32C intrinsic to aarch64

`crc32c`'s hardware accelerated code doesn't handle ARM 32-bit at all.
Make the check in `configure.ac` check for this architecture explicitly.

For the release binaries, the current `configure.ac` check happens
to work: it enables it on aarch64 but disables it for armhf. However
some combination of compiler version and settings might ostensibly cause
this check to succeed on armhf (as reported on IRC). So make the 64-bit
platform requirement explicit.

Github-Pull: #23045
Rebased-From: f2747d1602ec4e1128356b861b2167daf66a845b

efb9f00f07

fanquake added the label Backport on Jun 9, 2022
fanquake added this to the milestone 0.21.2 on Jun 9, 2022
JoaoLobo94 approved
luke-jr commented at 2:37 PM on June 9, 2022: member

nit: Shouldn't the milestone here be 0.21.3? We already released 0.21.2...
fanquake removed this from the milestone 0.21.2 on Jun 9, 2022
fanquake commented at 2:39 PM on June 9, 2022: member

I'll just leave it unmilestoned. Have closed 0.21.2 given it wasn't already.
laanwj commented at 3:30 PM on June 9, 2022: member

ACK efb9f00f07c7ebf5fac56c464e5dd65d6d9b8457 Seems fine to backport these.
LarryRuane commented at 4:49 PM on June 9, 2022: contributor

utACK efb9f00f07c7ebf5fac56c464e5dd65d6d9b8457 I verified that these diffs match the source PRs' diffs.
fanquake merged this on Jun 10, 2022
fanquake closed this on Jun 10, 2022
fanquake deleted the branch on Jun 10, 2022
DrahtBot locked this on Jun 10, 2023

Contributors

Labels

Linked (view graph)

#23045 build: Restrict check for CRC32C intrinsic to aarch64 #23335 refactor: include a missing <limits> header in fs.cpp