Index: test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
===================================================================
--- test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
+++ test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
@@ -5,7 +5,7 @@
 else()
   set(RUN_OPTIONS --cartvis 1.0 0.0 --rhomin 1e-8 -n 10 --domain 32 32 32)
 endif()
-if("${ARCH}" STREQUAL "Mips")
+if(MIPS_IS_MIPS64_ENABLED)
 	list(APPEND CXXFLAGS -mxgot)
 endif()
 set(FP_ABSTOLERANCE 0.0000001)
Index: test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/Makefile
===================================================================
--- test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/Makefile
+++ test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/Makefile
@@ -10,7 +10,7 @@
 endif
 FP_ABSTOLERANCE :=  0.0000001
 
-ifeq ($(ARCH),Mips)
+ifeq (-mabi=n64, $(findstring -mabi=n64, $(TARGET_FLAGS)))
 # Mips needs a bit more compilation time when Mips64r6 and MSA are used
 # together.
 RUNTIMELIMIT := 700