From 6c921f5e04a1336f4a27f55afe728bae8f96065c Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 11 Jun 2010 21:21:36 +0000 Subject: Build h10 GB with EABI toolchain. Remove some pointless ICODE attributes from mp3_enc.codec and, to make it build, move one function out of IRAM there since it really shouldn't matter. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26800 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/mp3_enc.c | 8 +------- tools/configure | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/apps/codecs/mp3_enc.c b/apps/codecs/mp3_enc.c index b35702b0d0..2739778349 100644 --- a/apps/codecs/mp3_enc.c +++ b/apps/codecs/mp3_enc.c @@ -2137,8 +2137,6 @@ STATICIRAM void to_mono_mm(void) #ifdef ROCKBOX_LITTLE_ENDIAN /* Swaps a frame to big endian */ -static inline void byte_swap_frame32(uint32_t *dst, uint32_t *src, - size_t size) ICODE_ATTR; static inline void byte_swap_frame32(uint32_t *dst, uint32_t *src, size_t size) { @@ -2386,7 +2384,6 @@ STATICIRAM void encode_frame(char *buffer, struct enc_chunk_hdr *chunk) } /* encode_frame */ /* called very often - inline */ -static inline bool is_file_data_ok(struct enc_file_event_data *filed) ICODE_ATTR; static inline bool is_file_data_ok(struct enc_file_event_data *filed) { return filed->rec_file >= 0 && (long)filed->chunk->flags >= 0; @@ -2396,7 +2393,6 @@ static unsigned char mp3_data[16384] __attribute__((aligned(4))); static unsigned int mp3_data_len; /* current data size in buffer */ /* called very often - inline */ -static inline bool on_write_chunk(struct enc_file_event_data *data) ICODE_ATTR; static inline bool on_write_chunk(struct enc_file_event_data *data) { if (!is_file_data_ok(data)) @@ -2514,9 +2510,7 @@ static void on_rec_new_stream(struct enc_buffer_event_data *data) } } /* on_rec_new_stream */ -STATICIRAM void enc_events_callback(enum enc_events event, void *data) - ICODE_ATTR; -STATICIRAM void enc_events_callback(enum enc_events event, void *data) +static void enc_events_callback(enum enc_events event, void *data) { switch (event) { diff --git a/tools/configure b/tools/configure index 28cff9a879..1f06795542 100755 --- a/tools/configure +++ b/tools/configure @@ -40,7 +40,7 @@ prefixtools () { } findarmgcc() { - models_not_checked_with_eabi="iriverh10 iriverh10_5gb ipodcolor ipodnano1g ipodvideo ipod3g ipod4g ipodmini1g ipodmini2g ipod1g2g ipodnano2g iaudio7 cowond2 mrobe500 mrobe100 sansac200 vibe500" + models_not_checked_with_eabi="iriverh10_5gb ipodcolor ipodnano1g ipodvideo ipod3g ipod4g ipodmini1g ipodmini2g ipod1g2g ipodnano2g iaudio7 cowond2 mrobe500 mrobe100 sansac200 vibe500" if [ "$ARG_ARM_EABI" != 1 ]; then # eabi not explicitely enabled for model in $models_not_checked_with_eabi; do if [ "$modelname" = "$model" ]; then -- cgit v1.2.3