diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.def | 3 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | Makefile.tpl | 4 | ||||
| -rwxr-xr-x | configure | 30 |
5 files changed, 19 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog index 93838be4e48..cd7152984a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +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. + + * configure: Regenerate. + 2018-06-18 Simon Marchi <simon.marchi@ericsson.com> * configure.ac: Sync with GCC, remove MPX-related things. diff --git a/Makefile.def b/Makefile.def index 0d13f037d0d..75063b6d121 100644 --- a/Makefile.def +++ b/Makefile.def @@ -593,7 +593,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 3acb83b8def..d13732e148e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46908,6 +46908,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 @@ -46959,7 +46963,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 147752188d9..9d2797b6501 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1460,6 +1460,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 diff --git a/configure b/configure index bacc9dd723d..fe8e0f63410 100755 --- a/configure +++ b/configure @@ -2758,7 +2758,6 @@ target_libraries="target-libgcc \ target-libstdc++-v3 \ target-libsanitizer \ target-libvtv \ - target-libmpx \ target-libssp \ target-libquadmath \ target-libgfortran \ @@ -3264,25 +3263,6 @@ $as_echo "yes" >&6; } fi -# Enable libmpx on supported systems by request. -if test -d ${srcdir}/libmpx; then - if test x$enable_libmpx = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmpx support" >&5 -$as_echo_n "checking for libmpx support... " >&6; } - if (srcdir=${srcdir}/libmpx; \ - . ${srcdir}/configure.tgt; \ - test "$LIBMPX_SUPPORTED" != "yes") - then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - noconfigdirs="$noconfigdirs target-libmpx" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - fi - fi -fi - # Disable libhsail-rt on unsupported systems. if test -d ${srcdir}/libhsail-rt; then if test x$enable_libhsail_rt = x; then @@ -7110,16 +7090,6 @@ if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 && bootstrap_target_libs=${bootstrap_target_libs}target-libvtv, fi -# If we are building libmpx and $BUILD_CONFIG contains bootstrap-mpx, -# bootstrap it. -if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then - case "$BUILD_CONFIG" in - *bootstrap-mpx* ) - bootstrap_target_libs=${bootstrap_target_libs}target-libmpx, - ;; - esac -fi - # Determine whether gdb needs tk/tcl or not. # Use 'maybe' since enable_gdbtk might be true even if tk isn't available # and in that case we want gdb to be built without tk. Ugh! |