diff --git a/ChangeLog b/ChangeLog
index 89ba32e171d779aecb50b6ac432263b806192ae0..430b793bcdc7e2f33d8017175864f67f513fc3f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-18  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* Makefile.def (fortran): Add check-target-libgomp-fortran.
+	* Makefile.tpl (check-target-libgomp-fortran): New phony target.
+	* Makefile.in: Regenerate.
+
 2018-06-16  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Import latest version.
@@ -7,9 +13,9 @@
 
 	* MAINTAINERS: Remove MPX-related entries.
 	* Makefile.def: Remove libmpx support.
-	* Makefile.in: Likewise.
-	* configure: Remove removed files.
-	* configure.ac: Likewise.
+	* Makefile.in: Regenerate.
+	* configure.ac: Remove removed files.
+	* configure: Regenerate.
 	* libmpx/ChangeLog: Remove.
 	* libmpx/Makefile.am: Remove.
 	* libmpx/Makefile.in: Remove.
diff --git a/Makefile.def b/Makefile.def
index 062d2fb3e752629d05dce28a9793420a56cc633d..31c2bbcd54918ab3afade5e18b357197888929a9 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -586,7 +586,8 @@ languages = { language=c++;	gcc-check-target=check-c++;
 				lib-check-target=check-target-libgomp-c++; };
 languages = { language=fortran;	gcc-check-target=check-fortran;
 				lib-check-target=check-target-libquadmath;
-				lib-check-target=check-target-libgfortran; };
+				lib-check-target=check-target-libgfortran;
+				lib-check-target=check-target-libgomp-fortran; };
 languages = { language=ada;	gcc-check-target=check-ada;
 				lib-check-target=check-target-libada; };
 languages = { language=objc;	gcc-check-target=check-objc;
diff --git a/Makefile.in b/Makefile.in
index be6b7757cd65430d4e77a59630e73f5728feaa73..32a92a6bcd17dd01483759745b0e7d5de37465a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52232,6 +52232,10 @@ maintainer-clean-target-libatomic:
 check-target-libgomp-c++:
 	$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++.exp" check-target-libgomp
 
+.PHONY: check-target-libgomp-fortran
+check-target-libgomp-fortran:
+	$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) fortran.exp" check-target-libgomp
+
 @endif target-libgomp
 
 @if target-libitm
@@ -52283,7 +52287,7 @@ check-gcc-fortran:
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-fortran);
-check-fortran: check-gcc-fortran check-target-libquadmath check-target-libgfortran
+check-fortran: check-gcc-fortran check-target-libquadmath check-target-libgfortran check-target-libgomp-fortran
 
 .PHONY: check-gcc-ada check-ada
 check-gcc-ada:
diff --git a/Makefile.tpl b/Makefile.tpl
index abd2bc2fb897d3dca0dfd3f5535e0fea5226660b..b6077c9f125cf65784b3b584153f180b699ebdf3 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1470,6 +1470,10 @@ ENDIF raw_cxx +]
 check-target-libgomp-c++:
 	$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++.exp" check-target-libgomp
 
+.PHONY: check-target-libgomp-fortran
+check-target-libgomp-fortran:
+	$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) fortran.exp" check-target-libgomp
+
 @endif target-libgomp
 
 @if target-libitm