pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-09 21:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

contracts: Update to Polkavm 0.5 (#2945)

Browse Source 
This will allow us to change to the target supporting atomics and makes
the linker file no longer necessary.
This commit is contained in:
Alexander Theißen
2024-01-17 12:39:33 +01:00
committed by GitHub
parent 8b28031d16
commit c1c0e62d33
5 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/contracts/fixtures/Cargo.toml
+1 -1
View File
@@ -21,7 +21,7 @@ parity-wasm = "0.45.0"
tempfile = "3.8.1"
toml = "0.8.2"
twox-hash = "1.6.3"
polkavm-linker = { version = "0.4.0", optional = true }
polkavm-linker = { version = "0.5.0", optional = true }
anyhow = "1.0.0"
[features]
substrate/frame/contracts/fixtures/build.rs
+8 -7
View File
@@ -234,11 +234,12 @@ fn post_process_wasm(input_path: &Path, output_path: &Path) -> Result<()> {
/// Build contracts for RISC-V.
#[cfg(feature = "riscv")]
fn invoke_riscv_build(current_dir: &Path) -> Result<()> {
let encoded_rustflags =
["-Crelocation-model=pie", "-Clink-arg=--emit-relocs", "-Clink-arg=-Tmemory.ld"]
.join("\x1f");
fs::write(current_dir.join("memory.ld"), include_bytes!("./build/riscv_memory_layout.ld"))?;
let encoded_rustflags = [
"-Crelocation-model=pie",
"-Clink-arg=--emit-relocs",
"-Clink-arg=--export-dynamic-symbol=__polkavm_symbol_export_hack__*",
]
.join("\x1f");
let build_res = Command::new(env::var("CARGO")?)
.current_dir(current_dir)
@@ -247,7 +248,7 @@ fn invoke_riscv_build(current_dir: &Path) -> Result<()> {
.env("CARGO_ENCODED_RUSTFLAGS", encoded_rustflags)
.env("RUSTUP_TOOLCHAIN", "rve-nightly")
.env("RUSTUP_HOME", env::var("RUSTUP_HOME").unwrap_or_default())
.args(["build", "--release", "--target=riscv32em-unknown-none-elf"])
.args(["build", "--release", "--target=riscv32ema-unknown-none-elf"])
.output()
.expect("failed to execute process");
@@ -288,7 +289,7 @@ fn write_output(build_dir: &Path, out_dir: &Path, entries: Vec<Entry>) -> Result
#[cfg(feature = "riscv")]
post_process_riscv(
&build_dir.join("target/riscv32em-unknown-none-elf/release").join(entry.name()),
&build_dir.join("target/riscv32ema-unknown-none-elf/release").join(entry.name()),
&out_dir.join(entry.out_riscv_filename()),
)?;
substrate/frame/contracts/fixtures/build/Cargo.toml
+1 -1
View File
@@ -10,7 +10,7 @@ edition = "2021"
[dependencies]
uapi = { package = 'pallet-contracts-uapi', path = "", default-features = false }
common = { package = 'pallet-contracts-fixtures-common', path = "" }
polkavm-derive = '0.4.0'
polkavm-derive = '0.5.0'
[profile.release]
opt-level = 3
substrate/frame/contracts/fixtures/build/riscv_memory_layout.ld
-4
View File
@@ -1,4 +0,0 @@
SECTIONS {
.text : { KEEP(*(.text.polkavm_export)) }
}