From 98056a2c13fbfb9b79edbc7e3ea56c4c366d4ad3b3a1e9329ed8c423f993705f Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Thu, 28 Mar 2019 09:45:07 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=154

---
 gcc.spec.in           | 2 +-
 gcc7-testresults.spec | 2 +-
 gcc7.spec             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc.spec.in b/gcc.spec.in
index fc61b04..7747ea1 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1363,7 +1363,7 @@ STAGE1_FLAGS="-g -O2"
 %endif
 # Only run profiled bootstrap on archs where it works and matters
 %ifarch x86_64 %ix86 ppc64le s390x aarch64
-setarch -R make %{?profiledbootstraprule} STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+setarch `arch` -R make %{?profiledbootstraprule} STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 %else
 make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 %endif
diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec
index 7210c5c..c207653 100644
--- a/gcc7-testresults.spec
+++ b/gcc7-testresults.spec
@@ -747,7 +747,7 @@ STAGE1_FLAGS="-g -O2"
 %endif
 # Only run profiled bootstrap on archs where it works and matters
 %ifarch x86_64 %ix86 ppc64le s390x aarch64
-setarch -R make %{?profiledbootstraprule} STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+setarch `arch` -R make %{?profiledbootstraprule} STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 %else
 make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 %endif
diff --git a/gcc7.spec b/gcc7.spec
index da4cb72..a844f9e 100644
--- a/gcc7.spec
+++ b/gcc7.spec
@@ -2051,7 +2051,7 @@ STAGE1_FLAGS="-g -O2"
 %endif
 # Only run profiled bootstrap on archs where it works and matters
 %ifarch x86_64 %ix86 ppc64le s390x aarch64
-setarch -R make %{?profiledbootstraprule} STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+setarch `arch` -R make %{?profiledbootstraprule} STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 %else
 make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 %endif