diff --git a/lib/rbcodec/codecs/libffmpegFLAC/SOURCES b/lib/rbcodec/codecs/libffmpegFLAC/SOURCES
index 63094b30a6..14c0ed5ea1 100644
--- a/lib/rbcodec/codecs/libffmpegFLAC/SOURCES
+++ b/lib/rbcodec/codecs/libffmpegFLAC/SOURCES
@@ -2,6 +2,6 @@ decoder.c
 shndec.c
 #if defined(CPU_COLDFIRE)
 coldfire.S
-#elif defined(CPU_ARM)
+#elif defined(CPU_ARM_CLASSIC)
 arm.S
 #endif
diff --git a/lib/rbcodec/codecs/libffmpegFLAC/decoder.c b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
index 9fd48c6746..7c3e0a4e96 100644
--- a/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
+++ b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
@@ -320,7 +320,7 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order,
         (void)sum;
         lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order,
                         decoded + pred_order, coeffs);
-        #elif defined(CPU_ARM)
+        #elif defined(CPU_ARM_CLASSIC)
         (void)sum;
         lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order,
                        decoded + pred_order, coeffs);
diff --git a/lib/rbcodec/codecs/libmad/SOURCES b/lib/rbcodec/codecs/libmad/SOURCES
index d81804ca38..9104d82d98 100644
--- a/lib/rbcodec/codecs/libmad/SOURCES
+++ b/lib/rbcodec/codecs/libmad/SOURCES
@@ -7,8 +7,7 @@ stream.c
 synth.c
 #if defined(CPU_COLDFIRE)
 imdct_mcf5249.S
-#endif
-#if defined(CPU_ARM)
+#elif defined(CPU_ARM_CLASSIC)
 imdct_l_arm.S
 synth_full_arm.S
 #endif
diff --git a/lib/rbcodec/codecs/libmad/global.h b/lib/rbcodec/codecs/libmad/global.h
index 50051f45b3..9f4b32e66d 100644
--- a/lib/rbcodec/codecs/libmad/global.h
+++ b/lib/rbcodec/codecs/libmad/global.h
@@ -28,7 +28,7 @@
 
 #if defined(CPU_COLDFIRE)
 #define FPM_COLDFIRE_EMAC
-#elif defined(CPU_ARM)
+#elif defined(CPU_ARM_CLASSIC)
 #define FPM_ARM
 #elif defined(CPU_MIPS)
 #define FPM_MIPS
diff --git a/lib/rbcodec/codecs/libmad/layer3.c b/lib/rbcodec/codecs/libmad/layer3.c
index 48bb643b93..802c626fe0 100644
--- a/lib/rbcodec/codecs/libmad/layer3.c
+++ b/lib/rbcodec/codecs/libmad/layer3.c
@@ -922,7 +922,7 @@ mad_fixed_t III_requantize(unsigned int value, signed int exp)
 }
 
 /* we must take care that sz >= bits and sz < sizeof(long) lest bits == 0 */
-# if defined(CPU_ARM)
+# if defined(CPU_ARM_CLASSIC)
 # define MASK(cache, sz, bits) \
     ({ unsigned long res; \
        asm ("mov  %0, #1\n\t" \
@@ -1557,7 +1557,7 @@ enum mad_error III_stereo(mad_fixed_t xr[2][576],
   return MAD_ERROR_NONE;
 }
 
-#if defined(CPU_ARM)
+#if defined(CPU_ARM_CLASSIC)
 void III_aliasreduce(mad_fixed_t xr[576], int lines);
 #else
 /*
@@ -2683,7 +2683,7 @@ void III_imdct_s(mad_fixed_t const X[18], mad_fixed_t z[36])
 
 #endif
 
-#ifdef CPU_ARM
+#if defined(CPU_ARM_CLASSIC)
 void III_overlap(mad_fixed_t const output[36], mad_fixed_t overlap[18],
                  mad_fixed_t sample[18][32], unsigned int sb);
 #else
diff --git a/lib/rbcodec/codecs/libspeex/SOURCES b/lib/rbcodec/codecs/libspeex/SOURCES
index 575bcb5bae..9718510fe6 100644
--- a/lib/rbcodec/codecs/libspeex/SOURCES
+++ b/lib/rbcodec/codecs/libspeex/SOURCES
@@ -39,7 +39,7 @@ resample.c
 #ifdef CPU_COLDFIRE
 filters_cf.S
 ltp_cf.S
-#elif defined(CPU_ARM)
+#elif defined(CPU_ARM_CLASSIC)
 filters_arm4.S
 #endif
 #endif
diff --git a/lib/rbcodec/codecs/libspeex/config-speex.h b/lib/rbcodec/codecs/libspeex/config-speex.h
index d6d3b23a0a..a7b0c1855a 100644
--- a/lib/rbcodec/codecs/libspeex/config-speex.h
+++ b/lib/rbcodec/codecs/libspeex/config-speex.h
@@ -16,7 +16,7 @@
 #define DISABLE_VBR
 
 /* Make use of ARM4E assembly optimizations */
-#if defined(CPU_ARM)
+#if defined(CPU_ARM_CLASSIC)
 #if (ARM_ARCH < 5)
 #define ARM4_ASM
 #else
diff --git a/lib/rbcodec/codecs/libtta/SOURCES b/lib/rbcodec/codecs/libtta/SOURCES
index 0a8f1171eb..9790c9ec4e 100644
--- a/lib/rbcodec/codecs/libtta/SOURCES
+++ b/lib/rbcodec/codecs/libtta/SOURCES
@@ -1,7 +1,6 @@
 ttadec.c
-#ifdef CPU_ARM
+#if defined(CPU_ARM_CLASSIC)
 filter_arm.S
-#endif
-#ifdef CPU_COLDFIRE
+#elif defined(CPU_COLDFIRE)
 filter_coldfire.S
 #endif
diff --git a/lib/rbcodec/codecs/libtta/filter.h b/lib/rbcodec/codecs/libtta/filter.h
index 228757b9a0..978375a83a 100644
--- a/lib/rbcodec/codecs/libtta/filter.h
+++ b/lib/rbcodec/codecs/libtta/filter.h
@@ -42,7 +42,7 @@
 ///////// Filter Settings //////////
 static int flt_set[3] = {10, 9, 10};
 
-#if defined(CPU_ARM) || defined(CPU_COLDFIRE)
+#if defined(CPU_ARM_CLASSIC) || defined(CPU_COLDFIRE)
 int hybrid_filter(fltst *fs, int *in); /* implements in filter_arm.S */
 
 #else
diff --git a/lib/rbcodec/codecs/libwavpack/SOURCES b/lib/rbcodec/codecs/libwavpack/SOURCES
index b2518e59e0..138ec9684a 100644
--- a/lib/rbcodec/codecs/libwavpack/SOURCES
+++ b/lib/rbcodec/codecs/libwavpack/SOURCES
@@ -7,8 +7,7 @@ words.c
 wputils.c
 #if defined(CPU_COLDFIRE)
 coldfire.S
-#endif
-#if defined(CPU_ARM)
+#elif defined(CPU_ARM_CLASSIC)
 arm.S
 arml.S
 #endif
diff --git a/lib/rbcodec/codecs/libwavpack/unpack.c b/lib/rbcodec/codecs/libwavpack/unpack.c
index 69252f24ad..5fe353e7d4 100644
--- a/lib/rbcodec/codecs/libwavpack/unpack.c
+++ b/lib/rbcodec/codecs/libwavpack/unpack.c
@@ -304,7 +304,7 @@ int read_sample_rate (WavpackContext *wpc, WavpackMetadata *wpmd)
 
 #if defined(CPU_COLDFIRE)
 extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count);
-#elif defined(CPU_ARM)
+#elif defined(CPU_ARM_CLASSIC)
 extern void decorr_stereo_pass_cont_arm (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count);
 extern void decorr_stereo_pass_cont_arml (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count);
 #else
@@ -369,7 +369,7 @@ int32_t unpack_samples (WavpackContext *wpc, int32_t *buffer, uint32_t sample_co
                 decorr_stereo_pass (dpp, buffer, 8);
 #if defined(CPU_COLDFIRE)
                 decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8);
-#elif defined(CPU_ARM)
+#elif defined(CPU_ARM_CLASSIC)
                 if (((flags & MAG_MASK) >> MAG_LSB) > 15)
                     decorr_stereo_pass_cont_arml (dpp, buffer + 16, sample_count - 8);
                 else
@@ -541,7 +541,7 @@ static void decorr_stereo_pass (struct decorr_pass *dpp, int32_t *buffer, int32_
     dpp->weight_B = weight_B;
 }
 
-#if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM))
+#if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM_CLASSIC))
 
 static void decorr_stereo_pass_cont (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count)
 {
diff --git a/lib/rbcodec/dsp/crossfeed.c b/lib/rbcodec/dsp/crossfeed.c
index 9cca7d8973..a2351f4cb5 100644
--- a/lib/rbcodec/dsp/crossfeed.c
+++ b/lib/rbcodec/dsp/crossfeed.c
@@ -172,7 +172,7 @@ void dsp_set_crossfeed_cross_params(long lf_gain, long hf_gain, long cutoff)
                                    dsp_get_output_frequency(dsp));
 }
 
-#if !defined(CPU_COLDFIRE) && !defined(CPU_ARM)
+#if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) || defined(CPU_ARM_MICRO)
 /* Apply the crossfade to the buffer in place */
 void crossfeed_process(struct dsp_proc_entry *this, struct dsp_buffer **buf_p)
 {
@@ -224,7 +224,7 @@ void crossfeed_process(struct dsp_proc_entry *this, struct dsp_buffer **buf_p)
 }
 #endif /* CPU */
 
-#if !defined(CPU_COLDFIRE) && !defined(CPU_ARM)
+#if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) || defined(CPU_ARM_MICRO)
 /**
  * Implementation of the "simple" passive crossfeed circuit by Jan Meier.
  * See also: http://www.meier-audio.homepage.t-online.de/passivefilter.htm
diff --git a/lib/rbcodec/dsp/dsp_arm.S b/lib/rbcodec/dsp/dsp_arm.S
index b17c94fe6c..70571f17d9 100644
--- a/lib/rbcodec/dsp/dsp_arm.S
+++ b/lib/rbcodec/dsp/dsp_arm.S
@@ -185,6 +185,7 @@ channel_mode_proc_karaoke:
     ldmpc   regs=r4                    @
     .size   channel_mode_proc_karaoke, .-channel_mode_proc_karaoke
 
+#ifndef CPU_ARM_MICRO
 /****************************************************************************
  * void crossfeed_process(struct dsp_proc_entry *this,
  *                        struct dsp_buffer **buf_p)
@@ -508,6 +509,7 @@ resample_hermite:
     str     r2, [r3]                    @ dst->remcount = r2
     ldmpc   regs=r4-r11                 @ ... and we're out
     .size   resample_hermite, .-resample_hermite
+#endif /* CPU_ARM_MICRO */
 
 /****************************************************************************
  *  void pga_process(struct dsp_proc_entry *this, struct dsp_buffer **buf_p)
@@ -558,6 +560,7 @@ pga_process:
     ldmpc   regs=r4-r8
     .size   pga_process, .-pga_process
 
+#ifndef CPU_ARM_MICRO
 /****************************************************************************
  * void filter_process(struct dsp_filter *f, int32_t *buf[], int count,
  *                     unsigned int channels)
@@ -623,6 +626,7 @@ filter_process:
     add     sp, sp, #16             @ compensate for temp storage
     ldmpc   regs=r4-r11
     .size   filter_process, .-filter_process
+#endif /* CPU_ARM_MICRO */
 
 #if ARM_ARCH < 6
 /****************************************************************************
diff --git a/lib/rbcodec/dsp/dsp_arm_v6.S b/lib/rbcodec/dsp/dsp_arm_v6.S
index facd3facbd..777b1d5bdc 100644
--- a/lib/rbcodec/dsp/dsp_arm_v6.S
+++ b/lib/rbcodec/dsp/dsp_arm_v6.S
@@ -71,6 +71,7 @@ sample_output_mono:
     ldmfd   sp!, { r4, pc }            @
     .size   sample_output_mono, .-sample_output_mono
 
+#ifndef CPU_ARM_MICRO
 /****************************************************************************
  * void sample_output_stereo(struct sample_io_data *this,
  *                           struct dsp_buffer *src,
@@ -131,3 +132,4 @@ sample_output_stereo:
                                        @
     ldmfd   sp!, { r4-r7, pc }         @
     .size   sample_output_stereo, .-sample_output_stereo
+#endif /* CPU_ARM_MICRO */
diff --git a/lib/rbcodec/dsp/dsp_filter.c b/lib/rbcodec/dsp/dsp_filter.c
index 3656026536..a6ff950ce1 100644
--- a/lib/rbcodec/dsp/dsp_filter.c
+++ b/lib/rbcodec/dsp/dsp_filter.c
@@ -277,7 +277,7 @@ void filter_flush(struct dsp_filter *f)
  * form 1 was chosen because of better numerical properties for fixed point
  * implementations.
  */
-#if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM))
+#if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) || defined(CPU_ARM_MICRO)
 void filter_process(struct dsp_filter *f, int32_t * const buf[], int count,
                     unsigned int channels)
 {
diff --git a/lib/rbcodec/dsp/dsp_sample_output.c b/lib/rbcodec/dsp/dsp_sample_output.c
index 705a498a58..433c6027d3 100644
--- a/lib/rbcodec/dsp/dsp_sample_output.c
+++ b/lib/rbcodec/dsp/dsp_sample_output.c
@@ -63,7 +63,9 @@ void sample_output_mono(struct sample_io_data *this,
     }
     while (--count > 0);
 }
+#endif /* CPU */
 
+#if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) || defined(CPU_ARM_MICRO)
 /* write stereo internal format to output format */
 void sample_output_stereo(struct sample_io_data *this,
                           struct dsp_buffer *src, struct dsp_buffer *dst)
diff --git a/lib/rbcodec/dsp/resample.c b/lib/rbcodec/dsp/resample.c
index bec0de99f0..81ab600ade 100644
--- a/lib/rbcodec/dsp/resample.c
+++ b/lib/rbcodec/dsp/resample.c
@@ -97,7 +97,7 @@ static bool resample_new_delta(struct resample_data *data,
     return true;
 }
 
-#if !defined(CPU_COLDFIRE) && !defined(CPU_ARM)
+#if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) || defined(CPU_ARM_MICRO)
 int resample_hermite(struct resample_data *data, struct dsp_buffer *src,
                      struct dsp_buffer *dst)
 {