diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11217af266186..82a5ae0ec1541 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,9 +95,6 @@ jobs: tidy: false os: ubuntu-latest env: {} - - name: x86_64-gnu-tools - os: ubuntu-latest - env: {} defaults: run: shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}" diff --git a/build.sh b/build.sh index 417362a1d4aa6..90c9ce1747bc2 100755 --- a/build.sh +++ b/build.sh @@ -20,4 +20,4 @@ esac if [ "$1" == "--llvm" ]; then rm -f build/${HOST_TRIPLE}/llvm/llvm-finished-building; fi -./x.py build --stage 1 --target ${HOST_TRIPLE},sbf-solana-solana,sbpf-solana-solana,sbpfv1-solana-solana,sbpfv2-solana-solana,sbpfv3-solana-solana +./x.py build --stage 1 --target ${HOST_TRIPLE},sbpf-solana-solana,sbpfv1-solana-solana,sbpfv2-solana-solana,sbpfv3-solana-solana diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs index bea0db63a970d..c22480e629cb3 100644 --- a/compiler/rustc_codegen_ssa/src/back/linker.rs +++ b/compiler/rustc_codegen_ssa/src/back/linker.rs @@ -346,9 +346,6 @@ impl<'a> GccLinker<'a> { if self.sess.opts.cg.target_cpu.as_ref() .unwrap_or(&self.sess.target.cpu.as_ref().to_string()) == "v3" { self.linker_arg("-Bsymbolic"); - if self.sess.opts.debuginfo == DebugInfo::None { - self.linker_arg("--strip-all"); - } } } } diff --git a/compiler/rustc_codegen_ssa/src/back/metadata.rs b/compiler/rustc_codegen_ssa/src/back/metadata.rs index 3db897ebf2b05..2bd6a3d197161 100644 --- a/compiler/rustc_codegen_ssa/src/back/metadata.rs +++ b/compiler/rustc_codegen_ssa/src/back/metadata.rs @@ -213,6 +213,9 @@ pub(crate) fn create_object_file(sess: &Session) -> Option (Architecture::Msp430, None), "hexagon" => (Architecture::Hexagon, None), "bpf" => (Architecture::Bpf, None), + "sbf" if sess.target.options.cpu.as_ref() == "v3" => { + (Architecture::Bpf, None) + }, "loongarch64" => (Architecture::LoongArch64, None), "csky" => (Architecture::Csky, None), "arm64ec" => (Architecture::Aarch64, Some(SubArchitecture::Arm64EC)), diff --git a/compiler/rustc_target/src/spec/base/sbf_base.rs b/compiler/rustc_target/src/spec/base/sbf_base.rs index 864b07762b077..dc902b7e67fa6 100644 --- a/compiler/rustc_target/src/spec/base/sbf_base.rs +++ b/compiler/rustc_target/src/spec/base/sbf_base.rs @@ -31,35 +31,15 @@ SECTIONS const V3_LINKER_SCRIPT: &str = r" SECTIONS { - .text 0x000000000 : { - . = 0x00; - KEEP(*(.text.abort)) - *(.text*) - } :text - .rodata 0x100000000 : { + .rodata 0x000000000 : SUBALIGN(8) { + BYTE(0); *(.rodata*) *(.data.rel.ro*) - BYTE(0); . = ALIGN(8); } :rodata - .bss.stack 0x200000000 (NOLOAD) : { - _stack_start = .; - . = . + 0x1000; - _stack_end = .; - . = ALIGN(8); - } :stack - .bss.heap 0x300000000 (NOLOAD) : { - _heap_start = .; - . = . + 0x1000; - _heap_end = .; - . = ALIGN(8); - } :heap - .dynsym 0xFFFFFFFF00000000 : { - *(.dynsym) - . = ALIGN(8); - } :dynsym - .strtab : { *(.strtab) } :other - .dynstr : { *(.dynstr) } :other + .text 0x100000000 : { + *(.text*) + } :text /DISCARD/ : { *(.comment*) *(.eh_frame*) @@ -68,15 +48,15 @@ SECTIONS *(.data*) *(.rel.dyn*) *(.dynamic) + *(.dynsym) + *(.dynstr) } } + PHDRS { - text PT_LOAD FLAGS(1); rodata PT_LOAD FLAGS(4); - stack PT_GNU_STACK FLAGS(6); - heap PT_LOAD FLAGS(6); - dynsym PT_NULL FLAGS(0); + text PT_LOAD FLAGS(1); other PT_NULL FLAGS(0); } "; diff --git a/compiler/rustc_target/src/target_features.rs b/compiler/rustc_target/src/target_features.rs index b221332338777..244f57c724598 100644 --- a/compiler/rustc_target/src/target_features.rs +++ b/compiler/rustc_target/src/target_features.rs @@ -325,7 +325,7 @@ const WASM_ALLOWED_FEATURES: &[(&str, Stability)] = &[ // tidy-alphabetical-end ]; -const BPF_ALLOWED_FEATURES: &[(&str, Stability)] = &[("alu32", Unstable(sym::bpf_target_feature))]; +const BPF_ALLOWED_FEATURES: &[(&str, Stability)] = &[("alu32", Stable)]; const SBF_ALLOWED_FEATURES: &[(&str, Stability)] = &[("alu32", Unstable(sym::sbf_target_feature)), ("static-syscalls", Stable)]; diff --git a/src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile b/src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile index 1a5481964fa63..d8080d6593070 100644 --- a/src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile +++ b/src/ci/docker/host-x86_64/sbpfv3-solana-solana/Dockerfile @@ -23,7 +23,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y RUN PATH="${HOME}/.cargo/bin:${PATH}" \ cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \ - --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \ + --rev db104fd1ce22986a0935f10f07e7e1f889db7e80 \ --bin cargo-run-solana-tests --root /usr/local COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/docker/scripts/sccache.sh b/src/ci/docker/scripts/sccache.sh index 4ea5ab6ffa285..3d7fa36092330 100644 --- a/src/ci/docker/scripts/sccache.sh +++ b/src/ci/docker/scripts/sccache.sh @@ -6,10 +6,10 @@ set -ex case "$(uname -m)" in x86_64) - url="https://cached-ci-artifacts.s3.us-east-2.amazonaws.com/sccache-5d2a373-x86_64-unknown-linux-musl" + url="https://ci-mirrors.rust-lang.org/rustc/2021-08-24-sccache-v0.2.15-x86_64-unknown-linux-musl" ;; aarch64) - url="https://ci-mirrors.rust-lang.org/rustc/2021-08-25-sccache-v0.2.15-aarch64-unknown-linux-musl" + url="https://ci-mirrors.rust-lang.org/rustc/2025-02-24-sccache-v0.10.0-aarch64-unknown-linux-musl" ;; *) echo "unsupported architecture: $(uname -m)" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index a40f5718c63f4..fc20d5422bc94 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -385,9 +385,6 @@ jobs: <<: *job-linux-16c tidy: false - - name: x86_64-gnu-tools - <<: *job-linux-16c - push: <<: *base-ci-job name: push diff --git a/src/llvm-project b/src/llvm-project index d735770352aec..774bca3836167 160000 --- a/src/llvm-project +++ b/src/llvm-project @@ -1 +1 @@ -Subproject commit d735770352aec84c81e66648967e211fe50c41a2 +Subproject commit 774bca383616782db9398b451baab4d091061be9