mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-24 05:36:46 +00:00
Pull in ethash and go-isatty updates
Fixes build on OpenBSD.
This commit is contained in:
parent
0cdc7647aa
commit
6d1cdf86d7
8 changed files with 11 additions and 4 deletions
5
Godeps/Godeps.json
generated
5
Godeps/Godeps.json
generated
|
|
@ -21,8 +21,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/ethereum/ethash",
|
"ImportPath": "github.com/ethereum/ethash",
|
||||||
"Comment": "v23.1-227-g8f6ccaa",
|
"Rev": "227ec953eae56f4f6c7f5e7dc93b4bbebf0cda2e"
|
||||||
"Rev": "8f6ccaaef9b418553807a73a95cb5f49cd3ea39f"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/gizak/termui",
|
"ImportPath": "github.com/gizak/termui",
|
||||||
|
|
@ -51,7 +50,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/mattn/go-isatty",
|
"ImportPath": "github.com/mattn/go-isatty",
|
||||||
"Rev": "fdbe02a1b44e75977b2690062b83cf507d70c013"
|
"Rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/mattn/go-runewidth",
|
"ImportPath": "github.com/mattn/go-runewidth",
|
||||||
|
|
|
||||||
0
Godeps/_workspace/src/github.com/ethereum/ethash/setup.py
generated
vendored
Normal file → Executable file
0
Godeps/_workspace/src/github.com/ethereum/ethash/setup.py
generated
vendored
Normal file → Executable file
4
Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h
generated
vendored
4
Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h
generated
vendored
|
|
@ -35,6 +35,10 @@
|
||||||
#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
|
#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
|
||||||
#define ethash_swap_u32(input_) bswap32(input_)
|
#define ethash_swap_u32(input_) bswap32(input_)
|
||||||
#define ethash_swap_u64(input_) bswap64(input_)
|
#define ethash_swap_u64(input_) bswap64(input_)
|
||||||
|
#elif defined(__OpenBSD__)
|
||||||
|
#include <endian.h>
|
||||||
|
#define ethash_swap_u32(input_) swap32(input_)
|
||||||
|
#define ethash_swap_u64(input_) swap64(input_)
|
||||||
#else // posix
|
#else // posix
|
||||||
#include <byteswap.h>
|
#include <byteswap.h>
|
||||||
#define ethash_swap_u32(input_) __bswap_32(input_)
|
#define ethash_swap_u32(input_) __bswap_32(input_)
|
||||||
|
|
|
||||||
4
Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/fnv.h
generated
vendored
4
Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/fnv.h
generated
vendored
|
|
@ -29,6 +29,10 @@ extern "C" {
|
||||||
|
|
||||||
#define FNV_PRIME 0x01000193
|
#define FNV_PRIME 0x01000193
|
||||||
|
|
||||||
|
/* The FNV-1 spec multiplies the prime with the input one byte (octet) in turn.
|
||||||
|
We instead multiply it with the full 32-bit input.
|
||||||
|
This gives a different result compared to a canonical FNV-1 implementation.
|
||||||
|
*/
|
||||||
static inline uint32_t fnv_hash(uint32_t const x, uint32_t const y)
|
static inline uint32_t fnv_hash(uint32_t const x, uint32_t const y)
|
||||||
{
|
{
|
||||||
return x * FNV_PRIME ^ y;
|
return x * FNV_PRIME ^ y;
|
||||||
|
|
|
||||||
0
Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh
generated
vendored
Normal file → Executable file
0
Godeps/_workspace/src/github.com/ethereum/ethash/test/c/test.sh
generated
vendored
Normal file → Executable file
0
Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh
generated
vendored
Normal file → Executable file
0
Godeps/_workspace/src/github.com/ethereum/ethash/test/python/test.sh
generated
vendored
Normal file → Executable file
0
Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh
generated
vendored
Normal file → Executable file
0
Godeps/_workspace/src/github.com/ethereum/ethash/test/test.sh
generated
vendored
Normal file → Executable file
2
Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go
generated
vendored
2
Godeps/_workspace/src/github.com/mattn/go-isatty/isatty_bsd.go
generated
vendored
|
|
@ -1,4 +1,4 @@
|
||||||
// +build darwin freebsd
|
// +build darwin freebsd openbsd netbsd
|
||||||
|
|
||||||
package isatty
|
package isatty
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue