Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream #2

Merged
merged 6 commits into from
Sep 29, 2021
Merged

Merge upstream #2

merged 6 commits into from
Sep 29, 2021

Conversation

maflcko
Copy link

@maflcko maflcko commented Aug 3, 2021

Only change is a warning fix for arm

@maflcko maflcko requested review from laanwj, sipa and fanquake August 3, 2021 13:04
@maflcko
Copy link
Author

maflcko commented Aug 3, 2021

Will need the subtree update after merge: https://github.com/bitcoin-core/bitcoin-maintainer-tools#subtree-updates

@maflcko
Copy link
Author

maflcko commented Aug 3, 2021

For reference, the warning is:

  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;
                          ~~~~~~~~~~~^~~~~~~~~~

@maflcko
Copy link
Author

maflcko commented Sep 29, 2021

ping for merge or close

@sipa
Copy link

sipa commented Sep 29, 2021

Code review ACK cac7ca8

@maflcko maflcko merged commit 0d62426 into bitcoin-core:bitcoin-fork Sep 29, 2021
@maflcko maflcko deleted the bump branch September 29, 2021 12:06
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Sep 29, 2021
Squashed 'src/crc32c/' changes from b5ef9be675..0d624261ef
1d44513 
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
rebroad pushed a commit to rebroad/bitcoin that referenced this pull request Oct 13, 2021
@rebroad
Squashed 'src/crc32c/' changes from b5ef9be675..0d624261ef
c3e9b55 
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. (bitcoin#52)
db08d22129 Updated Travis-CI configuration. (bitcoin#51)
e31619a5b7 Fix GitHub links. (bitcoin#50)
7fa4c263e8 Update Travis CI config. (bitcoin#49)
a3d9e6d1a4 Updated third_party/ and Travis CI config. (bitcoin#48)

git-subtree-dir: src/crc32c
git-subtree-split: 0d624261ef83ab08c953c196540ed18f355add4c
janus pushed a commit to BitgesellOfficial/bitgesell that referenced this pull request Nov 11, 2021
@janus
Squashed 'src/crc32c/' changes from b5ef9be675..0d624261ef
aa1ddfc 
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
vmta added a commit to umkoin/umkoin that referenced this pull request May 16, 2022
@vmta
Squashed 'src/crc32c/' changes from b5ef9be67..0d624261e
74f83c9 
0d624261e Merge bitcoin-core/crc32c-subtree#2: Merge upstream
cac7ca830 Merge commit 'fa5ade41ee480003d9c5af6f43567ba22e4e17e6' into bitcoin-fork
fa5ade41e Fix compilation warnings on ARM64 with old GCC versions. (#52)
db08d2212 Updated Travis-CI configuration. (#51)
e31619a5b Fix GitHub links. (#50)
7fa4c263e Update Travis CI config. (#49)
a3d9e6d1a Updated third_party/ and Travis CI config. (#48)

git-subtree-dir: src/crc32c
git-subtree-split: 0d624261ef83ab08c953c196540ed18f355add4c
patricklodder added a commit to patricklodder/dogecoin that referenced this pull request Oct 6, 2023
@patricklodder
Squashed 'src/crc32c/' changes from 224988680f..0bac72c455
f4f689f 
0bac72c455 Merge bitcoin-core/crc32c-subtree#5: local, bugfix: Define `CRC32C_HAVE_CONFIG_H` macro for all targets
002cfa280e local, bugfix: Define `CRC32C_HAVE_CONFIG_H` macro for all targets
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. (dogecoin#52)
db08d22129 Updated Travis-CI configuration. (dogecoin#51)
e31619a5b7 Fix GitHub links. (dogecoin#50)
7fa4c263e8 Update Travis CI config. (dogecoin#49)
a3d9e6d1a4 Updated third_party/ and Travis CI config. (dogecoin#48)
b5ef9be675 Merge #1: Merge changes from upstream
9e7f512430 Merge remote-tracking branch 'origin/master' into bitcoin-fork
1f85030246 Add support for ARM64 darwin (dogecoin#43)
3bb959c982 Remove unnecessary reinterpret_cast (dogecoin#42)
2e97ab26b1 Fix (unused) ReadUint64LE for BE machines (dogecoin#41)
47b40d2209 Bump dependencies. (dogecoin#40)
ba74185625 Move CI to Visual Studio 2019.
efa301a7e5 Allow different C/C++ standards when this is used as a subproject.
cc6d71465e CMake: Use configure_package_config_file()

git-subtree-dir: src/crc32c
git-subtree-split: 0bac72c4552baf1cc9fe03ee30d6542cb7af2e04
xanimo added a commit to xanimo/dogecoin that referenced this pull request Nov 3, 2023
@xanimo
Squashed 'src/crc32c/' changes from 224988680f..0bac72c455
0f7c18e 
0bac72c455 Merge bitcoin-core/crc32c-subtree#5: local, bugfix: Define `CRC32C_HAVE_CONFIG_H` macro for all targets
002cfa280e local, bugfix: Define `CRC32C_HAVE_CONFIG_H` macro for all targets
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. (dogecoin#52)
db08d22129 Updated Travis-CI configuration. (dogecoin#51)
e31619a5b7 Fix GitHub links. (dogecoin#50)
7fa4c263e8 Update Travis CI config. (dogecoin#49)
a3d9e6d1a4 Updated third_party/ and Travis CI config. (dogecoin#48)
b5ef9be675 Merge dogecoin#1: Merge changes from upstream
9e7f512430 Merge remote-tracking branch 'origin/master' into bitcoin-fork
1f85030246 Add support for ARM64 darwin (dogecoin#43)
3bb959c982 Remove unnecessary reinterpret_cast (dogecoin#42)
2e97ab26b1 Fix (unused) ReadUint64LE for BE machines (dogecoin#41)
47b40d2209 Bump dependencies. (dogecoin#40)
ba74185625 Move CI to Visual Studio 2019.
efa301a7e5 Allow different C/C++ standards when this is used as a subproject.
cc6d71465e CMake: Use configure_package_config_file()

git-subtree-dir: src/crc32c
git-subtree-split: 0bac72c4552baf1cc9fe03ee30d6542cb7af2e04
patricklodder added a commit to patricklodder/dogecoin that referenced this pull request Nov 24, 2023
@patricklodder
Squashed 'src/crc32c/' changes from 224988680f..0bac72c455
e16843d 
0bac72c455 Merge bitcoin-core/crc32c-subtree#5: local, bugfix: Define `CRC32C_HAVE_CONFIG_H` macro for all targets
002cfa280e local, bugfix: Define `CRC32C_HAVE_CONFIG_H` macro for all targets
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. (dogecoin#52)
db08d22129 Updated Travis-CI configuration. (dogecoin#51)
e31619a5b7 Fix GitHub links. (dogecoin#50)
7fa4c263e8 Update Travis CI config. (dogecoin#49)
a3d9e6d1a4 Updated third_party/ and Travis CI config. (dogecoin#48)
b5ef9be675 Merge #1: Merge changes from upstream
9e7f512430 Merge remote-tracking branch 'origin/master' into bitcoin-fork
1f85030246 Add support for ARM64 darwin (dogecoin#43)
3bb959c982 Remove unnecessary reinterpret_cast (dogecoin#42)
2e97ab26b1 Fix (unused) ReadUint64LE for BE machines (dogecoin#41)
47b40d2209 Bump dependencies. (dogecoin#40)
ba74185625 Move CI to Visual Studio 2019.
efa301a7e5 Allow different C/C++ standards when this is used as a subproject.
cc6d71465e CMake: Use configure_package_config_file()

git-subtree-dir: src/crc32c
git-subtree-split: 0bac72c4552baf1cc9fe03ee30d6542cb7af2e04
patricklodder added a commit to patricklodder/dogecoin that referenced this pull request Nov 24, 2023
@patricklodder
Squashed 'src/crc32c/' changes from 224988680f..0bac72c455
3721376 
0bac72c455 Merge bitcoin-core/crc32c-subtree#5: local, bugfix: Define `CRC32C_HAVE_CONFIG_H` macro for all targets
002cfa280e local, bugfix: Define `CRC32C_HAVE_CONFIG_H` macro for all targets
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. (dogecoin#52)
db08d22129 Updated Travis-CI configuration. (dogecoin#51)
e31619a5b7 Fix GitHub links. (dogecoin#50)
7fa4c263e8 Update Travis CI config. (dogecoin#49)
a3d9e6d1a4 Updated third_party/ and Travis CI config. (dogecoin#48)
b5ef9be675 Merge #1: Merge changes from upstream
9e7f512430 Merge remote-tracking branch 'origin/master' into bitcoin-fork
1f85030246 Add support for ARM64 darwin (dogecoin#43)
3bb959c982 Remove unnecessary reinterpret_cast (dogecoin#42)
2e97ab26b1 Fix (unused) ReadUint64LE for BE machines (dogecoin#41)
47b40d2209 Bump dependencies. (dogecoin#40)
ba74185625 Move CI to Visual Studio 2019.
efa301a7e5 Allow different C/C++ standards when this is used as a subproject.
cc6d71465e CMake: Use configure_package_config_file()

git-subtree-dir: src/crc32c
git-subtree-split: 0bac72c4552baf1cc9fe03ee30d6542cb7af2e04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@laanwj laanwj Awaiting requested review from laanwj

@sipa sipa Awaiting requested review from sipa

@fanquake fanquake Awaiting requested review from fanquake

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@maflcko @sipa @pwnall @fmarier @cmumford