Skip to content

Commit a948e27

Browse files
authored
Merge pull request #12514 from janjust/v5.0.x
V5.0.x: configury: add support for LLVM 19
2 parents 89c287a + a9c964e commit a948e27

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

config/ompi_fortran_check_asynchronous.m4

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
14+
dnl Copyright (c) 2024 Research Organization for Information Science
15+
dnl and Technology (RIST). All rights reserved.
1416
dnl $COPYRIGHT$
1517
dnl
1618
dnl Additional copyrights may follow
@@ -35,6 +37,10 @@ SUBROUTINE binky(buf)
3537
REAL, DIMENSION(*), ASYNCHRONOUS :: buf
3638
END SUBROUTINE
3739
END INTERFACE
40+
CONTAINS
41+
SUBROUTINE wookie(buf)
42+
REAL, DIMENSION(*), ASYNCHRONOUS :: buf
43+
END SUBROUTINE
3844
END MODULE asynch_mod]])],
3945
[AS_VAR_SET(asynchronous_var, yes)],
4046
[AS_VAR_SET(asynchronous_var, no)])

config/ompi_fortran_check_ignore_tkr.m4

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ dnl Copyright (c) 2007 Los Alamos National Security, LLC. All rights
1414
dnl reserved.
1515
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
1616
dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
17+
dnl Copyright (c) 2024 Research Organization for Information Science
18+
dnl and Technology (RIST). All rights reserved.
1719
dnl $COPYRIGHT$
1820
dnl
1921
dnl Additional copyrights may follow
@@ -82,6 +84,12 @@ AC_DEFUN([_OMPI_FORTRAN_CHECK_IGNORE_TKR], [
8284
[!GCC\$ ATTRIBUTES NO_ARG_CHECK ::], [type(*), dimension(*)],
8385
[!GCC\$ ATTRIBUTES NO_ARG_CHECK],
8486
[internal_ignore_tkr_happy=1], [internal_ignore_tkr_happy=0])])
87+
# LLVM compilers
88+
AS_IF([test $internal_ignore_tkr_happy -eq 0],
89+
[OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB(
90+
[!DIR\$ IGNORE_TKR], [type(*)],
91+
[!DIR\$ IGNORE_TKR],
92+
[internal_ignore_tkr_happy=1], [internal_ignore_tkr_happy=0])])
8593
# Intel compilers
8694
AS_IF([test $internal_ignore_tkr_happy -eq 0],
8795
[OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB(
@@ -133,6 +141,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB], [
133141
AC_MSG_CHECKING([for Fortran compiler support of $3])
134142
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[[!
135143
! Autoconf puts "program main" at the top
144+
implicit none
136145

137146
interface
138147
subroutine force_assumed_shape(a, count)
@@ -157,6 +166,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB], [
157166
complex, pointer, dimension(:,:) :: ptr
158167
target :: buffer3
159168
integer :: buffer4
169+
integer :: a
160170
ptr => buffer3
161171

162172
! Set some known values (somewhat irrelevant for this test, but just be
@@ -189,8 +199,23 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_IGNORE_TKR_SUB], [
189199
call foo(a, count)
190200
end subroutine force_assumed_shape
191201

202+
module check_ignore_tkr
203+
interface
204+
subroutine foobar(buffer, count)
205+
$1 buffer
206+
$2, intent(in) :: buffer
207+
integer, intent(in) :: count
208+
end subroutine foobar
209+
end interface
210+
end module
211+
212+
subroutine bar(var)
213+
use check_ignore_tkr
214+
implicit none
215+
real, intent(inout) :: var(:, :, :)
216+
217+
call foobar(var(1,1,1), 1)
192218
! Autoconf puts "end" after the last line
193-
subroutine bogus
194219
]]),
195220
[msg=yes
196221
ompi_fortran_ignore_tkr_predecl="$1"

0 commit comments

Comments
 (0)