Skip to content

Commit b57cbfa

Browse files
bosilcajsquyres
authored andcommitted
Import the Fortran part of 30eb36f
Signed-off-by: George Bosilca <gbosilca@nvidia.com>
1 parent ea73bad commit b57cbfa

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

config/ompi_fortran_check_ignore_tkr.m4

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dnl $HEADER$
2525
# Does this compiler support (void*)-like functionality for MPI choice
2626
# buffers? If so, which flavor?
2727
AC_DEFUN([OMPI_FORTRAN_CHECK_IGNORE_TKR], [
28-
OPAL_VAR_SCOPE_PUSH([result happy type predecl])
28+
OPAL_VAR_SCOPE_PUSH([result ignore_tkr_happy type predecl])
2929

3030
OMPI_FORTRAN_IGNORE_TKR_PREDECL=
3131
OMPI_FORTRAN_IGNORE_TKR_TYPE=
@@ -43,11 +43,11 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_IGNORE_TKR], [
4343
AS_VAR_COPY([result], [fortran_ignore_tkr_data])
4444

4545
# Parse the result
46-
happy=`echo $result | cut -d: -f1`
46+
ignore_tkr_happy=`echo $result | cut -d: -f1`
4747
type=`echo $result | cut -d: -f2`
4848
predecl=`echo $result | cut -d: -f3-`
4949

50-
AS_IF([test $happy -eq 1],
50+
AS_IF([test $ignore_tkr_happy -eq 1],
5151
[OMPI_FORTRAN_IGNORE_TKR_PREDECL=$predecl
5252
OMPI_FORTRAN_IGNORE_TKR_TYPE=$type
5353
$1],
@@ -60,7 +60,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_IGNORE_TKR], [
6060
################
6161

6262
AC_DEFUN([_OMPI_FORTRAN_CHECK_IGNORE_TKR], [
63-
OPAL_VAR_SCOPE_PUSH([happy ompi_fortran_ignore_tkr_predecl ompi_fortran_ignore_tkr_type])
63+
OPAL_VAR_SCOPE_PUSH([internal_ignore_tkr_happy ompi_fortran_ignore_tkr_predecl ompi_fortran_ignore_tkr_type])
6464

6565
# If we were called here, it means that the value was not cached,
6666
# so we need to check several different things. Since CACHE_CHECK
@@ -76,10 +76,10 @@ AC_DEFUN([_OMPI_FORTRAN_CHECK_IGNORE_TKR], [
7676
OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB(
7777
[!], [type(*)],
7878
[TYPE(*), DIMENSION(*)],
79-
[happy=1], [happy=0])
79+
[internal_ignore_tkr_happy=1], [internal_ignore_tkr_happy=0])
8080

8181
# GCC compilers
82-
AS_IF([test $happy -eq 0],
82+
AS_IF([test $internal_ignore_tkr_happy -eq 0],
8383
[OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB(
8484
[!GCC\$ ATTRIBUTES NO_ARG_CHECK ::], [type(*), dimension(*)],
8585
[!GCC\$ ATTRIBUTES NO_ARG_CHECK],
@@ -91,34 +91,34 @@ AC_DEFUN([_OMPI_FORTRAN_CHECK_IGNORE_TKR], [
9191
[!DIR\$ IGNORE_TKR],
9292
[internal_ignore_tkr_happy=1], [internal_ignore_tkr_happy=0])])
9393
# Intel compilers
94-
AS_IF([test $happy -eq 0],
94+
AS_IF([test $internal_ignore_tkr_happy -eq 0],
9595
[OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB(
9696
[!DEC\$ ATTRIBUTES NO_ARG_CHECK ::], [real, dimension(*)],
9797
[!DEC\$ ATTRIBUTES NO_ARG_CHECK],
98-
[happy=1], [happy=0])])
98+
[internal_ignore_tkr_happy=1], [internal_ignore_tkr_happy=0])])
9999
# Solaris Studio compilers
100100
# Note that due to a compiler bug, we have been advised by Oracle to
101101
# use the "character(*)" type
102-
AS_IF([test $happy -eq 0],
102+
AS_IF([test $internal_ignore_tkr_happy -eq 0],
103103
[OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB(
104104
[!\$PRAGMA IGNORE_TKR], [character(*)],
105105
[!\$PRAGMA IGNORE_TKR],
106-
[happy=1], [happy=0])])
106+
[internal_ignore_tkr_happy=1], [internal_ignore_tkr_happy=0])])
107107
# Cray compilers
108-
AS_IF([test $happy -eq 0],
108+
AS_IF([test $internal_ignore_tkr_happy -eq 0],
109109
[OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB(
110110
[!DIR\$ IGNORE_TKR], [real, dimension(*)],
111111
[!DIR\$ IGNORE_TKR],
112-
[happy=1], [happy=0])])
112+
[internal_ignore_tkr_happy=1], [internal_ignore_tkr_happy=0])])
113113
# IBM compilers
114-
AS_IF([test $happy -eq 0],
114+
AS_IF([test $internal_ignore_tkr_happy -eq 0],
115115
[OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB(
116116
[!IBM* IGNORE_TKR], [real, dimension(*)],
117117
[!IBM* IGNORE_TKR],
118-
[happy=1], [happy=0])])
118+
[internal_ignore_tkr_happy=1], [internal_ignore_tkr_happy=0])])
119119

120120
AS_VAR_SET(fortran_ignore_tkr_data,
121-
[${happy}:${ompi_fortran_ignore_tkr_type}:${ompi_fortran_ignore_tkr_predecl}])
121+
[${internal_ignore_tkr_happy}:${ompi_fortran_ignore_tkr_type}:${ompi_fortran_ignore_tkr_predecl}])
122122

123123
# Now put the original CACHE_CHECK MSG_CHECKING back so that it can
124124
# output the MSG_RESULT.
@@ -150,7 +150,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB], [
150150
end subroutine force_assumed_shape
151151
end interface
152152

153-
interface foo
153+
interface
154154
subroutine foo(buffer, count)
155155
$1 buffer
156156
$2, intent(in) :: buffer

0 commit comments

Comments
 (0)