# DP: For biarch builds, disable the gnat testsuite for the non-default
# architecture (no biarch support in gnat yet).

Index: b/src/gcc/Makefile.in
===================================================================
--- a/src/gcc/Makefile.in
+++ b/src/gcc/Makefile.in
@@ -4510,7 +4510,11 @@
 	if [ -f $${rootme}/../expect/expect ] ; then  \
 	   TCL_LIBRARY=`cd .. ; cd $${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
 	    export TCL_LIBRARY ; fi ; \
-	$(RUNTEST) --tool $* $(RUNTESTFLAGS))
+	if [ "$*" = gnat ]; then \
+	  runtestflags="`echo '$(RUNTESTFLAGS)' | sed 's/,-m[36][24]//;s/,-mabi=n32//'`"; \
+	  case "$$runtestflags" in *\\{\\}) runtestflags=; esac; \
+	fi; \
+	$(RUNTEST) --tool $* $$runtestflags)
 
 $(patsubst %,%-subtargets,$(filter-out $(lang_checks_parallelized),$(lang_checks))): check-%-subtargets:
 	@echo check-$*
