Skip to content

Commit 51e23f8

Browse files
committed
fortran/use-mpi-f08: remove bind(C) constants.
Remove unused bind(C) constants in ompi/mpi/fortran/use-mpi-f08/constants.{c,h} (and break ABI compatibility). Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent df6d763 commit 51e23f8

File tree

5 files changed

+2
-339
lines changed

5 files changed

+2
-339
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ ompi/mpi/fortran/mpif-h/profile/p*.c
214214
ompi/mpi/fortran/mpif-h/profile/psizeof_f.f90
215215

216216
ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-constants.h
217-
ompi/mpi/fortran/use-mpi-f08/constants.h
218217
ompi/mpi/fortran/use-mpi-f08/sizeof_f08.f90
219218
ompi/mpi/fortran/use-mpi-f08/sizeof_f08.h
220219
ompi/mpi/fortran/use-mpi-f08/profile/psizeof_f08.f90

ompi/include/mpif-values.pl

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -469,65 +469,7 @@ sub write_fortran_file {
469469

470470
# Create preprocessor files
471471

472-
my $output = '/* WARNING! THIS IS A GENERATED FILE!!
473-
* ANY EDITS YOU PUT HERE WILL BE LOST!
474-
* Instead, edit topdir/ompi/include/mpif-values.pl
475-
*/
476-
477-
/*
478-
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
479-
* University Research and Technology
480-
* Corporation. All rights reserved.
481-
* Copyright (c) 2004-2006 The University of Tennessee and The University
482-
* of Tennessee Research Foundation. All rights
483-
* reserved.
484-
* Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
485-
* University of Stuttgart. All rights reserved.
486-
* Copyright (c) 2004-2005 The Regents of the University of California.
487-
* All rights reserved.
488-
* Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved.
489-
* Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
490-
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
491-
* Copyright (c) 2009-2012 Los Alamos National Security, LLC.
492-
* All rights reserved.
493-
* Copyright (c) 2016 Research Organization for Information Science
494-
* and Technology (RIST). All rights reserved.
495-
* $COPYRIGHT$
496-
*
497-
* Additional copyrights may follow
498-
*
499-
* $HEADER$
500-
*/
501-
502-
#ifndef USE_MPI_F08_CONSTANTS_H
503-
#define USE_MPI_F08_CONSTANTS_H
504-
505-
';
506-
507-
foreach my $key (sort(keys(%{$constants}))) {
508-
$output .= "#define OMPI_$key $constants->{$key}\n";
509-
}
510-
$output .= "\n";
511-
foreach my $key (sort(keys(%{$handles}))) {
512-
$output .= "#define OMPI_$key $handles->{$key}\n";
513-
}
514-
515-
foreach my $key (sort(keys(%{$io_constants}))) {
516-
$output .= "#define OMPI_$key $io_constants->{$key}\n";
517-
}
518-
foreach my $key (sort(keys(%{$lio_constants}))) {
519-
$output .= "#define OMPI_$key $lio_constants->{$key}\n";
520-
}
521-
$output .= "\n";
522-
foreach my $key (sort(keys(%{$io_handles}))) {
523-
$output .= "#define OMPI_$key $io_handles->{$key}\n";
524-
}
525-
$output .= "\n";
526-
$output .= "#endif /* USE_MPI_F08_CONSTANTS_H */\n";
527-
528-
write_file("$topdir/ompi/mpi/fortran/use-mpi-f08/constants.h", $output);
529-
530-
$output = '! WARNING! THIS IS A GENERATED FILE!!
472+
my $output = '! WARNING! THIS IS A GENERATED FILE!!
531473
! ANY EDITS YOU PUT HERE WILL BE LOST!
532474
! Instead, edit topdir/ompi/include/mpif-values.pl
533475
!

ompi/mpi/fortran/common_sym_whitelist.txt

Lines changed: 0 additions & 113 deletions
This file was deleted.

ompi/mpi/fortran/use-mpi-f08/Makefile.am

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -802,9 +802,7 @@ lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES = \
802802
$(mpi_api_files) \
803803
$(pmpi_api_files) \
804804
mpi-f08.F90 \
805-
buffer_detach.c \
806-
constants.h \
807-
constants.c
805+
buffer_detach.c
808806

809807
# These are generated; do not ship them
810808
nodist_lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES =

0 commit comments

Comments
 (0)