diff --git a/config/ompi_fortran_check_protected.m4 b/config/ompi_fortran_check_protected.m4 deleted file mode 100644 index effdcd9057..0000000000 --- a/config/ompi_fortran_check_protected.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl -*- shell-script -*- -dnl -dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -dnl University Research and Technology -dnl Corporation. All rights reserved. -dnl Copyright (c) 2004-2005 The University of Tennessee and The University -dnl of Tennessee Research Foundation. All rights -dnl reserved. -dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -dnl University of Stuttgart. All rights reserved. -dnl Copyright (c) 2004-2005 The Regents of the University of California. -dnl All rights reserved. -dnl Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved. -dnl $COPYRIGHT$ -dnl -dnl Additional copyrights may follow -dnl -dnl $HEADER$ -dnl - -# Check whether or not the Fortran compiler supports the "protected" -# keyword in derived types or not. - -# OMPI_FORTRAN_CHECK_PROTECTED([action if found], -# [action if not found]) -# ---------------------------------------------------- -AC_DEFUN([OMPI_FORTRAN_CHECK_PROTECTED],[ - AS_VAR_PUSHDEF([protected_var], [ompi_cv_fortran_protected]) - - AC_CACHE_CHECK([if Fortran compiler supports PROTECTED], protected_var, - [AC_LANG_PUSH([Fortran]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[module test_for_protected - integer, protected :: bogus -end module test_for_protected]])], - [AS_VAR_SET(protected_var, yes)], - [AS_VAR_SET(protected_var, no)]) - touch conftest_foo.mod - rm -rf *.mod 2>/dev/null - AC_LANG_POP([Fortran]) - ]) - - AS_VAR_IF(protected_var, [yes], [$1], [$2]) - AS_VAR_POPDEF([protected_var])dnl -]) diff --git a/config/ompi_setup_mpi_fortran.m4 b/config/ompi_setup_mpi_fortran.m4 index 8f6b6f2be0..dc42c92326 100644 --- a/config/ompi_setup_mpi_fortran.m4 +++ b/config/ompi_setup_mpi_fortran.m4 @@ -15,8 +15,8 @@ dnl Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights dnl reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. -dnl Copyright (c) 2014-2017 Research Organization for Information Science -dnl and Technology (RIST). All rights reserved. +dnl Copyright (c) 2014-2019 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl Copyright (c) 2016 IBM Corporation. All rights reserved. dnl Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. dnl $COPYRIGHT$ @@ -487,14 +487,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ [OMPI_FORTRAN_HAVE_PRIVATE=1], [OMPI_FORTRAN_HAVE_PRIVATE=0])]) - OMPI_FORTRAN_HAVE_PROTECTED=0 - AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \ - test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS], - [ # Does the compiler support "protected" - OMPI_FORTRAN_CHECK_PROTECTED( - [OMPI_FORTRAN_HAVE_PROTECTED=1], - [OMPI_FORTRAN_HAVE_PROTECTED=0])]) - OMPI_FORTRAN_HAVE_ABSTRACT=0 AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \ test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS], @@ -754,12 +746,6 @@ end type test_mpi_handle], [$OMPI_FORTRAN_HAVE_PRIVATE], [For mpi-f08-types.f90 and ompi_info: whether the compiler supports the "private" keyword or not (used in MPI_Status)]) - # For configure-fortran-output.h, mpi-f08-types.F90 (and ompi_info) - AC_SUBST([OMPI_FORTRAN_HAVE_PROTECTED]) - AC_DEFINE_UNQUOTED([OMPI_FORTRAN_HAVE_PROTECTED], - [$OMPI_FORTRAN_HAVE_PROTECTED], - [For mpi-f08-types.f90 and .F90 and ompi_info: whether the compiler supports the "protected" keyword or not]) - # For configure-fortran-output.h, mpi-f08-interfaces-callbacks.F90 # (and ompi_info) AC_SUBST([OMPI_FORTRAN_HAVE_ABSTRACT]) diff --git a/ompi/mpi/fortran/configure-fortran-output-bottom.h b/ompi/mpi/fortran/configure-fortran-output-bottom.h index 895f0496d7..c5288dac92 100644 --- a/ompi/mpi/fortran/configure-fortran-output-bottom.h +++ b/ompi/mpi/fortran/configure-fortran-output-bottom.h @@ -38,11 +38,4 @@ #define OMPI_PRIVATE #endif -! PROTECTED or not -#if OMPI_FORTRAN_HAVE_PROTECTED -#define OMPI_PROTECTED , PROTECTED -#else -#define OMPI_PROTECTED -#endif - #endif diff --git a/ompi/tools/ompi_info/param.c b/ompi/tools/ompi_info/param.c index 18122fae02..2b7b5bc100 100644 --- a/ompi/tools/ompi_info/param.c +++ b/ompi/tools/ompi_info/param.c @@ -11,8 +11,8 @@ * All rights reserved. * Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. - * Copyright (c) 2014-2017 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2014-2019 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. @@ -199,7 +199,6 @@ void ompi_info_do_config(bool want_all) fortran_have_bind_c_type_name = OMPI_FORTRAN_HAVE_BIND_C_TYPE_NAME ? "yes" : "no"; fortran_have_private = OMPI_FORTRAN_HAVE_PRIVATE ? "yes" : "no"; - fortran_have_protected = OMPI_FORTRAN_HAVE_PROTECTED ? "yes" : "no"; fortran_have_abstract = OMPI_FORTRAN_HAVE_ABSTRACT ? "yes" : "no"; fortran_have_asynchronous = OMPI_FORTRAN_HAVE_ASYNCHRONOUS ? "yes" : "no"; fortran_have_procedure = OMPI_FORTRAN_HAVE_PROCEDURE ? "yes" : "no"; @@ -443,9 +442,6 @@ void ompi_info_do_config(bool want_all) opal_info_out("Fort PRIVATE", "compiler:fortran:private", fortran_have_private); - opal_info_out("Fort PROTECTED", - "compiler:fortran:protected", - fortran_have_protected); opal_info_out("Fort ABSTRACT", "compiler:fortran:abstract", fortran_have_abstract);