diff --git a/README b/README index 49bf7dad9625d4350e7ac0e39873d460afc7e67c..d5ef598234bfd00d2a3d9bf438755eeb28ca1541 100644 --- a/README +++ b/README @@ -47,10 +47,6 @@ COMPILING THE APPLICATIONS/LIBRARIES: armv6-darwin-gcc armv6-linux-rvct armv6-linux-gcc - iwmmxt-linux-rvct - iwmmxt-linux-gcc - iwmmxt2-linux-rvct - iwmmxt2-linux-gcc armv7-linux-rvct armv7-linux-gcc mips32-linux-gcc diff --git a/build/make/configure.sh b/build/make/configure.sh index 7a84c013c95d07bc12b32f48107079608f31e251..6039a50664776a0bad96adaea86666a3d697de3c 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -603,8 +603,8 @@ process_common_toolchain() { # Enable the architecture family case ${tgt_isa} in - arm*|iwmmxt*) enable arm;; - mips*) enable mips;; + arm*) enable arm;; + mips*) enable mips;; esac # PIC is probably what we want when building shared libs @@ -665,35 +665,25 @@ process_common_toolchain() { # Process ARM architecture variants case ${toolchain} in - arm*|iwmmxt*) - # on arm, isa versions are supersets - enabled armv7a && soft_enable armv7 ### DEBUG - enabled armv7 && soft_enable armv6 - enabled armv7 || enabled armv6 && soft_enable armv5te - enabled armv7 || enabled armv6 && soft_enable fast_unaligned - enabled iwmmxt2 && soft_enable iwmmxt - enabled iwmmxt && soft_enable armv5te + arm*) + # on arm, isa versions are supersets + enabled armv7a && soft_enable armv7 ### DEBUG + enabled armv7 && soft_enable armv6 + enabled armv7 || enabled armv6 && soft_enable armv5te + enabled armv7 || enabled armv6 && soft_enable fast_unaligned - asm_conversion_cmd="cat" + asm_conversion_cmd="cat" case ${tgt_cc} in gcc) - if enabled iwmmxt || enabled iwmmxt2 - then - CROSS=${CROSS:-arm-iwmmxt-linux-gnueabi-} - else - CROSS=${CROSS:-arm-none-linux-gnueabi-} - fi + CROSS=${CROSS:-arm-none-linux-gnueabi-} link_with_cc=gcc setup_gnu_toolchain arch_int=${tgt_isa##armv} arch_int=${arch_int%%te} check_add_asflags --defsym ARCHITECTURE=${arch_int} tune_cflags="-mtune=" - if enabled iwmmxt || enabled iwmmxt2 - then - check_add_asflags -mcpu=${tgt_isa} - elif enabled armv7 + if enabled armv7 then check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-ftree-vectorize check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-march=armv7-a diff --git a/configure b/configure index 3e87f3903aee73a61f44e049c8bb411e33ed6c0d..68708907bfc8308e66ed8750a2a1e798ec75e8f7 100755 --- a/configure +++ b/configure @@ -87,10 +87,6 @@ all_platforms="${all_platforms} armv6-darwin-gcc" all_platforms="${all_platforms} armv6-linux-rvct" all_platforms="${all_platforms} armv6-linux-gcc" all_platforms="${all_platforms} armv6-none-rvct" -all_platforms="${all_platforms} iwmmxt-linux-rvct" -all_platforms="${all_platforms} iwmmxt-linux-gcc" -all_platforms="${all_platforms} iwmmxt2-linux-rvct" -all_platforms="${all_platforms} iwmmxt2-linux-gcc" all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 @@ -196,8 +192,6 @@ ARCH_EXT_LIST=" armv5te armv6 armv7 - iwmmxt - iwmmxt2 mips32