From 8c6cb674c986b4fc5c6c94dbd735f2d762dbe67c Mon Sep 17 00:00:00 2001
From: Antoni Boucher <bouanto@zoho.com>
Date: Tue, 26 May 2026 06:46:50 -0400
Subject: [PATCH 1/2] Test CI

---
 .../rustc_codegen_gcc/src/intrinsic/mod.rs    | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/compiler/rustc_codegen_gcc/src/intrinsic/mod.rs b/compiler/rustc_codegen_gcc/src/intrinsic/mod.rs
index 728cd90cf637d..64a6a49e18218 100644
--- a/compiler/rustc_codegen_gcc/src/intrinsic/mod.rs
+++ b/compiler/rustc_codegen_gcc/src/intrinsic/mod.rs
@@ -140,24 +140,6 @@ fn get_simple_function_f128<'gcc, 'tcx>(
     )
 }
 
-fn generic_f16_builtin<'gcc, 'tcx>(
-    cx: &CodegenCx<'gcc, 'tcx>,
-    name: Symbol,
-    args: &[OperandRef<'tcx, RValue<'gcc>>],
-) -> RValue<'gcc> {
-    let f32_type = cx.type_f32();
-    let builtin_name = match name {
-        sym::fabs => "fabsf",
-        _ => unreachable!(),
-    };
-
-    let func = cx.context.get_builtin_function(builtin_name);
-    let args: Vec<_> =
-        args.iter().map(|arg| cx.context.new_cast(None, arg.immediate(), f32_type)).collect();
-    let result = cx.context.new_call(None, func, &args);
-    cx.context.new_cast(None, result, cx.type_f16())
-}
-
 fn f16_builtin<'gcc, 'tcx>(
     cx: &CodegenCx<'gcc, 'tcx>,
     name: Symbol,
@@ -248,6 +230,7 @@ impl<'a, 'gcc, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tc
             | sym::copysignf16
             | sym::expf16
             | sym::exp2f16
+            | sym::fabs
             | sym::floorf16
             | sym::fmaf16
             | sym::logf16
@@ -467,7 +450,7 @@ impl<'a, 'gcc, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tc
                     span_bug!(span, "expected float type for fabs intrinsic: {:?}", ty);
                 };
                 let func = match float_ty {
-                    ty::FloatTy::F16 => break 'fabs generic_f16_builtin(self, name, args),
+                    ty::FloatTy::F16 => break 'fabs f16_builtin(self, name, args),
                     ty::FloatTy::F32 => self.context.get_builtin_function("fabsf"),
                     ty::FloatTy::F64 => self.context.get_builtin_function("fabs"),
                     ty::FloatTy::F128 => get_simple_function_f128(span, self, name),

From 7f05931d59e07369f5786756f07daca80b3dae6a Mon Sep 17 00:00:00 2001
From: Antoni Boucher <bouanto@zoho.com>
Date: Sat, 30 May 2026 08:05:22 -0400
Subject: [PATCH 2/2] Revert "Add missing --set rust.codegen-backends=["gcc"]
 in the gcc codegen Dockerfile for the core tests"

This reverts commit fd0c5f37e79ace0c3e547b65ec1087dfe12cb10d.
---
 src/ci/docker/host-x86_64/x86_64-gnu-gcc-core-tests/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-gcc-core-tests/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-gcc-core-tests/Dockerfile
index d0f0b461c0f59..773bd11b9abfb 100644
--- a/src/ci/docker/host-x86_64/x86_64-gnu-gcc-core-tests/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-gcc-core-tests/Dockerfile
@@ -43,5 +43,4 @@ ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu \
  --set llvm.libzstd=true"
 ENV SCRIPT="python3 ../x.py \
   --stage 1 \
-  test library/coretests \
-  --set rust.codegen-backends=[\\\"gcc\\\"]"
+  test library/coretests"