diff options
author | Rafaël Carré <funman@videolan.org> | 2012-04-14 19:17:06 -0400 |
---|---|---|
committer | Rafaël Carré <funman@videolan.org> | 2012-04-14 19:17:21 -0400 |
commit | 05ebf79540158e19311d1f2b50dd57dacd3c2e09 (patch) | |
tree | 2024f9552126ed64843651f1b0806f79ede3efb6 | |
parent | c26ab37aca59da2fde7d96ab8528ac2b002a8192 (diff) | |
download | rockbox-05ebf79540158e19311d1f2b50dd57dacd3c2e09.tar.gz rockbox-05ebf79540158e19311d1f2b50dd57dacd3c2e09.zip |
configure: remove support for ARM non EABI compiler
Change-Id: I4a25b368337e25bc0f9b3e2639beaf1225150a06
-rwxr-xr-x | tools/configure | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/tools/configure b/tools/configure index b682cbd223..dd8f093dc9 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -128,13 +128,8 @@ app_set_lcd_size () { | |||
128 | } | 128 | } |
129 | 129 | ||
130 | findarmgcc() { | 130 | findarmgcc() { |
131 | if [ "$ARG_ARM_EABI" != "0" ]; then | 131 | prefixtools arm-elf-eabi- |
132 | prefixtools arm-elf-eabi- | 132 | gccchoice="4.4.4" |
133 | gccchoice="4.4.4" | ||
134 | else | ||
135 | prefixtools arm-elf- | ||
136 | gccchoice="4.0.3" | ||
137 | fi | ||
138 | } | 133 | } |
139 | 134 | ||
140 | # scan the $PATH for the given command | 135 | # scan the $PATH for the given command |
@@ -444,9 +439,6 @@ coldfirecc () { | |||
444 | arm7tdmicc () { | 439 | arm7tdmicc () { |
445 | findarmgcc | 440 | findarmgcc |
446 | GCCOPTS="$CCOPTS -mcpu=arm7tdmi" | 441 | GCCOPTS="$CCOPTS -mcpu=arm7tdmi" |
447 | if test "X$1" != "Xshort" -a "$ARG_ARM_EABI" = "0"; then | ||
448 | GCCOPTS="$GCCOPTS -mlong-calls" | ||
449 | fi | ||
450 | GCCOPTIMIZE="-fomit-frame-pointer" | 442 | GCCOPTIMIZE="-fomit-frame-pointer" |
451 | endian="little" | 443 | endian="little" |
452 | } | 444 | } |
@@ -454,9 +446,6 @@ arm7tdmicc () { | |||
454 | arm9tdmicc () { | 446 | arm9tdmicc () { |
455 | findarmgcc | 447 | findarmgcc |
456 | GCCOPTS="$CCOPTS -mcpu=arm9tdmi" | 448 | GCCOPTS="$CCOPTS -mcpu=arm9tdmi" |
457 | if test "$modelname" != "gigabeatfx" -a "$t_manufacturer" != "as3525" -a "$ARG_ARM_EABI" = "0"; then | ||
458 | GCCOPTS="$GCCOPTS -mlong-calls" | ||
459 | fi | ||
460 | GCCOPTIMIZE="-fomit-frame-pointer" | 449 | GCCOPTIMIZE="-fomit-frame-pointer" |
461 | endian="little" | 450 | endian="little" |
462 | } | 451 | } |
@@ -464,9 +453,6 @@ arm9tdmicc () { | |||
464 | arm940tbecc () { | 453 | arm940tbecc () { |
465 | findarmgcc | 454 | findarmgcc |
466 | GCCOPTS="$CCOPTS -mbig-endian -mcpu=arm940t" | 455 | GCCOPTS="$CCOPTS -mbig-endian -mcpu=arm940t" |
467 | if test "$ARG_ARM_EABI" = "0"; then | ||
468 | GCCOPTS="$GCCOPTS -mlong-calls" | ||
469 | fi | ||
470 | GCCOPTIMIZE="-fomit-frame-pointer" | 456 | GCCOPTIMIZE="-fomit-frame-pointer" |
471 | endian="big" | 457 | endian="big" |
472 | } | 458 | } |
@@ -474,9 +460,6 @@ arm940tbecc () { | |||
474 | arm940tcc () { | 460 | arm940tcc () { |
475 | findarmgcc | 461 | findarmgcc |
476 | GCCOPTS="$CCOPTS -mcpu=arm940t" | 462 | GCCOPTS="$CCOPTS -mcpu=arm940t" |
477 | if test "$ARG_ARM_EABI" = "0"; then | ||
478 | GCCOPTS="$GCCOPTS -mlong-calls" | ||
479 | fi | ||
480 | GCCOPTIMIZE="-fomit-frame-pointer" | 463 | GCCOPTIMIZE="-fomit-frame-pointer" |
481 | endian="little" | 464 | endian="little" |
482 | } | 465 | } |
@@ -484,9 +467,6 @@ arm940tcc () { | |||
484 | arm946cc () { | 467 | arm946cc () { |
485 | findarmgcc | 468 | findarmgcc |
486 | GCCOPTS="$CCOPTS -mcpu=arm9e" | 469 | GCCOPTS="$CCOPTS -mcpu=arm9e" |
487 | if test "$ARG_ARM_EABI" = "0"; then | ||
488 | GCCOPTS="$GCCOPTS -mlong-calls" | ||
489 | fi | ||
490 | GCCOPTIMIZE="-fomit-frame-pointer" | 470 | GCCOPTIMIZE="-fomit-frame-pointer" |
491 | endian="little" | 471 | endian="little" |
492 | } | 472 | } |
@@ -494,9 +474,6 @@ arm946cc () { | |||
494 | arm926ejscc () { | 474 | arm926ejscc () { |
495 | findarmgcc | 475 | findarmgcc |
496 | GCCOPTS="$CCOPTS -mcpu=arm926ej-s" | 476 | GCCOPTS="$CCOPTS -mcpu=arm926ej-s" |
497 | if test "$t_manufacturer" != "as3525" -a "$ARG_ARM_EABI" = "0"; then | ||
498 | GCCOPTS="$GCCOPTS -mlong-calls" | ||
499 | fi | ||
500 | GCCOPTIMIZE="-fomit-frame-pointer" | 477 | GCCOPTIMIZE="-fomit-frame-pointer" |
501 | endian="little" | 478 | endian="little" |
502 | } | 479 | } |
@@ -504,9 +481,6 @@ arm926ejscc () { | |||
504 | arm1136jfscc () { | 481 | arm1136jfscc () { |
505 | findarmgcc | 482 | findarmgcc |
506 | GCCOPTS="$CCOPTS -mcpu=arm1136jf-s" | 483 | GCCOPTS="$CCOPTS -mcpu=arm1136jf-s" |
507 | if test "$modelname" != "gigabeats" -a "$ARG_ARM_EABI" = "0"; then | ||
508 | GCCOPTS="$GCCOPTS -mlong-calls" | ||
509 | fi | ||
510 | GCCOPTIMIZE="-fomit-frame-pointer" | 484 | GCCOPTIMIZE="-fomit-frame-pointer" |
511 | endian="little" | 485 | endian="little" |
512 | } | 486 | } |
@@ -514,9 +488,6 @@ arm1136jfscc () { | |||
514 | arm1176jzscc () { | 488 | arm1176jzscc () { |
515 | findarmgcc | 489 | findarmgcc |
516 | GCCOPTS="$CCOPTS -mcpu=arm1176jz-s" | 490 | GCCOPTS="$CCOPTS -mcpu=arm1176jz-s" |
517 | if test "$ARG_ARM_EABI" = "0"; then | ||
518 | GCCOPTS="$GCCOPTS -mlong-calls" | ||
519 | fi | ||
520 | GCCOPTIMIZE="-fomit-frame-pointer" | 491 | GCCOPTIMIZE="-fomit-frame-pointer" |
521 | endian="little" | 492 | endian="little" |
522 | } | 493 | } |
@@ -1154,9 +1125,6 @@ help() { | |||
1154 | --ccache Enable ccache use (done by default these days) | 1125 | --ccache Enable ccache use (done by default these days) |
1155 | --no-ccache Disable ccache use | 1126 | --no-ccache Disable ccache use |
1156 | 1127 | ||
1157 | --eabi Make configure prefer toolchains that are able to compile | ||
1158 | for the new ARM standard abi EABI | ||
1159 | --no-eabi The opposite of --eabi (prefer old non-eabi toolchains) | ||
1160 | --thumb Build with -mthumb (for ARM builds) | 1128 | --thumb Build with -mthumb (for ARM builds) |
1161 | --no-thumb The opposite of --thumb (don't use thumb even for targets | 1129 | --no-thumb The opposite of --thumb (don't use thumb even for targets |
1162 | where this is the default | 1130 | where this is the default |
@@ -1183,7 +1151,6 @@ ARG_TTS= | |||
1183 | ARG_TTSOPTS= | 1151 | ARG_TTSOPTS= |
1184 | ARG_TYPE= | 1152 | ARG_TYPE= |
1185 | ARG_VOICE= | 1153 | ARG_VOICE= |
1186 | ARG_ARM_EABI= | ||
1187 | ARG_ARM_THUMB= | 1154 | ARG_ARM_THUMB= |
1188 | ARG_PREFIX="$PREFIX" | 1155 | ARG_PREFIX="$PREFIX" |
1189 | ARG_THREAD_SUPPORT= | 1156 | ARG_THREAD_SUPPORT= |
@@ -1203,8 +1170,6 @@ for arg in "$@"; do | |||
1203 | --ttsopts=*) ARG_TTSOPTS=`echo "$arg" | cut -d = -f 2`;; | 1170 | --ttsopts=*) ARG_TTSOPTS=`echo "$arg" | cut -d = -f 2`;; |
1204 | --type=*) ARG_TYPE=`echo "$arg" | cut -d = -f 2`;; | 1171 | --type=*) ARG_TYPE=`echo "$arg" | cut -d = -f 2`;; |
1205 | --voice=*) ARG_VOICE=`echo "$arg" | cut -d = -f 2`;; | 1172 | --voice=*) ARG_VOICE=`echo "$arg" | cut -d = -f 2`;; |
1206 | --eabi) ARG_ARM_EABI=1;; | ||
1207 | --no-eabi) ARG_ARM_EABI=0;; | ||
1208 | --thumb) ARG_ARM_THUMB=1;; | 1173 | --thumb) ARG_ARM_THUMB=1;; |
1209 | --no-thumb) ARG_ARM_THUMB=0;; | 1174 | --no-thumb) ARG_ARM_THUMB=0;; |
1210 | --sdl-threads)ARG_THREAD_SUPPORT=1;; | 1175 | --sdl-threads)ARG_THREAD_SUPPORT=1;; |