diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/configure b/tools/configure index 08d07b7797..2b4a05d7e8 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -500,8 +500,6 @@ arm7ejscc () { | |||
500 | } | 500 | } |
501 | 501 | ||
502 | mipselcc () { | 502 | mipselcc () { |
503 | arch="mips" | ||
504 | arch_version=32 # FIXME: autodetect version (32 or 64) | ||
505 | prefixtools mipsel-elf- | 503 | prefixtools mipsel-elf- |
506 | # mips is predefined, but we want it for paths. use __mips instead | 504 | # mips is predefined, but we want it for paths. use __mips instead |
507 | GCCOPTS="$CCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -Umips" | 505 | GCCOPTS="$CCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -Umips" |
@@ -698,7 +696,6 @@ androidmipscc () { | |||
698 | gccchoice="4.4.3" | 696 | gccchoice="4.4.3" |
699 | gcctarget="mipsel-linux-android-" | 697 | gcctarget="mipsel-linux-android-" |
700 | gccprefix=$ANDROID_NDK_PATH/toolchains/$gcctarget$gccchoice/prebuilt/$buildhost-x86 | 698 | gccprefix=$ANDROID_NDK_PATH/toolchains/$gcctarget$gccchoice/prebuilt/$buildhost-x86 |
701 | arch_version=32 # FIXME: autodetect version (32 or 64) | ||
702 | thread_support="HAVE_SIGALTSTACK_THREADS" | 699 | thread_support="HAVE_SIGALTSTACK_THREADS" |
703 | PATH=$PATH:$gccprefix/bin | 700 | PATH=$PATH:$gccprefix/bin |
704 | prefixtools $gcctarget | 701 | prefixtools $gcctarget |
@@ -3751,7 +3748,8 @@ if [ -z "$arch" ]; then | |||
3751 | # cpp defines like "#define __ARM_ARCH_4TE__ 1" (where we want to extract the 4) | 3748 | # cpp defines like "#define __ARM_ARCH_4TE__ 1" (where we want to extract the 4) |
3752 | arch_version="$(echo $cpp_defines | tr ' ' '\012' | grep __ARM_ARCH | sed -e 's,.*\([0-9]\).*,\1,')" | 3749 | arch_version="$(echo $cpp_defines | tr ' ' '\012' | grep __ARM_ARCH | sed -e 's,.*\([0-9]\).*,\1,')" |
3753 | elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then | 3750 | elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then |
3754 | arch="mips" # FIXME: autodetect version (32 or 64) | 3751 | arch="mips" |
3752 | arch_version="$(echo $cpp_defines | tr ' ' '\012' | grep _MIPS_ARCH_MIPS | sed -e 's,.*\([0-9][0-9]\).*,\1,')" | ||
3755 | elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then | 3753 | elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then |
3756 | arch="x86" | 3754 | arch="x86" |
3757 | elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then | 3755 | elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then |
@@ -3835,7 +3833,7 @@ cat > autoconf.h <<EOF | |||
3835 | 3833 | ||
3836 | /* Define target machine architecture */ | 3834 | /* Define target machine architecture */ |
3837 | #define ARCH ${arch} | 3835 | #define ARCH ${arch} |
3838 | /* Optinally define architecture version */ | 3836 | /* Optionally define architecture version */ |
3839 | ${Darch_version} | 3837 | ${Darch_version} |
3840 | 3838 | ||
3841 | /* Define endianess for the target or simulator platform */ | 3839 | /* Define endianess for the target or simulator platform */ |