summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-06-11 21:21:36 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-06-11 21:21:36 +0000
commit6c921f5e04a1336f4a27f55afe728bae8f96065c (patch)
treec6784e62286d4564c2f5b5dc6e0c9877dac8db06
parentfa08c83e29c3957dc433067bd874c4f0e82dd9f1 (diff)
downloadrockbox-6c921f5e04a1336f4a27f55afe728bae8f96065c.tar.gz
rockbox-6c921f5e04a1336f4a27f55afe728bae8f96065c.zip
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
-rw-r--r--apps/codecs/mp3_enc.c8
-rwxr-xr-xtools/configure2
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
@@ -2138,8 +2138,6 @@ STATICIRAM void to_mono_mm(void)
2138#ifdef ROCKBOX_LITTLE_ENDIAN 2138#ifdef ROCKBOX_LITTLE_ENDIAN
2139/* Swaps a frame to big endian */ 2139/* Swaps a frame to big endian */
2140static inline void byte_swap_frame32(uint32_t *dst, uint32_t *src, 2140static inline void byte_swap_frame32(uint32_t *dst, uint32_t *src,
2141 size_t size) ICODE_ATTR;
2142static inline void byte_swap_frame32(uint32_t *dst, uint32_t *src,
2143 size_t size) 2141 size_t size)
2144{ 2142{
2145 uint32_t *src_end = SKIPBYTES(src, size); 2143 uint32_t *src_end = SKIPBYTES(src, size);
@@ -2386,7 +2384,6 @@ STATICIRAM void encode_frame(char *buffer, struct enc_chunk_hdr *chunk)
2386} /* encode_frame */ 2384} /* encode_frame */
2387 2385
2388/* called very often - inline */ 2386/* called very often - inline */
2389static inline bool is_file_data_ok(struct enc_file_event_data *filed) ICODE_ATTR;
2390static inline bool is_file_data_ok(struct enc_file_event_data *filed) 2387static inline bool is_file_data_ok(struct enc_file_event_data *filed)
2391{ 2388{
2392 return filed->rec_file >= 0 && (long)filed->chunk->flags >= 0; 2389 return filed->rec_file >= 0 && (long)filed->chunk->flags >= 0;
@@ -2396,7 +2393,6 @@ static unsigned char mp3_data[16384] __attribute__((aligned(4)));
2396static unsigned int mp3_data_len; /* current data size in buffer */ 2393static unsigned int mp3_data_len; /* current data size in buffer */
2397 2394
2398/* called very often - inline */ 2395/* called very often - inline */
2399static inline bool on_write_chunk(struct enc_file_event_data *data) ICODE_ATTR;
2400static inline bool on_write_chunk(struct enc_file_event_data *data) 2396static inline bool on_write_chunk(struct enc_file_event_data *data)
2401{ 2397{
2402 if (!is_file_data_ok(data)) 2398 if (!is_file_data_ok(data))
@@ -2514,9 +2510,7 @@ static void on_rec_new_stream(struct enc_buffer_event_data *data)
2514 } 2510 }
2515} /* on_rec_new_stream */ 2511} /* on_rec_new_stream */
2516 2512
2517STATICIRAM void enc_events_callback(enum enc_events event, void *data) 2513static void enc_events_callback(enum enc_events event, void *data)
2518 ICODE_ATTR;
2519STATICIRAM void enc_events_callback(enum enc_events event, void *data)
2520{ 2514{
2521 switch (event) 2515 switch (event)
2522 { 2516 {
diff --git a/tools/configure b/tools/configure
index 28cff9a879..1f06795542 100755
--- a/tools/configure
+++ b/tools/configure
@@ -40,7 +40,7 @@ prefixtools () {
40} 40}
41 41
42findarmgcc() { 42findarmgcc() {
43 models_not_checked_with_eabi="iriverh10 iriverh10_5gb ipodcolor ipodnano1g ipodvideo ipod3g ipod4g ipodmini1g ipodmini2g ipod1g2g ipodnano2g iaudio7 cowond2 mrobe500 mrobe100 sansac200 vibe500" 43 models_not_checked_with_eabi="iriverh10_5gb ipodcolor ipodnano1g ipodvideo ipod3g ipod4g ipodmini1g ipodmini2g ipod1g2g ipodnano2g iaudio7 cowond2 mrobe500 mrobe100 sansac200 vibe500"
44 if [ "$ARG_ARM_EABI" != 1 ]; then # eabi not explicitely enabled 44 if [ "$ARG_ARM_EABI" != 1 ]; then # eabi not explicitely enabled
45 for model in $models_not_checked_with_eabi; do 45 for model in $models_not_checked_with_eabi; do
46 if [ "$modelname" = "$model" ]; then 46 if [ "$modelname" = "$model" ]; then