1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
diff --git a/apps/codecs/libspeex/filters_arm4.h b/apps/codecs/libspeex/filters_arm4.h
index 886caed..bbe4bc9 100644
--- a/apps/codecs/libspeex/filters_arm4.h
+++ b/apps/codecs/libspeex/filters_arm4.h
@@ -46,9 +46,9 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le
          ".normalize16loop1%=: \n"

          "\tldr %4, [%0], #4 \n"
-         "\tcmps %4, %1 \n"
+         "\tcmp %4, %1 \n"
          "\tmovgt %1, %4 \n"
-         "\tcmps %4, %3 \n"
+         "\tcmp %4, %3 \n"
          "\tmovlt %3, %4 \n"

          "\tsubs %2, %2, #1 \n"
diff --git a/apps/gui/list.h b/apps/gui/list.h
index c1126f2..0400022 100644
--- a/apps/gui/list.h
+++ b/apps/gui/list.h
@@ -168,7 +168,7 @@ extern void gui_synclist_del_item(struct gui_synclist * lists);
 extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll);
 extern void gui_synclist_flash(struct gui_synclist * lists);
 extern void gui_synclist_set_title(struct gui_synclist * lists, char * title,
-                                   int icon);
+                                   enum themable_icons icon);
 extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists,
                                                 bool hide);
 extern bool gui_synclist_item_is_onscreen(struct gui_synclist *lists,
diff --git a/apps/menu.c b/apps/menu.c
index 653dc09..aff84c7 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -131,7 +131,7 @@ static char * get_menu_item_name(int selected_item,
     return P2STR(menu->callback_and_desc->desc);
 }
 #ifdef HAVE_LCD_BITMAP
-static int menu_get_icon(int selected_item, void * data)
+static enum themable_icons  menu_get_icon(int selected_item, void * data)
 {
     const struct menu_item_ex *menu = (const struct menu_item_ex *)data;
     int menu_icon = Icon_NOICON;
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 7c4ee37..1e1aab8 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -576,7 +576,8 @@ static char *playlist_callback_name(int selected_item,
 }


-static int playlist_callback_icons(int selected_item, void *data)
+static enum themable_icons playlist_callback_icons(int selected_item,
+                                                   void *data)
 {
     struct playlist_viewer * local_viewer=(struct playlist_viewer *)data;

diff --git a/apps/plugin.h b/apps/plugin.h
index 253cfd0..d1a5712 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -346,7 +346,8 @@ struct plugin_api {
     void (*gui_synclist_limit_scroll)(struct gui_synclist * lists, bool scroll);
     bool (*gui_synclist_do_button)(struct gui_synclist * lists,
                                    int *action, enum list_wrap wrap);
-    void (*gui_synclist_set_title)(struct gui_synclist *lists, char* title, int icon);
+    void (*gui_synclist_set_title)(struct gui_synclist *lists, char* title,
+                                   enum themable_icons icon);
     enum yesno_res (*gui_syncyesno_run)(const struct text_message * main_message,
                                         const struct text_message * yes_message,
                                         const struct text_message * no_message);
diff --git a/apps/tree.c b/apps/tree.c
index d1d0ec3..ef65c6d 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -173,7 +173,7 @@ static int tree_get_filecolor(int selected_item, void * data)
 }
 #endif

-static int tree_get_fileicon(int selected_item, void * data)
+static enum themable_icons tree_get_fileicon(int selected_item, void * data)
 {
     struct tree_context * local_tc=(struct tree_context *)data;
 #ifdef HAVE_TAGCACHE
diff --git a/tools/configure b/tools/configure
index e543919..661b5d0 100755
--- a/tools/configure
+++ b/tools/configure
@@ -246,57 +246,48 @@ coldfirecc () {
 }

 arm7tdmicc () {
- prefixtools arm-elf-
+ prefixtools arm-elf-eabi-
  GCCOPTS="$CCOPTS -mcpu=arm7tdmi"
- if test "X$1" != "Xshort"; then
-   GCCOPTS="$GCCOPTS -mlong-calls"
- fi
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
 }

 arm9tdmicc () {
- prefixtools arm-elf-
+ prefixtools arm-elf-eabi-
  GCCOPTS="$CCOPTS -mcpu=arm9tdmi"
- if test "$modelname" != "gigabeatf" -a "$t_manufacturer" != "as3525"; then
-  GCCOPTS="$GCCOPTS -mlong-calls"
- fi
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
 }

 arm940tbecc () {
- prefixtools arm-elf-
- GCCOPTS="$CCOPTS -mbig-endian -mcpu=arm940t -mlong-calls"
+ prefixtools arm-elf-eabi-
+ GCCOPTS="$CCOPTS -mbig-endian -mcpu=arm940t"
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="big"
  gccchoice="4.0.3"
 }

 arm946cc () {
- prefixtools arm-elf-
- GCCOPTS="$CCOPTS -mcpu=arm9e -mlong-calls"
+ prefixtools arm-elf-eabi-
+ GCCOPTS="$CCOPTS -mcpu=arm946e-s"
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
 }

 arm926ejscc () {
- prefixtools arm-elf-
- GCCOPTS="$CCOPTS -mcpu=arm926ej-s -mlong-calls"
+ prefixtools arm-elf-eabi-
+ GCCOPTS="$CCOPTS -mcpu=arm926ej-s"
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
 }

 arm1136jfscc () {
- prefixtools arm-elf-
+ prefixtools arm-elf-eabi-
  GCCOPTS="$CCOPTS -mcpu=arm1136jf-s"
- if test "$modelname" != "gigabeats"; then
-  GCCOPTS="$GCCOPTS -mlong-calls"
- fi
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
@@ -1082,7 +1073,7 @@ fi
     modelname="ifp7xx"
     target="-DIRIVER_IFP7XX"
     memory=1
-    arm7tdmicc short
+    arm7tdmicc
     tool="cp"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 0"
@@ -2667,7 +2658,7 @@ sed > Makefile \
  -e "s,@CODECS@,${swcodec},g" \
  -e "s,@PROFILE_OPTS@,${PROFILE_OPTS},g" \
  -e "s,@SHARED_FLAG@,${SHARED_FLAG},g" \
- -e "s,@GCCOPTS@,${GCCOPTS},g" \
+ -e "s~@GCCOPTS@~${GCCOPTS}~g" \
  -e "s,@TARGET_INC@,${TARGET_INC},g" \
  -e "s!@LDOPTS@!${LDOPTS}!g" \
  -e "s,@LOADADDRESS@,${loadaddress},g" \
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index 508b1ad..b0aac62 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -182,8 +182,10 @@ case $arch in
     esac
     ;;
   [Aa])
-    target="arm-elf"
+    target="arm-elf-eabi"
     gccpatch="rockbox-multilibs-arm-elf-gcc-4.0.3_2.diff"
+    binutils="2.19.51"
+    gccver="4.0.3"
     ;;
   [Ii])
     target="mipsel-elf"
@@ -226,7 +228,12 @@ echo ""
 if test -f "$dlwhere/binutils-$binutils.tar.bz2"; then
   echo "binutils $binutils already downloaded"
 else
-  getfile binutils-$binutils.tar.bz2 $GNU_MIRROR/binutils
+  #check for snapshot release
+  if [ "${binutils##*.*.}" -gt 49 ] ; then
+    getfile binutils-$binutils.tar.bz2 'ftp://sourceware.org/pub/binutils/snapshots'
+  else
+    getfile binutils-$binutils.tar.bz2 $GNU_MIRROR/binutils
+  fi
 fi

 if test -f "$dlwhere/gcc-core-$gccver.tar.bz2"; then