summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extra/Configs/Config.mips45
-rw-r--r--test/math/Makefile.in2
2 files changed, 1 insertions, 46 deletions
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index 4d30d31d2..e0b62dd67 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -31,48 +31,3 @@ config CONFIG_MIPS_N64_ABI
bool "N64 ABI"
endchoice
-
-choice
- prompt "Target Processor Architecture"
- default CONFIG_MIPS_ISA_1 if CONFIG_MIPS_O32_ABI
- default CONFIG_MIPS_ISA_3 if CONFIG_MIPS_N32_ABI
- default CONFIG_MIPS_ISA_3 if CONFIG_MIPS_N64_ABI
- help
- This selects the instruction set architecture of your MIPS CPU. This
- information is used for optimizing purposes. To build a library that
- will run on any MIPS CPU, you can specify "Generic (MIPS I)" here.
- If you pick anything other than "Generic (MIPS I)," there is no
- guarantee that uClibc will even run on anything other than the
- selected processor type.
-
- You should probably select the MIPS ISA that best matches the
- CPU you will be using on your device. uClibc will be tuned
- for that architecture.
-
- If you don't know what to do, choose "Generic (MIPS I)"
-
-config CONFIG_MIPS_ISA_1
- bool "Generic (MIPS I)"
-
-config CONFIG_MIPS_ISA_2
- bool "MIPS II"
-
-config CONFIG_MIPS_ISA_3
- bool "MIPS III"
-
-config CONFIG_MIPS_ISA_4
- bool "MIPS IV"
-
-config CONFIG_MIPS_ISA_MIPS32
- bool "MIPS32"
-
-config CONFIG_MIPS_ISA_MIPS32R2
- bool "MIPS32r2"
-
-config CONFIG_MIPS_ISA_MIPS64
- bool "MIPS64"
-
-config CONFIG_MIPS_ISA_MIPS64R2
- bool "MIPS64r2"
-
-endchoice
diff --git a/test/math/Makefile.in b/test/math/Makefile.in
index 147d579f4..9fbd58ab8 100644
--- a/test/math/Makefile.in
+++ b/test/math/Makefile.in
@@ -35,7 +35,7 @@ $(MDEPS): libm-test.c
ULP_SUFFIX :=
ifeq ($(TARGET_ARCH),mips)
-ULP_SUFFIX:=$(if $(CONFIG_MIPS_ISA_MIPS64R1)$(CONFIG_MIPS_ISA_MIPS64R2),64,32)
+ULP_SUFFIX:=$(if $(CONFIG_MIPS_N64_ABI),64,32)
endif
TARGET_ULP := $(if $(wildcard libm-test-ulps-$(TARGET_ARCH)$(ULP_SUFFIX)),$(TARGET_ARCH)$(ULP_SUFFIX),generic)