6 files changed, 7 insertions, 7 deletions

diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index 605d8a3556..f2d2f13794 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -88,7 +88,7 @@ $(WMAPROLIB) : CODECFLAGS += -O1
 $(WMAVOICELIB) : CODECFLAGS += -O1
 
 # fine-tuning of CODECFLAGS per cpu arch
-ifeq ($(ARCH),arm)
+ifeq ($(ARCH),arch_arm)
   # redo per arm generation
   $(ALACLIB) : CODECFLAGS += -O2
   $(AYLIB) : CODECFLAGS +=  -O1
@@ -100,7 +100,7 @@ ifeq ($(ARCH),arm)
   $(VGMLIB) : CODECFLAGS +=  -O1
   $(EMU2413LIB) : CODECFLAGS +=  -O3
   $(WAVPACKLIB) : CODECFLAGS += -O3
-else ifeq ($(ARCH),m68k)
+else ifeq ($(ARCH),arch_m68k)
   $(A52LIB) : CODECFLAGS += -O2
   $(ASFLIB) : CODECFLAGS += -O3
   $(ATRACLIB) : CODECFLAGS += -O2
diff --git a/apps/codecs/demac/libdemac.make b/apps/codecs/demac/libdemac.make
index 4614344849..62ad53dfcc 100644
--- a/apps/codecs/demac/libdemac.make
+++ b/apps/codecs/demac/libdemac.make
@@ -12,7 +12,7 @@ DEMACLIB := $(CODECDIR)/libdemac.a
 DEMACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/demac/libdemac/SOURCES)
 DEMACLIB_OBJ := $(call c2obj, $(DEMACLIB_SRC))
 OTHER_SRC += $(DEMACLIB_SRC)
-ifeq ($(CPU),arm)
+ifeq ($(ARCH),arch_arm)
 OTHER_SRC += $(APPSDIR)/codecs/demac/libdemac/udiv32_arm-pre.S
 endif
 DEMACLIB_PRE := $(subst .a,-pre.a,$(DEMACLIB))
diff --git a/apps/codecs/lib/libcodec.make b/apps/codecs/lib/libcodec.make
index ca9b2c4fe2..7aef72f2b1 100644
--- a/apps/codecs/lib/libcodec.make
+++ b/apps/codecs/lib/libcodec.make
@@ -20,7 +20,7 @@ CODECLIBFLAGS = $(filter-out -O%,$(CODECFLAGS))
 
 ifeq ($(MEMORYSIZE),2)
     CODECLIBFLAGS += -Os
-else ifeq ($(CPU),coldfire)
+else ifeq ($(ARCH),arch_m68k)
     CODECLIBFLAGS += -O2
 else
     CODECLIBFLAGS += -O1
diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make
index f8423b88fe..4ed8ab1e8c 100644
--- a/apps/codecs/libmad/libmad.make
+++ b/apps/codecs/libmad/libmad.make
@@ -16,7 +16,7 @@ MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmad
 MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H
 
 # libmad is faster on ARM-targets with -O1 than -O2
-ifeq ($(CPU),arm)
+ifeq ($(ARCH),arch_arm)
    MADFLAGS += -O1
 else
    MADFLAGS += -O2
diff --git a/apps/codecs/libspeex/libspeex.make b/apps/codecs/libspeex/libspeex.make
index cc2c3caee1..1089982d27 100644
--- a/apps/codecs/libspeex/libspeex.make
+++ b/apps/codecs/libspeex/libspeex.make
@@ -23,7 +23,7 @@ VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(_SPEE
 # libspeex is faster on ARM-targets with -O1 instead of -O2
 SPEEXFLAGS = $(filter-out -O%,$(_SPEEXFLAGS))
 
-ifeq ($(CPU),arm)
+ifeq ($(ARCH),arch_arm)
    SPEEXFLAGS += -O1
 else
    SPEEXFLAGS += -O2
diff --git a/apps/codecs/libwmavoice/libwmavoice.make b/apps/codecs/libwmavoice/libwmavoice.make
index 0497e18e1b..b35756c64a 100644
--- a/apps/codecs/libwmavoice/libwmavoice.make
+++ b/apps/codecs/libwmavoice/libwmavoice.make
@@ -19,7 +19,7 @@ $(WMAVOICELIB): $(WMAVOICELIB_OBJ)
 
 WMAVOICEFLAGS = -I$(APPSDIR)/codecs/libwmavoice $(filter-out -O%,$(CODECFLAGS))
 
-ifeq ($(CPU),coldfire)
+ifeq ($(ARCH),arch_m68k)
         WMAVOICEFLAGS += -O2
 else
         WMAVOICEFLAGS += -O1