2 files changed, 13 insertions, 13 deletions
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile b/demos/ARM7-LPC214x-GCC-minimal/Makefile
index 3514a9090..1fe22d71a 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/Makefile
+++ b/demos/ARM7-LPC214x-GCC-minimal/Makefile
@@ -127,16 +127,16 @@ ODFLAGS	= -x --syms
 
 # Thumb interwork enabled only if needed because it kills performance.
 ifneq ($(TSRC),)
+  CPFLAGS += -D THUMB_PRESENT
   ifneq ($(ASRC),)
-    # Both ARM and THUMB case
-    CPFLAGS += -mthumb-interwork -D THUMB
+    # Mixed ARM and THUMB case.
+    CPFLAGS += -mthumb-interwork
     LDFLAGS += -mthumb-interwork
-    ASFLAGS += -mthumb-interwork -D THUMB
   else
-    # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly
-    CPFLAGS += -D THUMB
+    # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.
+    CPFLAGS += -D THUMB_NO_INTERWORKING
     LDFLAGS += -mthumb
-    ASFLAGS += -mthumb-interwork -D THUMB -D THUMB_NO_INTERWORKING
+    ASFLAGS += -D THUMB_NO_INTERWORKING
   endif
 endif
 
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb b/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb
index 76b3fd296..b00adef75 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb
+++ b/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb
@@ -91,7 +91,7 @@ ULIBS =
 AOPT =
 
 # THUMB-specific options here
-TOPT = -mthumb
+TOPT = -mthumb -D THUMB
 
 # Common options here
 # NOTE: -ffixed-r7 is only needed if you enabled CH_CURRP_REGISTER_CACHE in
@@ -127,16 +127,16 @@ ODFLAGS	= -x --syms
 
 # Thumb interwork enabled only if needed because it kills performance.
 ifneq ($(TSRC),)
+  CPFLAGS += -D THUMB_PRESENT
   ifneq ($(ASRC),)
-    # Both ARM and THUMB case
-    CPFLAGS += -mthumb-interwork -D THUMB
+    # Mixed ARM and THUMB case.
+    CPFLAGS += -mthumb-interwork
     LDFLAGS += -mthumb-interwork
-    ASFLAGS += -mthumb-interwork -D THUMB
   else
-    # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly
-    CPFLAGS += -D THUMB -D THUMB_NO_INTERWORKING
+    # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.
+    CPFLAGS += -D THUMB_NO_INTERWORKING
     LDFLAGS += -mthumb
-    ASFLAGS += -mthumb-interwork -D THUMB -D THUMB_NO_INTERWORKING
+    ASFLAGS += -D THUMB_NO_INTERWORKING
   endif
 endif