Update to latest Bitcoin patches for LevelDB #10958

pull sipa wants to merge 2 commits into bitcoin:master from sipa:20170731_leveldb changing 11 files +63 −44
  1. sipa commented at 6:52 AM on July 31, 2017: member

    Includes:

  2. sipa added this to the milestone 0.15.0 on Jul 31, 2017
  3. gmaxwell commented at 7:06 AM on July 31, 2017: contributor

    utACK. The warnings are obnoxious.

  4. MarcoFalke commented at 7:16 AM on July 31, 2017: member

    You'd have to merge https://github.com/bitcoin-core/leveldb/pull/6 as well for the warning to go away.

    • With "warning" I mean the failed subtree check:
    ./contrib/devtools/git-subtree-check.sh src/leveldb
    FAIL: subtree directory tree doesn't match subtree commit tree
    
  5. sipa commented at 7:32 AM on July 31, 2017: member

    @theuni Care to have a look? Apparently we try to build the cpuid detection code on ARM.

  6. theuni commented at 4:04 PM on July 31, 2017: member
  7. laanwj commented at 12:32 PM on August 1, 2017: member

    Looks like it builds, we can get rid of the [DONTMERGE]?

  8. Squashed 'src/leveldb/' changes from 196962ff0..c521b3ac6
    c521b3ac6 Merge #11: fixup define checks. Cleans up some oopses from #5.
    8b1cd3753 fixup define checks. Cleans up some oopses from #5.
    6b1508d6d Merge #6: Fixes typo
    fceb80542 Merge #10: Clean up compile-time warnings (gcc 7.1)
    0ec2a343f Clean up compile-time warnings (gcc 7.1)
    d4c268a35 Merge #5: Move helper functions out of sse4.2 object
    8d4eb0847 Add HasAcceleratedCRC32C to port_win.h
    77cfbfd25 crc32: move helper functions out of port_posix_sse.cc
    4c1e9e016 silence compiler warnings about uninitialized variables
    495316485 Merge #2: Prefer std::atomic over MemoryBarrier
    2953978ef Fixes typo
    f134284a1 Merge #1: Merge upstream LevelDB 1.20
    ba8a445fd Prefer std::atomic over MemoryBarrier
    
    git-subtree-dir: src/leveldb
    git-subtree-split: c521b3ac654cfbe009c575eacf7e5a6e189bb5bb
    b13a68e129
  9. Update LevelDB with latest Bitcoin-specific patches 47f3e8c74d
  10. sipa force-pushed on Aug 1, 2017
  11. sipa commented at 7:44 PM on August 1, 2017: member

    @laanwj Done

  12. MarcoFalke commented at 8:03 PM on August 1, 2017: member

    utACK 47f3e8c74d390139967cc40e37cf5b433f0b0f9f. Looks good:

    ./contrib/devtools/git-subtree-check.sh src/leveldb
    src/leveldb in HEAD was last updated to upstream commit c521b3ac654cfbe009c575eacf7e5a6e189bb5bb (tree c461c1652fef37b42ddc18a02cbc28920342270d)
    src/leveldb in HEAD currently refers to tree c461c1652fef37b42ddc18a02cbc28920342270d
    GOOD
    
  13. theuni commented at 9:20 PM on August 1, 2017: member

    ACK 47f3e8c74d390139967cc40e37cf5b433f0b0f9f, tested previous versions of this.

  14. promag commented at 10:41 PM on August 1, 2017: member

    ACK 47f3e8c.

  15. laanwj commented at 7:00 AM on August 2, 2017: member

    utACK 47f3e8c

  16. laanwj merged this on Aug 2, 2017
  17. laanwj closed this on Aug 2, 2017

  18. laanwj referenced this in commit 659c096134 on Aug 2, 2017
  19. sickpig referenced this in commit 99cfe5237f on Aug 17, 2017
  20. protonn referenced this in commit 31c54310a3 on Jan 11, 2018
  21. PastaPastaPasta referenced this in commit 26addee878 on Aug 6, 2019
  22. PastaPastaPasta referenced this in commit 3b4d9113eb on Aug 6, 2019
  23. PastaPastaPasta referenced this in commit 51cd2d4fc4 on Aug 6, 2019
  24. PastaPastaPasta referenced this in commit 584cf7b291 on Aug 7, 2019
  25. PastaPastaPasta referenced this in commit 794f2120af on Aug 8, 2019
  26. PastaPastaPasta referenced this in commit 707f3ec860 on Aug 12, 2019
  27. barrystyle referenced this in commit 3f914d04f1 on Jan 22, 2020
  28. zkbot referenced this in commit 59d6a92e7d on Sep 22, 2020
  29. zkbot referenced this in commit 514d868179 on Sep 25, 2020
  30. MarcoFalke locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-17 00:15 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me