diff --git a/config/arch.aarch64 b/config/arch.aarch64
index 5ca4b4c5a4..86d3cb20d7 100644
--- a/config/arch.aarch64
+++ b/config/arch.aarch64
@@ -32,4 +32,4 @@
 # Disable runtime checking support of ARMv8.0's optional LSE feature. Breaks gdb and mesa compile.
   TARGET_CFLAGS="${TARGET_CFLAGS} -mno-outline-atomics"
   TARGET_LDFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mtune=$TARGET_CPU"
-  GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"
+  TARGET_ARCH_GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"
diff --git a/config/arch.arm b/config/arch.arm
index dfcce521ac..1d9da591a3 100644
--- a/config/arch.arm
+++ b/config/arch.arm
@@ -72,4 +72,4 @@
   TARGET_CFLAGS="-march=$TARGET_VARIANT -mtune=$TARGET_CPU -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated"
   [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS $TARGET_FPU_FLAGS"
   TARGET_LDFLAGS="-march=$TARGET_VARIANT -mtune=$TARGET_CPU"
-  GCC_OPTS="--with-abi=aapcs-linux --with-arch=$TARGET_SUBARCH --with-float=$TARGET_FLOAT --with-fpu=$TARGET_FPU"
+  TARGET_ARCH_GCC_OPTS="--with-abi=aapcs-linux --with-arch=$TARGET_SUBARCH --with-float=$TARGET_FLOAT --with-fpu=$TARGET_FPU"
diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index 800fa1c556..93c98526b5 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -60,7 +60,7 @@ PKG_CONFIGURE_OPTS_BOOTSTRAP="${GCC_COMMON_CONFIGURE_OPTS} \
                               --without-headers \
                               --with-newlib \
                               --disable-decimal-float \
-                              ${GCC_OPTS}"
+                              ${TARGET_ARCH_GCC_OPTS}"
 
 PKG_CONFIGURE_OPTS_HOST="${GCC_COMMON_CONFIGURE_OPTS} \
                          --enable-languages=c,c++ \
@@ -74,7 +74,7 @@ PKG_CONFIGURE_OPTS_HOST="${GCC_COMMON_CONFIGURE_OPTS} \
                          --disable-libstdcxx-pch \
                          --enable-libstdcxx-time \
                          --enable-clocale=gnu \
-                         ${GCC_OPTS}"
+                         ${TARGET_ARCH_GCC_OPTS}"
 
 pre_configure_host() {
   unset CPP