diff --git a/package/Makefile.in b/package/Makefile.in
index 43ff2ddad7..983caf38e3 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -109,8 +109,8 @@ TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 
 # Quotes are needed for spaces et al in path components.
 TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
-REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
+GNU_TARGET_NAME=$(ARCH)-linux
+REAL_GNU_TARGET_NAME=$(ARCH)$(GNU_TARGET_SUFFIX)
 TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
 KERNEL_CROSS=$(TARGET_CROSS)
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index 91aa17af61..57d84a3e76 100644
--- a/toolchain/Makefile.in
+++ b/toolchain/Makefile.in
@@ -30,8 +30,5 @@ BR2_SYSROOT=# nothing
 BR2_ISYSROOT=#nothing
 endif
 
-# FIXME -- this is temporary
-OPTIMIZE_FOR_CPU=$(ARCH)
-
 # gcc has a bunch of needed stuff....
 include toolchain/gcc/Makefile.in