diff --git a/ci/docker/sbf-solana-solana/Dockerfile b/ci/docker/sbf-solana-solana/Dockerfile
index d60cc649f..129837350 100644
--- a/ci/docker/sbf-solana-solana/Dockerfile
+++ b/ci/docker/sbf-solana-solana/Dockerfile
@@ -12,12 +12,12 @@ RUN cargo install --git https://github.com/solana-labs/cargo-run-solana-tests.gi
     --rev df2f642924aee7bbd2566017b3d71cb0c389b015 \
     --bin cargo-run-solana-tests --root /usr/local
 
-RUN mkdir -p /tmp/.cache/solana/v1.38/platform-tools
-RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/solana-labs/platform-tools/releases/download/v1.38/platform-tools-linux-x86_64.tar.bz2
-RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.38/platform-tools
-RUN rustup toolchain link solana /tmp/.cache/solana/v1.38/platform-tools/rust
+RUN mkdir -p /tmp/.cache/solana/v1.41/platform-tools
+RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/solana-labs/platform-tools/releases/download/v1.41/platform-tools-linux-x86_64.tar.bz2
+RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.41/platform-tools
+RUN rustup toolchain link solana /tmp/.cache/solana/v1.41/platform-tools/rust
 RUN cp -R ${HOME}/.rustup /tmp/
 
 ENV CARGO_TARGET_SBF_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
-ENV CC="/tmp/.cache/solana/v1.38/platform-tools/llvm/bin/clang"
+ENV CC="/tmp/.cache/solana/v1.41/platform-tools/llvm/bin/clang"
 ENV RUSTUP_TOOLCHAIN="solana"
diff --git a/src/float/mod.rs b/src/float/mod.rs
index b0fbe8aff..946b07ee1 100644
--- a/src/float/mod.rs
+++ b/src/float/mod.rs
@@ -185,9 +185,9 @@ macro_rules! float_impl {
     };
 }
 
-#[cfg(not(feature = "no-f16-f128"))]
+#[cfg(not(all(feature = "no-f16-f128", target_os = "solana")))]
 float_impl!(f16, u16, i16, i8, 16, 10);
 float_impl!(f32, u32, i32, i16, 32, 23);
 float_impl!(f64, u64, i64, i16, 64, 52);
-#[cfg(not(feature = "no-f16-f128"))]
+#[cfg(not(all(feature = "no-f16-f128", target_os = "solana")))]
 float_impl!(f128, u128, i128, i16, 128, 112);
diff --git a/testcrate/tests/misc.rs b/testcrate/tests/misc.rs
index 053acd485..d82740b7d 100644
--- a/testcrate/tests/misc.rs
+++ b/testcrate/tests/misc.rs
@@ -146,4 +146,4 @@ fn float_pow() {
         f32, 1e-4, __powisf2;
         f64, 1e-12, __powidf2;
     );
-}
\ No newline at end of file
+}