poanetwork
/
parity-common
mirror of https://github.com/poanetwork/parity-common.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use ASM only with feature

This commit is contained in:
Robert Habermeier 2018-01-31 21:48:47 +01:00
parent 30f15bb338
commit 2e10eb3e76
8 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethbloom/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "ethbloom" name = "ethbloom"
version = "0.4.0" version = "0.4.1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Ethereum bloom filter" description = "Ethereum bloom filter"
license = "MIT" license = "MIT"

2
ethbloom/src/lib.rs
View File

@ -28,8 +28,6 @@
#![cfg_attr(not(feature="std"), no_std)] #![cfg_attr(not(feature="std"), no_std)]
#![cfg_attr(asm_available, feature(asm))]
#[cfg(feature="std")] #[cfg(feature="std")]
extern crate core; extern crate core;

3
ethereum-types/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "ethereum-types" name = "ethereum-types"
version = "0.2.0" version = "0.2.1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT" license = "MIT"
homepage = "https://github.com/paritytech/primitives" homepage = "https://github.com/paritytech/primitives"
@ -22,3 +22,4 @@ default = ["std", "heapsizeof", "serialize"]
std = ["uint/std", "fixed-hash/std", "ethbloom/std"] std = ["uint/std", "fixed-hash/std", "ethbloom/std"]
heapsizeof = ["uint/heapsizeof", "fixed-hash/heapsizeof", "ethbloom/heapsizeof"] heapsizeof = ["uint/heapsizeof", "fixed-hash/heapsizeof", "ethbloom/heapsizeof"]
serialize = ["std", "ethereum-types-serialize", "serde", "ethbloom/serialize"] serialize = ["std", "ethereum-types-serialize", "serde", "ethbloom/serialize"]
use_asm = ["uint/use_asm"]

6
ethereum-types/build.rs
View File

@ -11,7 +11,9 @@ extern crate rustc_version;
use rustc_version::{version_meta, Channel}; use rustc_version::{version_meta, Channel};
fn main() { fn main() {
if let Channel::Nightly = version_meta().unwrap().channel { if cfg!(feature = "use_asm") {
println!("cargo:rustc-cfg=asm_available"); if let Channel::Nightly = version_meta().unwrap().channel {
println!("cargo:rustc-cfg=asm_available");
}
} }
} }

3
tests/Cargo.toml
View File

@ -11,3 +11,6 @@ crunchy = "0.1.5"
ethereum-types = { path ="../ethereum-types", features = ["std", "heapsizeof"] } ethereum-types = { path ="../ethereum-types", features = ["std", "heapsizeof"] }
quickcheck = "0.6" quickcheck = "0.6"
uint = { path = "../uint" } uint = { path = "../uint" }
[features]
use_asm = ["uint/use_asm", "ethereum-types/use_asm"]

6
tests/build.rs
View File

@ -11,7 +11,9 @@ extern crate rustc_version;
use rustc_version::{version_meta, Channel}; use rustc_version::{version_meta, Channel};
fn main() { fn main() {
if let Channel::Nightly = version_meta().unwrap().channel { if cfg!(feature = "use_asm") {
println!("cargo:rustc-cfg=asm_available"); if let Channel::Nightly = version_meta().unwrap().channel {
println!("cargo:rustc-cfg=asm_available");
}
} }
} }

3
uint/Cargo.toml
View File

@ -4,7 +4,7 @@ homepage = "http://parity.io"
repository = "https://github.com/paritytech/primitives" repository = "https://github.com/paritytech/primitives"
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
name = "uint" name = "uint"
version = "0.1.0" version = "0.1.1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs" build = "build.rs"
@ -22,6 +22,7 @@ crunchy = "0.1.5"
[features] [features]
std = ["rustc-hex"] std = ["rustc-hex"]
heapsizeof = ["heapsize"] heapsizeof = ["heapsize"]
use_asm = []
[[example]] [[example]]
name = "modular" name = "modular"

6
uint/build.rs
View File

@ -11,7 +11,9 @@ extern crate rustc_version;
use rustc_version::{version_meta, Channel}; use rustc_version::{version_meta, Channel};
fn main() { fn main() {
if let Channel::Nightly = version_meta().unwrap().channel { if cfg!(feature = "use_asm") {
println!("cargo:rustc-cfg=asm_available"); if let Channel::Nightly = version_meta().unwrap().channel {
println!("cargo:rustc-cfg=asm_available");
}
} }
} }