diff --git a/ld/Makefile.linker b/ld/Makefile.linker
index feff6c06..656c26b9 100644
--- a/ld/Makefile.linker
+++ b/ld/Makefile.linker
@@ -56,6 +56,8 @@ ifneq ($(DEVICE),)
 
 LDSCRIPT=$(DEVICE).ld
 LD_PARAMS=$(shell awk -v PAT="$(DEVICE)" -f $(SRCLIBDIR)/scripts/genlink.awk $(SRCLIBDIR)/ld/devices.data 2>/dev/null)
+CFLAGS+=$(LD_PARAMS)
+LDFLAGS+=$(LD_PARAMS)
 
 $(LDSCRIPT):$(SRCLIBDIR)/ld/linker.ld.S
 ifeq ($(LD_PARAMS),)
diff --git a/ld/devices.data b/ld/devices.data
index 7920a372..21811525 100644
--- a/ld/devices.data
+++ b/ld/devices.data
@@ -309,14 +309,14 @@ lpc17[78]x lpc17 RAM1_OFF=0x20000000 RAM2_OFF=0x20040000
 ################################################################################
 # the STM32 families
 
-stm32f0 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000
-stm32f1 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000
-stm32f2 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000
-stm32f3 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000
-stm32f4 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000
-stm32l1 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000
-stm32w stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000
-stm32t stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000
+stm32f0 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000 -mcpu=cortex-m0 -thumb
+stm32f1 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000 -mcpu=cortex-m3 -thumb
+stm32f2 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000 -mcpu=cortex-m3 -thumb
+stm32f3 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000 -mcpu=cortex-m3 -thumb
+stm32f4 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000 -mcpu=cortex-m4 -thumb
+stm32l1 stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000 -mcpu=cortex-m3 -thumb
+stm32w stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000 -mcpu=cortex-m3 -thumb
+stm32t stm32 ROM_OFF=0x08000000 RAM_OFF=0x20000000 -mcpu=cortex-m3 -thumb
 
 ################################################################################
 # the SAM3 families