From 32c87d63d20a2fe4e5a510e058b5f5a6ebf82572 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Sat, 16 Jul 2011 23:34:13 -0400
Subject: [PATCH] Makefile.def (language=c++): Add check-c++0x and
 check-target-libmudflap-c++.

	* Makefile.def (language=c++): Add check-c++0x and
	check-target-libmudflap-c++.
	* Makefile.tpl (check-target-libmudflap-c++): New.
	* Makefile.in: Regenerate.

From-SVN: r176367
---
 ChangeLog    |  7 +++++++
 Makefile.def |  5 +++--
 Makefile.in  | 16 +++++++++-------
 Makefile.tpl |  7 +++++++
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ea7ae92c7c2..dba192a69f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-16  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.def (language=c++): Add check-c++0x and
+	check-target-libmudflap-c++.
+	* Makefile.tpl (check-target-libmudflap-c++): New.
+	* Makefile.in: Regenerate.
+
 2011-07-16  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.tpl (EXTRA_CONFIGARGS_LIBJAVA): Define.
diff --git a/Makefile.def b/Makefile.def
index 0cc6ef6cade..5116341d12f 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -511,8 +511,9 @@ dependencies = { module=configure-target-newlib; on=all-ld; };
 dependencies = { module=configure-target-libgfortran; on=all-target-libquadmath; };
 
 languages = { language=c;	gcc-check-target=check-gcc; };
-languages = { language=c++;	gcc-check-target=check-c++;
-				lib-check-target=check-target-libstdc++-v3; };
+languages = { language=c++;	gcc-check-target="check-c++ check-c++0x";
+				lib-check-target=check-target-libstdc++-v3;
+				lib-check-target=check-target-libmudflap-c++; };
 languages = { language=fortran;	gcc-check-target=check-fortran;
 				lib-check-target=check-target-libquadmath;
 				lib-check-target=check-target-libgfortran; };
diff --git a/Makefile.in b/Makefile.in
index e80f0483f97..3b8e6c74859 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40120,6 +40120,13 @@ maintainer-clean-target-libgomp:
 
 
 
+@if target-libmudflap
+.PHONY: check-target-libmudflap-c++
+check-target-libmudflap-c++:
+	$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++frags.exp" check-target-libmudflap
+
+@endif target-libmudflap
+
 # ----------
 # GCC module
 # ----------
@@ -40153,13 +40160,8 @@ check-gcc-c++:
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++);
-check-gcc-c++0x:
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++0x);
-check-c++: check-gcc-c++ check-target-libstdc++-v3 check-gcc-c++0x
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++ check-c++0x);
+check-c++: check-gcc-c++ check-target-libstdc++-v3 check-target-libmudflap-c++
 
 .PHONY: check-gcc-fortran check-fortran
 check-gcc-fortran:
diff --git a/Makefile.tpl b/Makefile.tpl
index ea3d08d67ab..0d2a0bfff2d 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1393,6 +1393,13 @@ ENDIF raw_cxx +]
 [+ ENDFOR recursive_targets +]
 [+ ENDFOR target_modules +]
 
+@if target-libmudflap
+.PHONY: check-target-libmudflap-c++
+check-target-libmudflap-c++:
+	$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++frags.exp" check-target-libmudflap
+
+@endif target-libmudflap
+
 # ----------
 # GCC module
 # ----------