diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml
index fb1f8c86dbfd5..541257b6cda6e 100644
--- a/library/alloc/Cargo.toml
+++ b/library/alloc/Cargo.toml
@@ -21,7 +21,6 @@ compiler_builtins = { path = "../compiler-builtins/compiler-builtins", features
 [features]
 compiler-builtins-mem = ['compiler_builtins/mem']
 compiler-builtins-c = ["compiler_builtins/c"]
-compiler-builtins-no-f16-f128 = ["compiler_builtins/no-f16-f128"]
 # Choose algorithms that are optimized for binary size instead of runtime performance
 optimize_for_size = ["core/optimize_for_size"]
 
diff --git a/library/compiler-builtins/builtins-shim/Cargo.toml b/library/compiler-builtins/builtins-shim/Cargo.toml
index ac77224f5ce1e..746d5b21dc3f1 100644
--- a/library/compiler-builtins/builtins-shim/Cargo.toml
+++ b/library/compiler-builtins/builtins-shim/Cargo.toml
@@ -47,10 +47,6 @@ c = ["dep:cc"]
 # the generic versions on all platforms.
 no-asm = []
 
-# Workaround for codegen backends which haven't yet implemented `f16` and
-# `f128` support. Disabled any intrinsics which use those types.
-no-f16-f128 = []
-
 # Flag this library as the unstable compiler-builtins lib
 compiler-builtins = []
 
diff --git a/library/compiler-builtins/builtins-test/Cargo.toml b/library/compiler-builtins/builtins-test/Cargo.toml
index 9346ea65420b2..550f736a76dbb 100644
--- a/library/compiler-builtins/builtins-test/Cargo.toml
+++ b/library/compiler-builtins/builtins-test/Cargo.toml
@@ -33,7 +33,6 @@ utest-macros = { git = "https://github.com/japaric/utest" }
 default = ["mangled-names"]
 c = ["compiler_builtins/c"]
 no-asm = ["compiler_builtins/no-asm"]
-no-f16-f128 = ["compiler_builtins/no-f16-f128"]
 mem = ["compiler_builtins/mem"]
 mangled-names = ["compiler_builtins/mangled-names"]
 # Skip tests that rely on f128 symbols being available on the system
diff --git a/library/compiler-builtins/ci/run.sh b/library/compiler-builtins/ci/run.sh
index bc94d42fe837a..0c07b32c74b93 100755
--- a/library/compiler-builtins/ci/run.sh
+++ b/library/compiler-builtins/ci/run.sh
@@ -36,8 +36,6 @@ else
     "${test_builtins[@]}" --features c --release
     "${test_builtins[@]}" --features no-asm
     "${test_builtins[@]}" --features no-asm --release
-    "${test_builtins[@]}" --features no-f16-f128
-    "${test_builtins[@]}" --features no-f16-f128 --release
     "${test_builtins[@]}" --benches
     "${test_builtins[@]}" --benches --release
 
@@ -63,8 +61,6 @@ symcheck+=(-- build-and-check)
 "${symcheck[@]}" "$target" -- -p compiler_builtins --features c --release
 "${symcheck[@]}" "$target" -- -p compiler_builtins --features no-asm
 "${symcheck[@]}" "$target" -- -p compiler_builtins --features no-asm --release
-"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-f16-f128
-"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-f16-f128 --release
 
 run_intrinsics_test() {
     build_args=(--verbose --manifest-path builtins-test-intrinsics/Cargo.toml)
diff --git a/library/compiler-builtins/compiler-builtins/Cargo.toml b/library/compiler-builtins/compiler-builtins/Cargo.toml
index 0845861dcfe3c..496dde2d4cf25 100644
--- a/library/compiler-builtins/compiler-builtins/Cargo.toml
+++ b/library/compiler-builtins/compiler-builtins/Cargo.toml
@@ -45,10 +45,6 @@ c = ["dep:cc"]
 # the generic versions on all platforms.
 no-asm = []
 
-# Workaround for codegen backends which haven't yet implemented `f16` and
-# `f128` support. Disabled any intrinsics which use those types.
-no-f16-f128 = []
-
 # Flag this library as the unstable compiler-builtins lib
 compiler-builtins = []
 
diff --git a/library/compiler-builtins/compiler-builtins/configure.rs b/library/compiler-builtins/compiler-builtins/configure.rs
index 79e238abc0f62..f16da6b58f812 100644
--- a/library/compiler-builtins/compiler-builtins/configure.rs
+++ b/library/compiler-builtins/compiler-builtins/configure.rs
@@ -95,16 +95,13 @@ pub fn configure_aliases(target: &Target) {
      * * https://github.com/rust-lang/rustc_codegen_cranelift/blob/c713ffab3c6e28ab4b4dd4e392330f786ea657ad/src/lib.rs#L196-L226
      */
 
-    // If the feature is set, disable both of these types.
-    let no_f16_f128 = target.cargo_features.iter().any(|s| s == "no-f16-f128");
-
     println!("cargo::rustc-check-cfg=cfg(f16_enabled)");
-    if target.reliable_f16 && !no_f16_f128 {
+    if target.reliable_f16 {
         println!("cargo::rustc-cfg=f16_enabled");
     }
 
     println!("cargo::rustc-check-cfg=cfg(f128_enabled)");
-    if target.reliable_f128 && !no_f16_f128 {
+    if target.reliable_f128 {
         println!("cargo::rustc-cfg=f128_enabled");
     }
 }
diff --git a/library/compiler-builtins/libm/configure.rs b/library/compiler-builtins/libm/configure.rs
index 857a302297169..ee65a3a8d6243 100644
--- a/library/compiler-builtins/libm/configure.rs
+++ b/library/compiler-builtins/libm/configure.rs
@@ -143,16 +143,13 @@ fn emit_f16_f128_cfg(cfg: &Config) {
 
     /* See the compiler-builtins configure file for info about the meaning of these options */
 
-    // If the feature is set, disable both of these types.
-    let no_f16_f128 = cfg.cargo_features.iter().any(|s| s == "no-f16-f128");
-
     println!("cargo:rustc-check-cfg=cfg(f16_enabled)");
-    if cfg.reliable_f16 && !no_f16_f128 {
+    if cfg.reliable_f16 {
         println!("cargo:rustc-cfg=f16_enabled");
     }
 
     println!("cargo:rustc-check-cfg=cfg(f128_enabled)");
-    if cfg.reliable_f128 && !no_f16_f128 {
+    if cfg.reliable_f128 {
         println!("cargo:rustc-cfg=f128_enabled");
     }
 }
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
index 5c9ae52d9e6c0..b6683a2ae9ece 100644
--- a/library/std/Cargo.toml
+++ b/library/std/Cargo.toml
@@ -115,7 +115,6 @@ backtrace-trace-only = []
 panic-unwind = ["dep:panic_unwind"]
 compiler-builtins-c = ["alloc/compiler-builtins-c"]
 compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
-compiler-builtins-no-f16-f128 = ["alloc/compiler-builtins-no-f16-f128"]
 llvm-libunwind = ["unwind/llvm-libunwind"]
 system-llvm-libunwind = ["unwind/system-llvm-libunwind"]
 
diff --git a/library/sysroot/Cargo.toml b/library/sysroot/Cargo.toml
index a188680829166..b2069ef6a613b 100644
--- a/library/sysroot/Cargo.toml
+++ b/library/sysroot/Cargo.toml
@@ -25,7 +25,6 @@ backtrace = ["std/backtrace"]
 backtrace-trace-only = ["std/backtrace-trace-only"]
 compiler-builtins-c = ["std/compiler-builtins-c"]
 compiler-builtins-mem = ["std/compiler-builtins-mem"]
-compiler-builtins-no-f16-f128 = ["std/compiler-builtins-no-f16-f128"]
 debug_refcell = ["std/debug_refcell"]
 llvm-libunwind = ["std/llvm-libunwind"]
 system-llvm-libunwind = ["std/system-llvm-libunwind"]