diff --git a/cross-aarch64-gcc14-bootstrap.spec b/cross-aarch64-gcc14-bootstrap.spec
index c48f100..58403d2 100644
--- a/cross-aarch64-gcc14-bootstrap.spec
+++ b/cross-aarch64-gcc14-bootstrap.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-aarch64-gcc14.spec b/cross-aarch64-gcc14.spec
index cac25db..5a8d5bc 100644
--- a/cross-aarch64-gcc14.spec
+++ b/cross-aarch64-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-amdgcn-gcc14.spec b/cross-amdgcn-gcc14.spec
index 45dc0dc..e0afae5 100644
--- a/cross-amdgcn-gcc14.spec
+++ b/cross-amdgcn-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-arm-gcc14.spec b/cross-arm-gcc14.spec
index db8c987..8657d3f 100644
--- a/cross-arm-gcc14.spec
+++ b/cross-arm-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-arm-none-gcc14-bootstrap.spec b/cross-arm-none-gcc14-bootstrap.spec
index e7cc4fc..d213185 100644
--- a/cross-arm-none-gcc14-bootstrap.spec
+++ b/cross-arm-none-gcc14-bootstrap.spec
@@ -154,7 +154,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-arm-none-gcc14.spec b/cross-arm-none-gcc14.spec
index 731892a..40bd466 100644
--- a/cross-arm-none-gcc14.spec
+++ b/cross-arm-none-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-avr-gcc14-bootstrap.spec b/cross-avr-gcc14-bootstrap.spec
index c150e09..6d6fc4e 100644
--- a/cross-avr-gcc14-bootstrap.spec
+++ b/cross-avr-gcc14-bootstrap.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-avr-gcc14.spec b/cross-avr-gcc14.spec
index 0d5d56e..d224cea 100644
--- a/cross-avr-gcc14.spec
+++ b/cross-avr-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-bpf-gcc14.spec b/cross-bpf-gcc14.spec
index 53b65ee..cf0e561 100644
--- a/cross-bpf-gcc14.spec
+++ b/cross-bpf-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-epiphany-gcc14-bootstrap.spec b/cross-epiphany-gcc14-bootstrap.spec
index a0c32b1..6d4a0a8 100644
--- a/cross-epiphany-gcc14-bootstrap.spec
+++ b/cross-epiphany-gcc14-bootstrap.spec
@@ -154,7 +154,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-epiphany-gcc14.spec b/cross-epiphany-gcc14.spec
index 3a5c44b..98eed20 100644
--- a/cross-epiphany-gcc14.spec
+++ b/cross-epiphany-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-hppa-gcc14-bootstrap.spec b/cross-hppa-gcc14-bootstrap.spec
index 99de102..ece9312 100644
--- a/cross-hppa-gcc14-bootstrap.spec
+++ b/cross-hppa-gcc14-bootstrap.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-hppa-gcc14.spec b/cross-hppa-gcc14.spec
index a496d17..d384399 100644
--- a/cross-hppa-gcc14.spec
+++ b/cross-hppa-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-m68k-gcc14.spec b/cross-m68k-gcc14.spec
index b1582f9..dcd75a5 100644
--- a/cross-m68k-gcc14.spec
+++ b/cross-m68k-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-mips-gcc14.spec b/cross-mips-gcc14.spec
index d81879f..7030837 100644
--- a/cross-mips-gcc14.spec
+++ b/cross-mips-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-nvptx-gcc14.spec b/cross-nvptx-gcc14.spec
index a36c5be..a03f6de 100644
--- a/cross-nvptx-gcc14.spec
+++ b/cross-nvptx-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-ppc64-gcc14.spec b/cross-ppc64-gcc14.spec
index 13170d8..3bc60f6 100644
--- a/cross-ppc64-gcc14.spec
+++ b/cross-ppc64-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-ppc64le-gcc14-bootstrap.spec b/cross-ppc64le-gcc14-bootstrap.spec
index 9b43eda..0741097 100644
--- a/cross-ppc64le-gcc14-bootstrap.spec
+++ b/cross-ppc64le-gcc14-bootstrap.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-ppc64le-gcc14.spec b/cross-ppc64le-gcc14.spec
index 8afca7d..7de8d46 100644
--- a/cross-ppc64le-gcc14.spec
+++ b/cross-ppc64le-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-pru-gcc14-bootstrap.spec b/cross-pru-gcc14-bootstrap.spec
index 2682dad..2cde8e4 100644
--- a/cross-pru-gcc14-bootstrap.spec
+++ b/cross-pru-gcc14-bootstrap.spec
@@ -154,7 +154,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-pru-gcc14.spec b/cross-pru-gcc14.spec
index 05d0606..bf5841e 100644
--- a/cross-pru-gcc14.spec
+++ b/cross-pru-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-riscv64-elf-gcc14-bootstrap.spec b/cross-riscv64-elf-gcc14-bootstrap.spec
index 9c48cd9..185d83b 100644
--- a/cross-riscv64-elf-gcc14-bootstrap.spec
+++ b/cross-riscv64-elf-gcc14-bootstrap.spec
@@ -154,7 +154,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-riscv64-elf-gcc14.spec b/cross-riscv64-elf-gcc14.spec
index 78d2f76..74b2516 100644
--- a/cross-riscv64-elf-gcc14.spec
+++ b/cross-riscv64-elf-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-riscv64-gcc14-bootstrap.spec b/cross-riscv64-gcc14-bootstrap.spec
index ca9f025..62d78a4 100644
--- a/cross-riscv64-gcc14-bootstrap.spec
+++ b/cross-riscv64-gcc14-bootstrap.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-riscv64-gcc14.spec b/cross-riscv64-gcc14.spec
index 277b4e3..ed64c25 100644
--- a/cross-riscv64-gcc14.spec
+++ b/cross-riscv64-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-rx-gcc14-bootstrap.spec b/cross-rx-gcc14-bootstrap.spec
index 65c28c0..2cfd3f9 100644
--- a/cross-rx-gcc14-bootstrap.spec
+++ b/cross-rx-gcc14-bootstrap.spec
@@ -154,7 +154,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-rx-gcc14.spec b/cross-rx-gcc14.spec
index c9c87a3..ebb1f7f 100644
--- a/cross-rx-gcc14.spec
+++ b/cross-rx-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-s390x-gcc14-bootstrap.spec b/cross-s390x-gcc14-bootstrap.spec
index e9b7674..90cc5fd 100644
--- a/cross-s390x-gcc14-bootstrap.spec
+++ b/cross-s390x-gcc14-bootstrap.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-s390x-gcc14.spec b/cross-s390x-gcc14.spec
index 08a3021..0333bd9 100644
--- a/cross-s390x-gcc14.spec
+++ b/cross-s390x-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-sparc-gcc14.spec b/cross-sparc-gcc14.spec
index 1497a2f..56b75f7 100644
--- a/cross-sparc-gcc14.spec
+++ b/cross-sparc-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-sparc64-gcc14.spec b/cross-sparc64-gcc14.spec
index c8bd6af..8ada9c9 100644
--- a/cross-sparc64-gcc14.spec
+++ b/cross-sparc64-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/cross-x86_64-gcc14.spec b/cross-x86_64-gcc14.spec
index bb2d649..53f4508 100644
--- a/cross-x86_64-gcc14.spec
+++ b/cross-x86_64-gcc14.spec
@@ -153,7 +153,7 @@ Patch61:        gcc44-rename-info-files.patch
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/gcc.spec.in b/gcc.spec.in
index 4c63572..25e1fbe 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1242,7 +1242,7 @@ Results from running the gcc and target library testsuites.
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/gcc14-testresults.spec b/gcc14-testresults.spec
index 4166a94..cf20314 100644
--- a/gcc14-testresults.spec
+++ b/gcc14-testresults.spec
@@ -437,7 +437,7 @@ Results from running the gcc and target library testsuites.
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
diff --git a/gcc14.changes b/gcc14.changes
index ecb4377..8925181 100644
--- a/gcc14.changes
+++ b/gcc14.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  5 14:24:16 UTC 2024 - Richard Biener <rguenther@suse.com>
+
+- Use %{_target_cpu} to determine host and build.
+
 -------------------------------------------------------------------
 Mon Jan 29 08:34:57 UTC 2024 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc14.spec b/gcc14.spec
index bc4f776..eb8e3e0 100644
--- a/gcc14.spec
+++ b/gcc14.spec
@@ -2257,7 +2257,7 @@ Results from running the gcc and target library testsuites.
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
 %endif
 
-%define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
+%define HOST_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else