Skip to content

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Sep 29, 2021

Only change is a warning fix for arm.

  CXX      crc32c/src/crc32c_libcrc32c_a-crc32c.o
In file included from crc32c/src/crc32c.cc:11:0:
crc32c/src/./crc32c_arm64_check.h: In function ‘bool crc32c::CanUseArm64Crc32()’:
crc32c/src/./crc32c_arm64_check.h:43:37: warning: the address of ‘long unsigned int getauxval(long unsigned int)’ will never be NULL [-Waddress]
   unsigned long hwcap = (&getauxval != nullptr) ? getauxval(AT_HWCAP) : 0;
                          ~~~~~~~~~~~^~~~~~~~~~

MarcoFalke added 2 commits September 29, 2021 14:09
0d624261ef Merge bitcoin-core/crc32c-subtree#2: Merge upstream
cac7ca830b Merge commit 'fa5ade41ee480003d9c5af6f43567ba22e4e17e6' into bitcoin-fork
fa5ade41ee Fix compilation warnings on ARM64 with old GCC versions. (#52)
db08d22129 Updated Travis-CI configuration. (#51)
e31619a5b7 Fix GitHub links. (#50)
7fa4c263e8 Update Travis CI config. (#49)
a3d9e6d1a4 Updated third_party/ and Travis CI config. (#48)

git-subtree-dir: src/crc32c
git-subtree-split: 0d624261ef83ab08c953c196540ed18f355add4c
@maflcko
Copy link
Member Author

maflcko commented Sep 29, 2021

For review, see also #23126

unsigned long hwcap =
#if HAVE_STRONG_GETAUXVAL
// Some compilers warn on (&getauxval != nullptr) in the block below.
getauxval(AT_HWCAP);
Copy link
Member

@laanwj laanwj Sep 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this makes sense. It's silly to take the address of a libc function and compare it to nullptr.

@laanwj
Copy link
Member

laanwj commented Sep 30, 2021

Code review ACK fac1c13
Have not checked the subtree validity.

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK fac1c13

subtree check

src/crc32c in HEAD currently refers to tree 17db66823db814baeccdb6bf224f85a9869f1fdd
src/crc32c in HEAD was last updated in commit 1d44513f9b34f2a59c794474752025430285a68b (tree 17db66823db814baeccdb6bf224f85a9869f1fdd)
GOOD

Guix build:

bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
b0788b00b91d2612f4e46a05e8fc45200015031e18def9b4b9ad166f8a2d49b3  guix-build-fac1c13ead8d/output/aarch64-linux-gnu/SHA256SUMS.part
2f2678c53917df409c54c0f5cb4c9fe7d1be1e828e4f422e17c5a5d2cc9ae927  guix-build-fac1c13ead8d/output/aarch64-linux-gnu/bitcoin-fac1c13ead8d-aarch64-linux-gnu-debug.tar.gz
54d010b7f2275051b8a99ac8f46ebf9926b0c8ebbae02bf708fa9beb70074d24  guix-build-fac1c13ead8d/output/aarch64-linux-gnu/bitcoin-fac1c13ead8d-aarch64-linux-gnu.tar.gz
7338d74d8123a48dc23bc4486c2cc170ab88b6f6566afcc388e644241f721656  guix-build-fac1c13ead8d/output/arm-linux-gnueabihf/SHA256SUMS.part
eb1b7277c0a59d834bc2aefe2f1d4c5e181e174603d49bdb50637b00d73d89cb  guix-build-fac1c13ead8d/output/arm-linux-gnueabihf/bitcoin-fac1c13ead8d-arm-linux-gnueabihf-debug.tar.gz
2d1fa2a2fdb710ae745d005f9a010c169540b21f482b7b2e634fddfa0a53751b  guix-build-fac1c13ead8d/output/arm-linux-gnueabihf/bitcoin-fac1c13ead8d-arm-linux-gnueabihf.tar.gz
5303c6e01cb442ac183b5e7c6936545b953d75a9ed1db342229fa38767879f4d  guix-build-fac1c13ead8d/output/dist-archive/bitcoin-fac1c13ead8d.tar.gz
05b82d813dc62439929b67ec8ef264e40119ea834a755a15b769872817c8eb36  guix-build-fac1c13ead8d/output/powerpc64-linux-gnu/SHA256SUMS.part
49b382af9776684de77b7b93545350dae8a6486db7dad18ceda20350bd9915ce  guix-build-fac1c13ead8d/output/powerpc64-linux-gnu/bitcoin-fac1c13ead8d-powerpc64-linux-gnu-debug.tar.gz
5f17432ff795dac3487f0350646ac589e6acee13ac507f33528ec5c99983f74b  guix-build-fac1c13ead8d/output/powerpc64-linux-gnu/bitcoin-fac1c13ead8d-powerpc64-linux-gnu.tar.gz
954c60fbbc2b64b075cee5fe0a22b6e5915697fe051619b237d3cac5221ea0cf  guix-build-fac1c13ead8d/output/powerpc64le-linux-gnu/SHA256SUMS.part
ad416ffbe656b9ac9f88979667ee7ac03f1979f14c8222d71c60c6695523f0d4  guix-build-fac1c13ead8d/output/powerpc64le-linux-gnu/bitcoin-fac1c13ead8d-powerpc64le-linux-gnu-debug.tar.gz
c9e0649d995f94b8cfa26e25afee6370c85246e20b8b3bf1251a8de319e9c9b0  guix-build-fac1c13ead8d/output/powerpc64le-linux-gnu/bitcoin-fac1c13ead8d-powerpc64le-linux-gnu.tar.gz
d0bc596a0469e1e50d373795f5c63e77b085c436847759810061d14838398335  guix-build-fac1c13ead8d/output/riscv64-linux-gnu/SHA256SUMS.part
987dbb613316820ef33b882038722766c3a756a3fb7d664c9c313da4d0f751f5  guix-build-fac1c13ead8d/output/riscv64-linux-gnu/bitcoin-fac1c13ead8d-riscv64-linux-gnu-debug.tar.gz
756e404806354791b68fc03d429060d01c7e147a4314504599109a4cb541a5c8  guix-build-fac1c13ead8d/output/riscv64-linux-gnu/bitcoin-fac1c13ead8d-riscv64-linux-gnu.tar.gz
abc7170109647a012f610296378ab37e43d2da521805d016d524d4b6defea8eb  guix-build-fac1c13ead8d/output/x86_64-apple-darwin19/SHA256SUMS.part
4ff0e7423312f58c84764479c0a9770df7d34af3ad08c53bb90226fad4a872d7  guix-build-fac1c13ead8d/output/x86_64-apple-darwin19/bitcoin-fac1c13ead8d-osx-unsigned.dmg
e93905c0c9da6ecff16b62b38e9b6b78620462224d3cbb283c559acc122752cc  guix-build-fac1c13ead8d/output/x86_64-apple-darwin19/bitcoin-fac1c13ead8d-osx-unsigned.tar.gz
8270d36bc67a866c0d894e7861f485db3b4632d9e0c55d2f637cdd957d7d35e8  guix-build-fac1c13ead8d/output/x86_64-apple-darwin19/bitcoin-fac1c13ead8d-osx64.tar.gz
91c6a7bebdd1920ccd08266d9973711d184073e492b7474a3b25e01fd52ed24a  guix-build-fac1c13ead8d/output/x86_64-linux-gnu/SHA256SUMS.part
bc47f0059e0a268f4a8d3b9d22e58aaa8bd7d7afa620015a0ff9cfa8bd9c90be  guix-build-fac1c13ead8d/output/x86_64-linux-gnu/bitcoin-fac1c13ead8d-x86_64-linux-gnu-debug.tar.gz
db496295090ef3d38f0eae78c8ccff9270903566cd84b23d7e25bd82ddeb6fc0  guix-build-fac1c13ead8d/output/x86_64-linux-gnu/bitcoin-fac1c13ead8d-x86_64-linux-gnu.tar.gz
f5693804c5e40daa08a8cf738cd39b7bec479eb4e90277a1899d2a6895cbe626  guix-build-fac1c13ead8d/output/x86_64-w64-mingw32/SHA256SUMS.part
6b02b2df2487bd675ed395f0874be9a53e00a2af45e595c8d3fd3e181a48e1ec  guix-build-fac1c13ead8d/output/x86_64-w64-mingw32/bitcoin-fac1c13ead8d-win-unsigned.tar.gz
b2f85fd504ad28eadc3dc982a5f56eb073dbe3e5fcf6608d22d4f17ea16793e1  guix-build-fac1c13ead8d/output/x86_64-w64-mingw32/bitcoin-fac1c13ead8d-win64-debug.zip
24d6a1331e2381a43844e5d2cce8b0c47c7c3f55ae13c8c6ffd692dc3a5111e2  guix-build-fac1c13ead8d/output/x86_64-w64-mingw32/bitcoin-fac1c13ead8d-win64-setup-unsigned.exe
2b7b03c7241206275791356b480f0dcf81b3742246cdc5bf3f138ce5f6875d3d  guix-build-fac1c13ead8d/output/x86_64-w64-mingw32/bitcoin-fac1c13ead8d-win64.zip

@fanquake fanquake merged commit bd40cd8 into bitcoin:master Sep 30, 2021
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Sep 30, 2021
1d44513 Squashed 'src/crc32c/' changes from b5ef9be675..0d624261ef (MarcoFalke)

Pull request description:

  Only change is a warning fix for arm.

  ```
    CXX      crc32c/src/crc32c_libcrc32c_a-crc32c.o
  In file included from crc32c/src/crc32c.cc:11:0:
  crc32c/src/./crc32c_arm64_check.h: In function ‘bool crc32c::CanUseArm64Crc32()’:
  crc32c/src/./crc32c_arm64_check.h:43:37: warning: the address of ‘long unsigned int getauxval(long unsigned int)’ will never be NULL [-Waddress]
     unsigned long hwcap = (&getauxval != nullptr) ? getauxval(AT_HWCAP) : 0;
                            ~~~~~~~~~~~^~~~~~~~~~

ACKs for top commit:
  laanwj:
    Code review ACK fac1c13
  fanquake:
    ACK fac1c13

Tree-SHA512: 22a52caf67dd89092eff1f075fbf5c5d16bdca9146ba042ce5d3fcc10ce1485e950964089f8536c938ebe650676e03a789d3597fe45b19920fd2c5e72f1391ad
@maflcko maflcko deleted the 2109-subtreeCrc32c branch October 1, 2021 07:47
@DrahtBot
Copy link
Contributor

DrahtBot commented Oct 1, 2021

Guix builds

File commit dbbb7fb
(master)
commit d7ffc08d9f29156de670c7c4a5d6658e4f7302e5
(master and this pull)
SHA256SUMS.part b59c6ddcfb5f6bfd... 54dc381893b1c006...
*-aarch64-linux-gnu-debug.tar.gz f84260dfb83bac48... 736ad7b057d2ce38...
*-aarch64-linux-gnu.tar.gz a9f311d6189e669f... 3dc154a0fd553028...
*-arm-linux-gnueabihf-debug.tar.gz 2d8dc00b8ff26cf9... fd0c638198334638...
*-arm-linux-gnueabihf.tar.gz ba7167a5229a1c57... cf774ba3912a8442...
*-osx-unsigned.dmg f9942a14f15c4cc1... 7f0fc61c5425b940...
*-osx-unsigned.tar.gz c2d476eabdfec1c6... 30d15b57a5840cb4...
*-osx64.tar.gz 73c467c2515615f1... 76ca0930affd3890...
*-powerpc64-linux-gnu-debug.tar.gz 776f79f20ac2e6b9... c70e75ba4f6deade...
*-powerpc64-linux-gnu.tar.gz 5e2efc2b01589af6... 7ad326c67ecabd81...
*-powerpc64le-linux-gnu-debug.tar.gz 66fea6b560ea9b9f... edaa834f390bf4be...
*-powerpc64le-linux-gnu.tar.gz ce4e3b06a5b0473a... 3b6fb6b910a735ea...
*-riscv64-linux-gnu-debug.tar.gz 98a6294e511db47e... 49a34cd44a0fb431...
*-riscv64-linux-gnu.tar.gz 220e2a37bd11e69c... 5161c44f844f7b25...
*-win-unsigned.tar.gz 105f9641bc74e597... 9f2ebfb978b50bbb...
*-win64-debug.zip af2b61971180fa70... 071e52a1cdb3d3a5...
*-win64-setup-unsigned.exe ddfcaa64993495a6... c226ad0bb6cb0d70...
*-win64.zip dab486abb7007589... 998cf8f5b5f46291...
*-x86_64-linux-gnu-debug.tar.gz cc7e8684d5748531... 768739f176fa094b...
*-x86_64-linux-gnu.tar.gz 3607671cbad0fa18... 669e48e77f859c66...
*.tar.gz 63a315814c03d050... 90447dc4bf076663...
guix_build.log 5e709f6cbb25530a... bf127487abd2955b...
guix_build.log.diff 5e9bf3c120f8be69...

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 13, 2022
1d44513 Squashed 'src/crc32c/' changes from b5ef9be675..0d624261ef (MarcoFalke)

Pull request description:

  Only change is a warning fix for arm.

  ```
    CXX      crc32c/src/crc32c_libcrc32c_a-crc32c.o
  In file included from crc32c/src/crc32c.cc:11:0:
  crc32c/src/./crc32c_arm64_check.h: In function ‘bool crc32c::CanUseArm64Crc32()’:
  crc32c/src/./crc32c_arm64_check.h:43:37: warning: the address of ‘long unsigned int getauxval(long unsigned int)’ will never be NULL [-Waddress]
     unsigned long hwcap = (&getauxval != nullptr) ? getauxval(AT_HWCAP) : 0;
                            ~~~~~~~~~~~^~~~~~~~~~

ACKs for top commit:
  laanwj:
    Code review ACK fac1c13
  fanquake:
    ACK fac1c13

Tree-SHA512: 22a52caf67dd89092eff1f075fbf5c5d16bdca9146ba042ce5d3fcc10ce1485e950964089f8536c938ebe650676e03a789d3597fe45b19920fd2c5e72f1391ad
@bitcoin bitcoin locked and limited conversation to collaborators Oct 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants