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.

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

depends: compile FastFixedDtoa with -O1 to fix cross-arch reproducibility for arm32 #25643

Merged
merged 1 commit into from Jul 19, 2022

Conversation

fanquake
Copy link
Member

This fixes a non-determinism issue in the asm produced for
this function when cross-compiling on x86_64 and aarch64 for
the arm-linux-gnueabihf HOST.

Related to #21194. Alternative to #25636. Initial discussion in #24615 (comment).

Guix Build (x86_64):

28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz
b8bb092b1307684ea4b53d810ac110ec14f29eeab8028d924d1cac7418009b14  guix-build-c32fa85909dd/output/dist-archive/bitcoin-c32fa85909dd.tar.gz

Guix Build (arm64):

28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz
b8bb092b1307684ea4b53d810ac110ec14f29eeab8028d924d1cac7418009b14  guix-build-c32fa85909dd/output/dist-archive/bitcoin-c32fa85909dd.tar.gz

This fixes a non-determinism issue in the asm produced for
this function when cross-compiling on x86_64 and aarch64 for
the arm-linux-gnueabihf HOST.

Related to bitcoin#21194.
@DrahtBot
Copy link
Contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #21778 (build: LLVM 14 & LLD based macOS toolchain by fanquake)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@hebasto
Copy link
Member

hebasto commented Jul 19, 2022

Guix builds:

  • on x86_64:
b5bc66db31e8ed7388e73fc0b2fe33a024f8085ed3b7c0b3853a137fda77bb56  guix-build-c32fa85909dd/output/aarch64-linux-gnu/SHA256SUMS.part
67a2ba1bccbb578b5097173701ab2808062da55c59aca3d29e5d9789391dd2fd  guix-build-c32fa85909dd/output/aarch64-linux-gnu/bitcoin-c32fa85909dd-aarch64-linux-gnu-debug.tar.gz
1885ef8cee240380a6f65b83a2327774c6c1ef8550536bf1f747ab8e41073aae  guix-build-c32fa85909dd/output/aarch64-linux-gnu/bitcoin-c32fa85909dd-aarch64-linux-gnu.tar.gz
28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz
569062c6d55c8e4ef7c7732d486aff0788c3c97fc466052f2034a477d3b2ed33  guix-build-c32fa85909dd/output/arm64-apple-darwin/SHA256SUMS.part
f1a647d5cb8882ffa3db7ef32f8c7069288ba41ee988361040f006b0a20d8551  guix-build-c32fa85909dd/output/arm64-apple-darwin/bitcoin-c32fa85909dd-arm64-apple-darwin-unsigned.dmg
9e3293dcf609beaedd33e1291edc44837df09684520c9f0e6e19a21a3423eeb6  guix-build-c32fa85909dd/output/arm64-apple-darwin/bitcoin-c32fa85909dd-arm64-apple-darwin-unsigned.tar.gz
7af4ca1f6f3e50164024fa6abaecf15287599bd69376480c934539e579ac819b  guix-build-c32fa85909dd/output/arm64-apple-darwin/bitcoin-c32fa85909dd-arm64-apple-darwin.tar.gz
b8bb092b1307684ea4b53d810ac110ec14f29eeab8028d924d1cac7418009b14  guix-build-c32fa85909dd/output/dist-archive/bitcoin-c32fa85909dd.tar.gz
603f8b32b83a255af37cf57e408f9f19fab98a0ffe646ac6d8be60348ea75349  guix-build-c32fa85909dd/output/powerpc64-linux-gnu/SHA256SUMS.part
9227c6bf563955c5e742c7d1f7fd685d77cee5fe93251f8d0d05fb02335cc923  guix-build-c32fa85909dd/output/powerpc64-linux-gnu/bitcoin-c32fa85909dd-powerpc64-linux-gnu-debug.tar.gz
6822927637e87c295b2a96aa6443d0259d0940e89c678d11c6cc361603e92556  guix-build-c32fa85909dd/output/powerpc64-linux-gnu/bitcoin-c32fa85909dd-powerpc64-linux-gnu.tar.gz
567ddf591a3299cf128eb65cf3b6ef50a94334f613c88aa287edbf76c14b5c42  guix-build-c32fa85909dd/output/powerpc64le-linux-gnu/SHA256SUMS.part
d9f5497e3d3aecb0951ec73068d0b8f96dd833ad449c38073463eb72c9a91d88  guix-build-c32fa85909dd/output/powerpc64le-linux-gnu/bitcoin-c32fa85909dd-powerpc64le-linux-gnu-debug.tar.gz
25b44115a5163df603979dcc6e087d96d70a8f05e8a1e052e311a6d51cbc7557  guix-build-c32fa85909dd/output/powerpc64le-linux-gnu/bitcoin-c32fa85909dd-powerpc64le-linux-gnu.tar.gz
5528ca65114041c5af8a6684fb331eca4e99c5b1f93b9b65ba0a4601537f7c96  guix-build-c32fa85909dd/output/riscv64-linux-gnu/SHA256SUMS.part
298c05e971bff54f602e5ba5535643f36c37b46f6fdeeb784fba985fc4884fbd  guix-build-c32fa85909dd/output/riscv64-linux-gnu/bitcoin-c32fa85909dd-riscv64-linux-gnu-debug.tar.gz
8b4c6af85b12c614a6bd5efe4415b7d12c01d5b4e7fcdef799a22bf608c8cff1  guix-build-c32fa85909dd/output/riscv64-linux-gnu/bitcoin-c32fa85909dd-riscv64-linux-gnu.tar.gz
426652b77e060c53da7b5838bd5ca98efcce922538b32710bfd12394564dad25  guix-build-c32fa85909dd/output/x86_64-apple-darwin/SHA256SUMS.part
b800cf0317c5eb595bcac509ce31252f5c492dae7eef3389926f08eba6424429  guix-build-c32fa85909dd/output/x86_64-apple-darwin/bitcoin-c32fa85909dd-x86_64-apple-darwin-unsigned.dmg
abba166d2975015db94e3602f0382328722a1ff38be67cf0de970c92d300c457  guix-build-c32fa85909dd/output/x86_64-apple-darwin/bitcoin-c32fa85909dd-x86_64-apple-darwin-unsigned.tar.gz
3309a1d25094364ac101e35f9656a8788330fb8eda4982f115a2921ff8d8a74d  guix-build-c32fa85909dd/output/x86_64-apple-darwin/bitcoin-c32fa85909dd-x86_64-apple-darwin.tar.gz
f339b2c7f54a2fa01a49051f0dafa78b6054919b0ab90c683141e7e006b02f0c  guix-build-c32fa85909dd/output/x86_64-linux-gnu/SHA256SUMS.part
616668014c88b0f5daf4d9a47def48b9566e0a6a4d4629ed6be570e313adea6d  guix-build-c32fa85909dd/output/x86_64-linux-gnu/bitcoin-c32fa85909dd-x86_64-linux-gnu-debug.tar.gz
32c0a40e4a67877ca74a34fbf427f22e6ad7d8a4b6febdf867b935f75d6e5146  guix-build-c32fa85909dd/output/x86_64-linux-gnu/bitcoin-c32fa85909dd-x86_64-linux-gnu.tar.gz
83eed03f1d462caf5e8af1fa81b4ec4cbc017b5aea18f8b04493050a1d7d936c  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/SHA256SUMS.part
c51ed9156f94ecae44545fbbf58972135f05927baca4e37bb4bed7113f47db55  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/bitcoin-c32fa85909dd-win64-debug.zip
ef61346e0909ce6c1374072a954947ffc1a297749518627f2b1b800cc555ea21  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/bitcoin-c32fa85909dd-win64-setup-unsigned.exe
6eff6dd7fb7f2e91a3140ed59ec32259994f46df4a5770c9a82faef24a4d6d04  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/bitcoin-c32fa85909dd-win64-unsigned.tar.gz
5d9beee91717d3af8410c5916ff27aae1542a1789b699aa5b6f7fd40e76261f7  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/bitcoin-c32fa85909dd-win64.zip
  • on arm64:
28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz
5f9483279d0c45659bd47d7b7828187f278c47f09a5d882d04b465e3460521e1  guix-build-c32fa85909dd/output/arm64-apple-darwin/SHA256SUMS.part
b00e32b02cc75774bc06d2e4b88dbfd2e6273e25cf2af3053d7e1a570df340bb  guix-build-c32fa85909dd/output/arm64-apple-darwin/bitcoin-c32fa85909dd-arm64-apple-darwin-unsigned.dmg
d158a2e48a469d4a883acd1afca7df6242b7a5215ad93782cfd44ebebf0ea616  guix-build-c32fa85909dd/output/arm64-apple-darwin/bitcoin-c32fa85909dd-arm64-apple-darwin-unsigned.tar.gz
6889957c9273e90a563245a2d8d3d788814860c1ab7ef411e9df25d4b9b7738c  guix-build-c32fa85909dd/output/arm64-apple-darwin/bitcoin-c32fa85909dd-arm64-apple-darwin.tar.gz
b8bb092b1307684ea4b53d810ac110ec14f29eeab8028d924d1cac7418009b14  guix-build-c32fa85909dd/output/dist-archive/bitcoin-c32fa85909dd.tar.gz
603f8b32b83a255af37cf57e408f9f19fab98a0ffe646ac6d8be60348ea75349  guix-build-c32fa85909dd/output/powerpc64-linux-gnu/SHA256SUMS.part
9227c6bf563955c5e742c7d1f7fd685d77cee5fe93251f8d0d05fb02335cc923  guix-build-c32fa85909dd/output/powerpc64-linux-gnu/bitcoin-c32fa85909dd-powerpc64-linux-gnu-debug.tar.gz
6822927637e87c295b2a96aa6443d0259d0940e89c678d11c6cc361603e92556  guix-build-c32fa85909dd/output/powerpc64-linux-gnu/bitcoin-c32fa85909dd-powerpc64-linux-gnu.tar.gz
567ddf591a3299cf128eb65cf3b6ef50a94334f613c88aa287edbf76c14b5c42  guix-build-c32fa85909dd/output/powerpc64le-linux-gnu/SHA256SUMS.part
d9f5497e3d3aecb0951ec73068d0b8f96dd833ad449c38073463eb72c9a91d88  guix-build-c32fa85909dd/output/powerpc64le-linux-gnu/bitcoin-c32fa85909dd-powerpc64le-linux-gnu-debug.tar.gz
25b44115a5163df603979dcc6e087d96d70a8f05e8a1e052e311a6d51cbc7557  guix-build-c32fa85909dd/output/powerpc64le-linux-gnu/bitcoin-c32fa85909dd-powerpc64le-linux-gnu.tar.gz
5528ca65114041c5af8a6684fb331eca4e99c5b1f93b9b65ba0a4601537f7c96  guix-build-c32fa85909dd/output/riscv64-linux-gnu/SHA256SUMS.part
298c05e971bff54f602e5ba5535643f36c37b46f6fdeeb784fba985fc4884fbd  guix-build-c32fa85909dd/output/riscv64-linux-gnu/bitcoin-c32fa85909dd-riscv64-linux-gnu-debug.tar.gz
8b4c6af85b12c614a6bd5efe4415b7d12c01d5b4e7fcdef799a22bf608c8cff1  guix-build-c32fa85909dd/output/riscv64-linux-gnu/bitcoin-c32fa85909dd-riscv64-linux-gnu.tar.gz
426652b77e060c53da7b5838bd5ca98efcce922538b32710bfd12394564dad25  guix-build-c32fa85909dd/output/x86_64-apple-darwin/SHA256SUMS.part
b800cf0317c5eb595bcac509ce31252f5c492dae7eef3389926f08eba6424429  guix-build-c32fa85909dd/output/x86_64-apple-darwin/bitcoin-c32fa85909dd-x86_64-apple-darwin-unsigned.dmg
abba166d2975015db94e3602f0382328722a1ff38be67cf0de970c92d300c457  guix-build-c32fa85909dd/output/x86_64-apple-darwin/bitcoin-c32fa85909dd-x86_64-apple-darwin-unsigned.tar.gz
3309a1d25094364ac101e35f9656a8788330fb8eda4982f115a2921ff8d8a74d  guix-build-c32fa85909dd/output/x86_64-apple-darwin/bitcoin-c32fa85909dd-x86_64-apple-darwin.tar.gz
f339b2c7f54a2fa01a49051f0dafa78b6054919b0ab90c683141e7e006b02f0c  guix-build-c32fa85909dd/output/x86_64-linux-gnu/SHA256SUMS.part
616668014c88b0f5daf4d9a47def48b9566e0a6a4d4629ed6be570e313adea6d  guix-build-c32fa85909dd/output/x86_64-linux-gnu/bitcoin-c32fa85909dd-x86_64-linux-gnu-debug.tar.gz
32c0a40e4a67877ca74a34fbf427f22e6ad7d8a4b6febdf867b935f75d6e5146  guix-build-c32fa85909dd/output/x86_64-linux-gnu/bitcoin-c32fa85909dd-x86_64-linux-gnu.tar.gz
83eed03f1d462caf5e8af1fa81b4ec4cbc017b5aea18f8b04493050a1d7d936c  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/SHA256SUMS.part
c51ed9156f94ecae44545fbbf58972135f05927baca4e37bb4bed7113f47db55  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/bitcoin-c32fa85909dd-win64-debug.zip
ef61346e0909ce6c1374072a954947ffc1a297749518627f2b1b800cc555ea21  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/bitcoin-c32fa85909dd-win64-setup-unsigned.exe
6eff6dd7fb7f2e91a3140ed59ec32259994f46df4a5770c9a82faef24a4d6d04  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/bitcoin-c32fa85909dd-win64-unsigned.tar.gz
5d9beee91717d3af8410c5916ff27aae1542a1789b699aa5b6f7fd40e76261f7  guix-build-c32fa85909dd/output/x86_64-w64-mingw32/bitcoin-c32fa85909dd-win64.zip

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK c32fa85

@jarolrod
Copy link
Member

jarolrod commented Jul 19, 2022

GUIX hashes:

x86:

$ env HOSTS='arm-linux-gnueabihf' ./contrib/guix/guix-build 
$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz
b8bb092b1307684ea4b53d810ac110ec14f29eeab8028d924d1cac7418009b14  guix-build-c32fa85909dd/output/dist-archive/bitcoin-c32fa85909dd.tar.gz

arm64:

$ env HOSTS='arm-linux-gnueabihf' ./contrib/guix/guix-build 
$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum

28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz
b8bb092b1307684ea4b53d810ac110ec14f29eeab8028d924d1cac7418009b14  guix-build-c32fa85909dd/output/dist-archive/bitcoin-c32fa85909dd.tar.gz

Copy link
Member

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

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

ACK c32fa85

nice fix :)

@achow101
Copy link
Member

ACK c32fa85

x86_64:

28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz

arm64:

28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz

@achow101 achow101 merged commit 9c97ba5 into bitcoin:master Jul 19, 2022
@fanquake fanquake deleted the libdouble_non_determinism branch July 19, 2022 20:45
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jul 20, 2022
…ross-arch reproducibility for arm32

c32fa85 depends: modify FastFixedDtoa optimisation flags (fanquake)

Pull request description:

  This fixes a non-determinism issue in the asm produced for
  this function when cross-compiling on x86_64 and aarch64 for
  the arm-linux-gnueabihf HOST.

  Related to bitcoin#21194. Alternative to bitcoin#25636. Initial discussion in bitcoin#24615 (comment).

  Guix Build (x86_64):
  ```bash
  28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
  48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
  850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz
  b8bb092b1307684ea4b53d810ac110ec14f29eeab8028d924d1cac7418009b14  guix-build-c32fa85909dd/output/dist-archive/bitcoin-c32fa85909dd.tar.gz
  ```

  Guix Build (arm64):
  ```bash
  28ae0ec2874ead334edd1c5dc509344379d82f7058b649c9076992defd7190d7  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/SHA256SUMS.part
  48d34073b029c4f62c8e1bd906533610228d5ca0bb5eefea6010dfa7372ba067  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf-debug.tar.gz
  850d6e9859e88bcb93ed586bdb0c0bc95a44249d6a0ec1b1d13125cb9dd56413  guix-build-c32fa85909dd/output/arm-linux-gnueabihf/bitcoin-c32fa85909dd-arm-linux-gnueabihf.tar.gz
  b8bb092b1307684ea4b53d810ac110ec14f29eeab8028d924d1cac7418009b14  guix-build-c32fa85909dd/output/dist-archive/bitcoin-c32fa85909dd.tar.gz
  ```

ACKs for top commit:
  achow101:
    ACK c32fa85
  hebasto:
    ACK c32fa85
  jarolrod:
    ACK c32fa85

Tree-SHA512: 137d76274b1421247f43e5f040b4b5c42473f94d734498c73ab40e580c47dfecbbf11f1a69c15a87d805d4b8e9ef1fd62cc1b69c0f1614c62ff3cba98b1733e8
kwvg added a commit to kwvg/dash that referenced this pull request May 9, 2023
kwvg added a commit to kwvg/dash that referenced this pull request May 9, 2023
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request May 26, 2023
Summary:
This brings us to the same set of patches as the current tip of the Core repository, minus the ones for architectures we don't support (mainly android and arm64 MacOS)

> build, qt: Hardcode last modified timestamp in Qt RCC
>
> This change allows the already built qt package to be reused even with
> the SOURCE_DATE_EPOCH variable set, e.g., for Guix builds.

> build: patch around qt duplicate symbol issue
>
> This is currently causing the same failure in two different PRs:
> ```bash
> duplicate symbol 'lcQpaFonts()' in:
>     /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5ThemeSupport.a(qgenericunixthemes.o)
>     /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5FontDatabaseSupport.a(qfontengine_coretext.o)
> ld: 1 duplicate symbol for architecture x86_64
> ```
>
> ```bash
> x86_64-apple-darwin-ld: error: duplicate symbol: __Z10lcQpaFontsv
> >>> defined in /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5ThemeSupport.a(qgenericunixthemes.o)
> >>> defined in /tmp/cirrus-ci-build/depends/x86_64-apple-darwin/lib/libQt5FontDatabaseSupport.a(qfontengine_coretext.o)
> ```
>
> Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
>

> depends: modify FastFixedDtoa optimisation flags
>
> This fixes a non-determinism issue in the asm produced for
> this function when cross-compiling on x86_64 and aarch64 for
> the arm-linux-gnueabihf HOST.
>
> Related to #21194.

> guix: More thoroughly control native toolchain

This patch has been updated (line numbers in the diff only)  to account for a Qt version bump (D13918)

This is a backport of [[bitcoin/bitcoin#23862 | core#23862]], [[bitcoin/bitcoin#24722 | core#24722]] and [[bitcoin/bitcoin#25643 | core#25643]]

and bitcoin/bitcoin@c1ae726

Depends on D13926

Test Plan: local crossbuild of qt, gitian builds, guix build

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D13927
kwvg added a commit to kwvg/dash that referenced this pull request May 31, 2023
kwvg added a commit to kwvg/dash that referenced this pull request Jun 8, 2023
kwvg added a commit to kwvg/dash that referenced this pull request Jun 11, 2023
kwvg added a commit to kwvg/dash that referenced this pull request Jun 11, 2023
kwvg added a commit to kwvg/dash that referenced this pull request Jun 19, 2023
kwvg added a commit to kwvg/dash that referenced this pull request Jun 20, 2023
kwvg added a commit to kwvg/dash that referenced this pull request Jun 27, 2023
kwvg added a commit to kwvg/dash that referenced this pull request Jun 27, 2023
kwvg added a commit to kwvg/dash that referenced this pull request Jun 28, 2023
kwvg added a commit to kwvg/dash that referenced this pull request Jun 28, 2023
PastaPastaPasta pushed a commit to kwvg/dash that referenced this pull request Jun 29, 2023
@bitcoin bitcoin locked and limited conversation to collaborators Jul 19, 2023
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.

None yet

5 participants