This will resolve the duplicate symbols issue on OSX

This commit was SVN r665.

src/mpi/interface/f77/alloc_mem_f.c

@@ -19,7 +19,7 @@ LAM_GENERATE_F77_BINDINGS (PMPI_ALLOC_MEM,
                      pmpi_alloc_mem,
                      pmpi_alloc_mem_,
                      pmpi_alloc_mem__,
-                     mpi_alloc_mem_f,
+                     pmpi_alloc_mem_f,
                      (MPI_Fint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr), 
                      (size, info, baseptr, ierr))
 #endif

src/mpi/interface/f77/bindings.h

@@ -36,4 +36,8 @@
 #include "mpi/interface/f77/prototypes_mpi.h"
 #include "mpi/interface/f77/profile/prototypes_pmpi.h"
 
+#if LAM_PROFILE_LAYER && ! LAM_HAVE_WEAK_SYMBOLS
+#include "mpi/interface/f77/profile/defines.h"
+#endif
+
 #endif /* LAM_F77_BINDINGS_H */

src/mpi/interface/f77/comm_get_name_f.c

@@ -18,7 +18,7 @@ LAM_GENERATE_F77_BINDINGS (PMPI_COMM_GET_NAME,
         	pmpi_comm_get_name,
 	        pmpi_comm_get_name_,
 	        pmpi_comm_get_name__,
-	        mpi_comm_get_name_f,
+	        pmpi_comm_get_name_f,
 	        (MPI_Fint *comm, char *name, MPI_Fint *l, MPI_Fint *ierror, MPI_Fint charlen),
 	        (comm, name, l, ierror, charlen))
 #endif

src/mpi/interface/f77/comm_set_name_f.c

@@ -17,7 +17,7 @@ LAM_GENERATE_F77_BINDINGS (PMPI_COMM_SET_NAME,
             pmpi_comm_set_name,
             pmpi_comm_set_name_,
             pmpi_comm_set_name__,
-            mpi_comm_set_name_f,
+            pmpi_comm_set_name_f,
             (MPI_Fint *comm, char *name, MPI_Fint *ierror, MPI_Fint charlen),
             (comm, name, ierror, charlen))
 #endif

src/mpi/interface/f77/finalize_f.c

@@ -20,7 +20,7 @@ LAM_GENERATE_F77_BINDINGS (PMPI_FINALIZE,
             pmpi_finalize,
             pmpi_finalize_,
             pmpi_finalize__,
-            mpi_finalize_f,
+            pmpi_finalize_f,
             (MPI_Fint *ierror),
             (ierror))
 #endif

src/mpi/interface/f77/free_mem_f.c

@@ -20,7 +20,7 @@ LAM_GENERATE_F77_BINDINGS (PMPI_FREE_MEM,
         pmpi_free_mem,
         pmpi_free_mem_,
         pmpi_free_mem__,
-        mpi_free_mem_f,
+        pmpi_free_mem_f,
         (char *baseptr, MPI_Fint *ierr),
         (baseptr, ierr))
 #endif

src/mpi/interface/f77/init_f.c

@@ -20,7 +20,7 @@ LAM_GENERATE_F77_BINDINGS (PMPI_INIT,
         pmpi_init,
         pmpi_init_,
         pmpi_init__,
-        mpi_init_f,
+        pmpi_init_f,
         (MPI_Fint *ierror),
         (ierror))
 #endif

src/mpi/interface/f77/profile/defines.h

@@ -5,56 +5,11 @@
 #ifndef LAM_F77_PROFILE_DEFINES_H
 #define LAM_F77_PROFILE_DEFINES_H
 
-/*
- * This file makes a mapping from mpi_foo_f to the profiled version of
- * the proper fortran external symbol convention via 4 sets of
- * #define's.
- */
-
-/*
- * First, all caps.
- */
-#if LAM_F77_CAPS
-#define mpi_comm_set_name_f PMPI_COMM_SET_NAME
-#define mpi_comm_get_name_f PMPI_COMM_GET_NAME
-#define mpi_init_f PMPI_INIT
-#define mpi_finalize_f PMPI_FINALIZE
-#define mpi_alloc_mem_f PMPI_ALLOC_MEM
-#define mpi_free_mem_f PMPI_FREE_MEM
-
-/*
- * Second, all lower case.
- */
-#elif LAM_F77_PLAIN
-#define mpi_comm_set_name_f pmpi_comm_set_name
-#define mpi_comm_get_name_f pmpi_comm_get_name
-#define mpi_init_f pmpi_init
-#define mpi_finalize_f pmpi_finalize
-#define mpi_alloc_mem_f pmpi_alloc_mem
-#define mpi_free_mem_f pmpi_free_mem
-
-/*
- * Third, one trailing underscore.
- */
-#elif LAM_F77_SINGLE_UNDERSCORE
-#define mpi_comm_set_name_f pmpi_comm_set_name_
-#define mpi_comm_get_name_f pmpi_comm_get_name_
-#define mpi_init_f pmpi_init_
-#define mpi_finalize_f pmpi_finalize_
-#define mpi_alloc_mem_f pmpi_alloc_mem_
-#define mpi_free_mem_f pmpi_free_mem_
-
-/*
- * Fourth, two trailing underscores.
- */
-#elif LAM_F77_DOUBLE_UNDERSCORE
-#define mpi_comm_set_name_f pmpi_comm_set_name__
-#define mpi_comm_get_name_f pmpi_comm_get_name__
-#define mpi_init_f pmpi_init__
-#define mpi_finalize_f pmpi_finalize__
-#define mpi_alloc_mem_f pmpi_alloc_mem__
-#define mpi_free_mem_f pmpi_free_mem__
-
-#endif
+#define mpi_comm_set_name_f pmpi_comm_set_name_f
+#define mpi_comm_get_name_f pmpi_comm_get_name_f
+#define mpi_init_f pmpi_init_f
+#define mpi_finalize_f pmpi_finalize_f
+#define mpi_alloc_mem_f pmpi_alloc_mem_f
+#define mpi_free_mem_f pmpi_free_mem_f
 
 #endif /* LAM_F77_PROFILE_DEFINES_H */