Remove `x86_64-unknown-linux-gnu` run

 + Rename `x86_64-unknown-linux-gnu-emulated` run to `x86_64-unknown-linux-gnu`

6 files changed, 15 insertions, 26 deletions

diff --git a/library/stdarch/.github/workflows/main.yml b/library/stdarch/.github/workflows/main.yml
index 877602e7eb8..b1a3fdf40a7 100644
--- a/library/stdarch/.github/workflows/main.yml
+++ b/library/stdarch/.github/workflows/main.yml
@@ -50,8 +50,6 @@ jobs:
           os: ubuntu-latest
         - tuple: x86_64-unknown-linux-gnu
           os: ubuntu-latest
-        - tuple: x86_64-unknown-linux-gnu-emulated
-          os: ubuntu-latest
         - tuple: arm-unknown-linux-gnueabihf
           os: ubuntu-latest
         - tuple: armv7-unknown-linux-gnueabihf
@@ -159,7 +157,7 @@ jobs:
             os: ubuntu-latest
           test_everything: true
         - target:
-            tuple: x86_64-unknown-linux-gnu-emulated
+            tuple: x86_64-unknown-linux-gnu
             os: ubuntu-latest
           test_everything: true
         # MIPS targets disabled since they are dropped to tier 3.
@@ -202,7 +200,6 @@ jobs:
         rustup update nightly --no-self-update
         rustup default nightly
     - run: rustup target add ${{ matrix.target.tuple }}
-      if: "!endsWith(matrix.target.tuple, 'emulated')"
     - run: cargo generate-lockfile
 
     # Configure some env vars based on matrix configuration
diff --git a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile b/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
deleted file mode 100644
index 9409628f1e4..00000000000
--- a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM ubuntu:25.04
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  gcc \
-  libc6-dev \
-  file \
-  make \
-  ca-certificates \
-  wget \
-  xz-utils
-
-RUN wget http://ci-mirrors.rust-lang.org/stdarch/sde-external-9.53.0-2025-03-16-lin.tar.xz -O sde.tar.xz
-RUN mkdir intel-sde
-RUN tar -xJf sde.tar.xz --strip-components=1 -C intel-sde
-ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/intel-sde/sde64 \
-            -cpuid-in /checkout/ci/docker/x86_64-unknown-linux-gnu-emulated/cpuid.def \
-            -rtm-mode full -tsx --"
-# These tests fail with SDE as it doesn't support saving register data
-ENV STDARCH_TEST_SKIP_FUNCTION="xsave,xsaveopt,xsave64,xsaveopt64"
diff --git a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu/Dockerfile b/library/stdarch/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
index 0266cd02c4a..acde432794e 100644
--- a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
+++ b/library/stdarch/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
@@ -4,4 +4,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libc6-dev \
   file \
   make \
-  ca-certificates
+  ca-certificates \
+  wget \
+  xz-utils
+
+RUN wget http://ci-mirrors.rust-lang.org/stdarch/sde-external-9.53.0-2025-03-16-lin.tar.xz -O sde.tar.xz
+RUN mkdir intel-sde
+RUN tar -xJf sde.tar.xz --strip-components=1 -C intel-sde
+ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/intel-sde/sde64 \
+            -cpuid-in /checkout/ci/docker/x86_64-unknown-linux-gnu/cpuid.def \
+            -rtm-mode full -tsx --"
+# These tests fail with SDE as it doesn't support saving register data
+ENV STDARCH_TEST_SKIP_FUNCTION="xsave,xsaveopt,xsave64,xsaveopt64"
diff --git a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/cpuid.def b/library/stdarch/ci/docker/x86_64-unknown-linux-gnu/cpuid.def
index 4cce9d7a3c0..4cce9d7a3c0 100644
--- a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/cpuid.def
+++ b/library/stdarch/ci/docker/x86_64-unknown-linux-gnu/cpuid.def
diff --git a/library/stdarch/ci/run-docker.sh b/library/stdarch/ci/run-docker.sh
index 59170439c5f..bfba70b84f5 100755
--- a/library/stdarch/ci/run-docker.sh
+++ b/library/stdarch/ci/run-docker.sh
@@ -11,7 +11,6 @@ if [ $# -lt 1 ]; then
 fi
 
 run() {
-    target=$(echo "${1}" | sed 's/-emulated//')
     echo "Building docker container for TARGET=${1}"
     docker build -t stdarch -f "ci/docker/${1}/Dockerfile" ci/
     mkdir -p target c_programs rust_programs
@@ -22,7 +21,7 @@ run() {
       --user "$(id -u)":"$(id -g)" \
       --env CARGO_HOME=/cargo \
       --env CARGO_TARGET_DIR=/checkout/target \
-      --env TARGET="${target}" \
+      --env TARGET="${1}" \
       --env STDARCH_TEST_EVERYTHING \
       --env STDARCH_ASSERT_INSTR_IGNORE \
       --env STDARCH_DISABLE_ASSERT_INSTR \
diff --git a/library/stdarch/ci/run.sh b/library/stdarch/ci/run.sh
index 1cad06802b8..f582602a8c9 100755
--- a/library/stdarch/ci/run.sh
+++ b/library/stdarch/ci/run.sh
@@ -99,7 +99,7 @@ fi
 
 # Test targets compiled with extra features.
 case ${TARGET} in
-    x86_64*emulated)
+    x86_64-unknown-linux-gnu)
         export STDARCH_DISABLE_ASSERT_INSTR=1
 
         export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+avx"