diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index f49f0dd1b27..d45498e1140 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -25,14 +25,11 @@ cflags-cortex-m7 = $(call cc-option,-mabi=aapcs -mthumb -mcpu=cortex-m7) \
 aflags-$(CONFIG_CPU_CORTEX_M3) += $(cflags-cortex-m3)
 cflags-$(CONFIG_CPU_CORTEX_M3) += $(cflags-cortex-m3)
 cxxflags-$(CONFIG_CPU_CORTEX_M3) += $(cflags-cortex-m3)
-_arm_isa-$(CONFIG_CPU_CORTEX_M3) = armv7-m
 
 aflags-$(CONFIG_CPU_CORTEX_M4) += $(cflags-cortex-m4)
 cflags-$(CONFIG_CPU_CORTEX_M4) += $(cflags-cortex-m4)
 cxxflags-$(CONFIG_CPU_CORTEX_M4) += $(cflags-cortex-m4)
-_arm_isa-$(CONFIG_CPU_CORTEX_M4) = armv7e-m
 
-_CROSS_COMPILE_arm_isa = $(_arm_isa-y)
 
 KBUILD_AFLAGS += $(aflags-y)
 KBUILD_CFLAGS += $(cflags-y)
diff --git a/scripts/Makefile.toolchain.gccarmemb b/scripts/Makefile.toolchain.gccarmemb
index fc2d85377e2..6271aa7ff14 100644
--- a/scripts/Makefile.toolchain.gccarmemb
+++ b/scripts/Makefile.toolchain.gccarmemb
@@ -11,8 +11,9 @@ CROSS_COMPILE_TARGET = ${CROSS_COMPILE_TARGET_${ARCH}}
 CROSS_COMPILE_version = ${CROSS_COMPILE_${ARCH}_version}
 
 TOOLCHAIN_LIBS = gcc
+LIBGCC_DIR = $(shell dirname `$(CROSS_COMPILE_arm)gcc ${KBUILD_CFLAGS} -print-libgcc-file-name`)
 
-LIB_INCLUDE_DIR += -L ${GCCARMEMB_TOOLCHAIN_PATH}/lib/gcc/${CROSS_COMPILE_TARGET}/${CROSS_COMPILE_version}/${_CROSS_COMPILE_arm_isa}
+LIB_INCLUDE_DIR += -L ${LIBGCC_DIR}
 TOOLCHAIN_CFLAGS = -I${GCCARMEMB_TOOLCHAIN_PATH}/arm-none-eabi/include
 
 export CROSS_COMPILE TOOLCHAIN_LIBS TOOLCHAIN_CFLAGS LIB_INCLUDE_DIR