fortran/mpif-h: invoke the C PMPI_* subroutines instead of the MPI_* ones

when profiling is built. This prevents Fortran subroutines from being wrapped twice by third party tools (e.g. once in Fortran and once in C) see discussion starting at http://www.open-mpi.org/community/lists/devel/2015/08/17842.php
2015-09-09 16:30:26 +09:00 · 2015-09-09 16:30:26 +09:00 · 16d65a2762
--- a/ompi/mpi/c/Makefile.am
+++ b/ompi/mpi/c/Makefile.am
@ -15,6 +15,8 @@
 # Copyright (c) 2012-2013 Inria.  All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC. All rights
 #                         reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@ -24,15 +26,11 @@

 SUBDIRS = profile

-#
-# OMPI_PRPOFILING_DEFINES flag s enabled when we want our MPI_* symbols
-# to be replaced by PMPI_*. In other words, this flag decides
-# whether "profile/defines.h" is included or not. "profile/defines.h"
-# replaces all MPI_* symbols with PMPI_* symbols. In this directory,
-# we need it to be 0
-#
+# if OMPI_BUILD_MPI_PROFILING is enabled when we want our generated MPI_* symbols
+# to be replaced by PMPI_*.
+# In this directory, we need it to be 0

-AM_CPPFLAGS     = -DOMPI_PROFILING_DEFINES=0
+AM_CPPFLAGS     = -DOMPI_BUILD_MPI_PROFILING=0

 #
 # The top directory always builds MPI_* bindings. The bottom directory
--- a/ompi/mpi/c/abort.c
+++ b/ompi/mpi/c/abort.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007-2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/memchecker.h"
 #include "ompi/communicator/communicator.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Abort = PMPI_Abort
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Abort PMPI_Abort
 #endif

 static const char FUNC_NAME[] = "MPI_Abort";
--- a/ompi/mpi/c/accumulate.c
+++ b/ompi/mpi/c/accumulate.c
@ -34,12 +34,12 @@
 #include "ompi/datatype/ompi_datatype_internal.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Accumulate = PMPI_Accumulate
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Accumulate PMPI_Accumulate
 #endif

 static const char FUNC_NAME[] = "MPI_Accumulate";
--- a/ompi/mpi/c/add_error_class.c
+++ b/ompi/mpi/c/add_error_class.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      University of Houston. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/attribute/attribute.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Add_error_class = PMPI_Add_error_class
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Add_error_class PMPI_Add_error_class
 #endif

 static const char FUNC_NAME[] = "MPI_Add_error_class";
--- a/ompi/mpi/c/add_error_code.c
+++ b/ompi/mpi/c/add_error_code.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      University of Houston. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/errhandler/errcode.h"
 #include "ompi/attribute/attribute.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Add_error_code = PMPI_Add_error_code
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Add_error_code PMPI_Add_error_code
 #endif

 static const char FUNC_NAME[] = "MPI_Add_error_code";
--- a/ompi/mpi/c/add_error_string.c
+++ b/ompi/mpi/c/add_error_string.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      University of Houston. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Add_error_string = PMPI_Add_error_string
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Add_error_string PMPI_Add_error_string
 #endif

 static const char FUNC_NAME[] = "MPI_Add_error_string";
--- a/ompi/mpi/c/address.c
+++ b/ompi/mpi/c/address.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Address = PMPI_Address
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Address PMPI_Address
 #endif

 static const char FUNC_NAME[] = "MPI_Address";
--- a/ompi/mpi/c/allgather.c
+++ b/ompi/mpi/c/allgather.c
@ -33,12 +33,12 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Allgather = PMPI_Allgather
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Allgather PMPI_Allgather
 #endif

 static const char FUNC_NAME[] = "MPI_Allgather";
--- a/ompi/mpi/c/allgatherv.c
+++ b/ompi/mpi/c/allgatherv.c
@ -33,12 +33,12 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Allgatherv = PMPI_Allgatherv
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Allgatherv PMPI_Allgatherv
 #endif

 static const char FUNC_NAME[] = "MPI_Allgatherv";
--- a/ompi/mpi/c/alloc_mem.c
+++ b/ompi/mpi/c/alloc_mem.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -29,12 +31,12 @@
 #include "ompi/info/info.h"
 #include "opal/mca/mpool/mpool.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Alloc_mem = PMPI_Alloc_mem
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Alloc_mem PMPI_Alloc_mem
 #endif

 static const char FUNC_NAME[] = "MPI_Alloc_mem";
--- a/ompi/mpi/c/allreduce.c
+++ b/ompi/mpi/c/allreduce.c
@ -32,12 +32,12 @@
 #include "ompi/op/op.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Allreduce = PMPI_Allreduce
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Allreduce PMPI_Allreduce
 #endif

 static const char FUNC_NAME[] = "MPI_Allreduce";
--- a/ompi/mpi/c/alltoall.c
+++ b/ompi/mpi/c/alltoall.c
@ -32,12 +32,12 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Alltoall = PMPI_Alltoall
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Alltoall PMPI_Alltoall
 #endif

 static const char FUNC_NAME[] = "MPI_Alltoall";
--- a/ompi/mpi/c/alltoallv.c
+++ b/ompi/mpi/c/alltoallv.c
@ -32,12 +32,12 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Alltoallv = PMPI_Alltoallv
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Alltoallv PMPI_Alltoallv
 #endif

 static const char FUNC_NAME[] = "MPI_Alltoallv";
--- a/ompi/mpi/c/alltoallw.c
+++ b/ompi/mpi/c/alltoallw.c
@ -32,12 +32,12 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Alltoallw = PMPI_Alltoallw
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Alltoallw PMPI_Alltoallw
 #endif

 static const char FUNC_NAME[] = "MPI_Alltoallw";
--- a/ompi/mpi/c/attr_delete.c
+++ b/ompi/mpi/c/attr_delete.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -27,12 +29,12 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Attr_delete = PMPI_Attr_delete
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Attr_delete PMPI_Attr_delete
 #endif

 static const char FUNC_NAME[] = "MPI_Attr_delete";
--- a/ompi/mpi/c/attr_get.c
+++ b/ompi/mpi/c/attr_get.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Attr_get = PMPI_Attr_get
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Attr_get PMPI_Attr_get
 #endif

 static const char FUNC_NAME[] = "MPI_Attr_get";
--- a/ompi/mpi/c/attr_put.c
+++ b/ompi/mpi/c/attr_put.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -27,12 +29,12 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Attr_put = PMPI_Attr_put
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Attr_put PMPI_Attr_put
 #endif

 static const char FUNC_NAME[] = "MPI_Attr_put";
--- a/ompi/mpi/c/barrier.c
+++ b/ompi/mpi/c/barrier.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Barrier = PMPI_Barrier
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Barrier PMPI_Barrier
 #endif

 static const char FUNC_NAME[] = "MPI_Barrier";
--- a/ompi/mpi/c/bcast.c
+++ b/ompi/mpi/c/bcast.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/datatype/ompi_datatype.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Bcast = PMPI_Bcast
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Bcast PMPI_Bcast
 #endif

 static const char FUNC_NAME[] = "MPI_Bcast";
--- a/ompi/mpi/c/bsend.c
+++ b/ompi/mpi/c/bsend.c
@ -32,12 +32,12 @@
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Bsend = PMPI_Bsend
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Bsend PMPI_Bsend
 #endif

 static const char FUNC_NAME[] = "MPI_Bsend";
--- a/ompi/mpi/c/bsend_init.c
+++ b/ompi/mpi/c/bsend_init.c
@ -32,12 +32,12 @@
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Bsend_init = PMPI_Bsend_init
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Bsend_init PMPI_Bsend_init
 #endif

 static const char FUNC_NAME[] = "MPI_Bsend_init";
--- a/ompi/mpi/c/buffer_attach.c
+++ b/ompi/mpi/c/buffer_attach.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Buffer_attach = PMPI_Buffer_attach
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Buffer_attach PMPI_Buffer_attach
 #endif

 static const char FUNC_NAME[] = "MPI_Buffer_attach";
--- a/ompi/mpi/c/buffer_detach.c
+++ b/ompi/mpi/c/buffer_detach.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Buffer_detach = PMPI_Buffer_detach
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Buffer_detach PMPI_Buffer_detach
 #endif

 static const char FUNC_NAME[] = "MPI_Buffer_detach";
--- a/ompi/mpi/c/cancel.c
+++ b/ompi/mpi/c/cancel.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -27,12 +29,12 @@
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Cancel = PMPI_Cancel
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cancel PMPI_Cancel
 #endif

 static const char FUNC_NAME[] = "MPI_Cancel";
--- a/ompi/mpi/c/cart_coords.c
+++ b/ompi/mpi/c/cart_coords.c
@ -12,6 +12,8 @@
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * Copyright (c) 2012-2013 Inria.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -29,12 +31,12 @@
 #include "ompi/group/group.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Cart_coords = PMPI_Cart_coords
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_coords PMPI_Cart_coords
 #endif

 static const char FUNC_NAME[] = "MPI_Cart_coords";
--- a/ompi/mpi/c/cart_create.c
+++ b/ompi/mpi/c/cart_create.c
@ -32,12 +32,12 @@
 #include "ompi/mca/topo/base/base.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Cart_create = PMPI_Cart_create
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_create PMPI_Cart_create
 #endif

 static const char FUNC_NAME[] = "MPI_Cart_create";
--- a/ompi/mpi/c/cart_get.c
+++ b/ompi/mpi/c/cart_get.c
@ -12,6 +12,8 @@
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2012      Los Alamos Nat Security, LLC. All rights reserved.
 * Copyright (c) 2012-2013 Inria.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -28,12 +30,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Cart_get = PMPI_Cart_get
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_get PMPI_Cart_get
 #endif

 static const char FUNC_NAME[] = "MPI_Cart_get";
--- a/ompi/mpi/c/cart_map.c
+++ b/ompi/mpi/c/cart_map.c
@ -32,12 +32,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Cart_map = PMPI_Cart_map
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_map PMPI_Cart_map
 #endif

 static const char FUNC_NAME[] = "MPI_Cart_map";
--- a/ompi/mpi/c/cart_rank.c
+++ b/ompi/mpi/c/cart_rank.c
@ -32,12 +32,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Cart_rank = PMPI_Cart_rank
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_rank PMPI_Cart_rank
 #endif

 static const char FUNC_NAME[] = "MPI_Cart_rank";
--- a/ompi/mpi/c/cart_shift.c
+++ b/ompi/mpi/c/cart_shift.c
@ -11,6 +11,8 @@
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2012-2013 Inria.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -27,12 +29,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Cart_shift = PMPI_Cart_shift
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_shift PMPI_Cart_shift
 #endif

 static const char FUNC_NAME[] = "MPI_Cart_shift";
--- a/ompi/mpi/c/cart_sub.c
+++ b/ompi/mpi/c/cart_sub.c
@ -32,12 +32,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Cart_sub = PMPI_Cart_sub
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cart_sub PMPI_Cart_sub
 #endif

 static const char FUNC_NAME[] = "MPI_Cart_sub";
--- a/ompi/mpi/c/cartdim_get.c
+++ b/ompi/mpi/c/cartdim_get.c
@ -11,6 +11,8 @@
 *                         All rights reserved.
 * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2012-2013 Inria.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -27,12 +29,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Cartdim_get = PMPI_Cartdim_get
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Cartdim_get PMPI_Cartdim_get
 #endif


--- a/ompi/mpi/c/close_port.c
+++ b/ompi/mpi/c/close_port.c
@ -13,6 +13,8 @@
 * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights
 *                         reserved.
 * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -29,12 +31,12 @@
 #include "ompi/dpm/dpm.h"


-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Close_port = PMPI_Close_port
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Close_port PMPI_Close_port
 #endif

 static const char FUNC_NAME[] = "MPI_Close_port";
--- a/ompi/mpi/c/comm_accept.c
+++ b/ompi/mpi/c/comm_accept.c
@ -15,6 +15,8 @@
 * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights
 *                         reserved.
 * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -32,12 +34,12 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_accept = PMPI_Comm_accept
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_accept PMPI_Comm_accept
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_accept";
--- a/ompi/mpi/c/comm_c2f.c
+++ b/ompi/mpi/c/comm_c2f.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_c2f = PMPI_Comm_c2f
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_c2f PMPI_Comm_c2f
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_c2f";
--- a/ompi/mpi/c/comm_call_errhandler.c
+++ b/ompi/mpi/c/comm_call_errhandler.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_call_errhandler = PMPI_Comm_call_errhandler
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_call_errhandler PMPI_Comm_call_errhandler
 #endif


--- a/ompi/mpi/c/comm_compare.c
+++ b/ompi/mpi/c/comm_compare.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_compare = PMPI_Comm_compare
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_compare PMPI_Comm_compare
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_compare";
--- a/ompi/mpi/c/comm_connect.c
+++ b/ompi/mpi/c/comm_connect.c
@ -15,6 +15,8 @@
 * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
 *                         reserved.
 * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -32,12 +34,12 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_connect = PMPI_Comm_connect
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_connect PMPI_Comm_connect
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_connect";
--- a/ompi/mpi/c/comm_create.c
+++ b/ompi/mpi/c/comm_create.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2008 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006-2007 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_create = PMPI_Comm_create
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_create PMPI_Comm_create
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_create";
--- a/ompi/mpi/c/comm_create_errhandler.c
+++ b/ompi/mpi/c/comm_create_errhandler.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_create_errhandler = PMPI_Comm_create_errhandler
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler
 #endif


--- a/ompi/mpi/c/comm_create_group.c
+++ b/ompi/mpi/c/comm_create_group.c
@ -13,6 +13,8 @@
 * Copyright (c) 2006-2007 Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
 *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -29,12 +31,12 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_create_group = PMPI_Comm_create_group
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_create_group PMPI_Comm_create_group
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_create_group";
--- a/ompi/mpi/c/comm_create_keyval.c
+++ b/ompi/mpi/c/comm_create_keyval.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/attribute/attribute.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_create_keyval = PMPI_Comm_create_keyval
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_create_keyval PMPI_Comm_create_keyval
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_create_keyval";
--- a/ompi/mpi/c/comm_delete_attr.c
+++ b/ompi/mpi/c/comm_delete_attr.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_delete_attr = PMPI_Comm_delete_attr
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_delete_attr PMPI_Comm_delete_attr
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_delete_attr";
--- a/ompi/mpi/c/comm_disconnect.c
+++ b/ompi/mpi/c/comm_disconnect.c
@ -11,6 +11,8 @@
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_disconnect = PMPI_Comm_disconnect
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_disconnect PMPI_Comm_disconnect
 #endif

 #include "ompi/dpm/dpm.h"
--- a/ompi/mpi/c/comm_dup.c
+++ b/ompi/mpi/c/comm_dup.c
@ -11,6 +11,8 @@
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2006-2008 University of Houston.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_dup = PMPI_Comm_dup
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_dup PMPI_Comm_dup
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_dup";
--- a/ompi/mpi/c/comm_dup_with_info.c
+++ b/ompi/mpi/c/comm_dup_with_info.c
@ -14,6 +14,8 @@
 * Copyright (c) 2006-2008 University of Houston.  All rights reserved.
 * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
 *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -29,12 +31,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_dup_with_info = PMPI_Comm_dup_with_info
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_dup_with_info PMPI_Comm_dup_with_info
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_dup_with_info";
--- a/ompi/mpi/c/comm_f2c.c
+++ b/ompi/mpi/c/comm_f2c.c
@ -11,6 +11,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/mpi/fortran/base/fint_2_int.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_f2c = PMPI_Comm_f2c
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_f2c PMPI_Comm_f2c
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_f2c";
--- a/ompi/mpi/c/comm_free.c
+++ b/ompi/mpi/c/comm_free.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_free = PMPI_Comm_free
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_free PMPI_Comm_free
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_free";
--- a/ompi/mpi/c/comm_free_keyval.c
+++ b/ompi/mpi/c/comm_free_keyval.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/attribute/attribute.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_free_keyval = PMPI_Comm_free_keyval
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_free_keyval PMPI_Comm_free_keyval
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_free_keyval";
--- a/ompi/mpi/c/comm_get_attr.c
+++ b/ompi/mpi/c/comm_get_attr.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_get_attr = PMPI_Comm_get_attr
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_attr PMPI_Comm_get_attr
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_get_attr";
--- a/ompi/mpi/c/comm_get_errhandler.c
+++ b/ompi/mpi/c/comm_get_errhandler.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_get_errhandler = PMPI_Comm_get_errhandler
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler
 #endif


--- a/ompi/mpi/c/comm_get_info.c
+++ b/ompi/mpi/c/comm_get_info.c
@ -1,6 +1,8 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
 * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -18,12 +20,12 @@
 #include <stdlib.h>
 #include <string.h>

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_get_info = PMPI_Comm_get_info
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_info PMPI_Comm_get_info
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_get_info";
--- a/ompi/mpi/c/comm_get_name.c
+++ b/ompi/mpi/c/comm_get_name.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -29,12 +31,12 @@
 #include "opal/threads/mutex.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_get_name = PMPI_Comm_get_name
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_name PMPI_Comm_get_name
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_get_name";
--- a/ompi/mpi/c/comm_get_parent.c
+++ b/ompi/mpi/c/comm_get_parent.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -23,12 +25,12 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_get_parent = PMPI_Comm_get_parent
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_get_parent PMPI_Comm_get_parent
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_get_parent";
--- a/ompi/mpi/c/comm_group.c
+++ b/ompi/mpi/c/comm_group.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_group = PMPI_Comm_group
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_group PMPI_Comm_group
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_group";
--- a/ompi/mpi/c/comm_idup.c
+++ b/ompi/mpi/c/comm_idup.c
@ -14,6 +14,8 @@
 * Copyright (c) 2006-2008 University of Houston.  All rights reserved.
 * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights
 *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -29,12 +31,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_idup = PMPI_Comm_idup
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_idup PMPI_Comm_idup
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_idup";
--- a/ompi/mpi/c/comm_join.c
+++ b/ompi/mpi/c/comm_join.c
@ -11,6 +11,8 @@
 *                         All rights reserved.
 * Copyright (c) 2012      Los Alamos National Security, LLC.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -41,12 +43,12 @@
 #include "ompi/dpm/dpm.h"


-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_join = PMPI_Comm_join
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_join PMPI_Comm_join
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_join";
--- a/ompi/mpi/c/comm_rank.c
+++ b/ompi/mpi/c/comm_rank.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_rank = PMPI_Comm_rank
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_rank PMPI_Comm_rank
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_rank";
--- a/ompi/mpi/c/comm_remote_group.c
+++ b/ompi/mpi/c/comm_remote_group.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_remote_group = PMPI_Comm_remote_group
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_remote_group PMPI_Comm_remote_group
 #endif


--- a/ompi/mpi/c/comm_remote_size.c
+++ b/ompi/mpi/c/comm_remote_size.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_remote_size = PMPI_Comm_remote_size
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_remote_size PMPI_Comm_remote_size
 #endif


--- a/ompi/mpi/c/comm_set_attr.c
+++ b/ompi/mpi/c/comm_set_attr.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/attribute/attribute.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_set_attr = PMPI_Comm_set_attr
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_set_attr PMPI_Comm_set_attr
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_set_attr";
--- a/ompi/mpi/c/comm_set_errhandler.c
+++ b/ompi/mpi/c/comm_set_errhandler.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_set_errhandler = PMPI_Comm_set_errhandler
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_set_errhandler";
--- a/ompi/mpi/c/comm_set_info.c
+++ b/ompi/mpi/c/comm_set_info.c
@ -1,6 +1,8 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
 * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -18,12 +20,12 @@
 #include <stdlib.h>
 #include <string.h>

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_set_info = PMPI_Comm_set_info
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_set_info PMPI_Comm_set_info
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_set_info";
--- a/ompi/mpi/c/comm_set_name.c
+++ b/ompi/mpi/c/comm_set_name.c
@ -13,6 +13,8 @@
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2012-2013 Los Alamos National Security, LLC.  All rights
 *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -31,12 +33,12 @@
 #include "ompi/totalview.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_set_name = PMPI_Comm_set_name
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_set_name PMPI_Comm_set_name
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_set_name";
@ -74,8 +76,8 @@ int MPI_Comm_set_name(MPI_Comm comm, const char *name)
  ++ompi_tv_comm_sequence_number;
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_set_name PMPI_Comm_set_name
 #endif
   OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
 }
--- a/ompi/mpi/c/comm_size.c
+++ b/ompi/mpi/c/comm_size.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -27,12 +29,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_size = PMPI_Comm_size
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_size PMPI_Comm_size
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_size";
--- a/ompi/mpi/c/comm_spawn.c
+++ b/ompi/mpi/c/comm_spawn.c
@ -15,6 +15,8 @@
 * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights
 *                         reserved.
 * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -32,12 +34,12 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_spawn = PMPI_Comm_spawn
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_spawn PMPI_Comm_spawn
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_spawn";
--- a/ompi/mpi/c/comm_spawn_multiple.c
+++ b/ompi/mpi/c/comm_spawn_multiple.c
@ -15,6 +15,8 @@
 * Copyright (c) 2012-2013 Los Alamos National Security, LLC.  All rights
 *                         reserved.
 * Copyright (c) 2015      Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -32,12 +34,12 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_spawn_multiple = PMPI_Comm_spawn_multiple
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_spawn_multiple PMPI_Comm_spawn_multiple
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_spawn_multiple";
--- a/ompi/mpi/c/comm_split.c
+++ b/ompi/mpi/c/comm_split.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_split = PMPI_Comm_split
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_split PMPI_Comm_split
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_split";
--- a/ompi/mpi/c/comm_split_type.c
+++ b/ompi/mpi/c/comm_split_type.c
@ -11,6 +11,8 @@
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2012      Sandia National Laboratories. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -28,12 +30,12 @@
 #include "ompi/info/info.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_split_type = PMPI_Comm_split_type
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_split_type PMPI_Comm_split_type
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_split_type";
--- a/ompi/mpi/c/comm_test_inter.c
+++ b/ompi/mpi/c/comm_test_inter.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Comm_test_inter = PMPI_Comm_test_inter
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Comm_test_inter PMPI_Comm_test_inter
 #endif

 static const char FUNC_NAME[] = "MPI_Comm_test_inter";
--- a/ompi/mpi/c/compare_and_swap.c
+++ b/ompi/mpi/c/compare_and_swap.c
@ -30,12 +30,12 @@
 #include "ompi/mca/osc/osc.h"
 #include "ompi/datatype/ompi_datatype.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Compare_and_swap = PMPI_Compare_and_swap
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Compare_and_swap PMPI_Compare_and_swap
 #endif

 static const char FUNC_NAME[] = "MPI_Compare_and_swap";
--- a/ompi/mpi/c/dims_create.c
+++ b/ompi/mpi/c/dims_create.c
@ -13,6 +13,8 @@
 *                         reserved.
 * Copyright (c) 2014      Intel, Inc. All rights reserved
 * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -29,12 +31,12 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Dims_create = PMPI_Dims_create
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dims_create PMPI_Dims_create
 #endif

 static const char FUNC_NAME[] = "MPI_Dims_create";
--- a/ompi/mpi/c/dist_graph_create.c
+++ b/ompi/mpi/c/dist_graph_create.c
@ -8,6 +8,9 @@
 *                         reserved.
 * Copyright (c) 2015      Research Organization for Information Science
 *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
 *
 */

@ -21,12 +24,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Dist_graph_create = PMPI_Dist_graph_create
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dist_graph_create PMPI_Dist_graph_create
 #endif

 static const char FUNC_NAME[] = "MPI_Dist_graph_create";
--- a/ompi/mpi/c/dist_graph_create_adjacent.c
+++ b/ompi/mpi/c/dist_graph_create_adjacent.c
@ -12,6 +12,9 @@
 * Copyright (c) 2012-2013 Inria.  All rights reserved.
 * Copyright (c) 2015      Research Organization for Information Science
 *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
 *
 * Author(s): Torsten Hoefler
 *
@ -27,12 +30,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Dist_graph_create_adjacent = PMPI_Dist_graph_create_adjacent
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dist_graph_create_adjacent PMPI_Dist_graph_create_adjacent
 #endif

 static const char FUNC_NAME[] = "MPI_Dist_graph_create_adjacent";
--- a/ompi/mpi/c/dist_graph_neighbors.c
+++ b/ompi/mpi/c/dist_graph_neighbors.c
@ -7,6 +7,11 @@
 *                         reserved.
 * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2012-2013 Inria.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
 *
 */

@ -20,12 +25,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Dist_graph_neighbors = PMPI_Dist_graph_neighbors
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dist_graph_neighbors PMPI_Dist_graph_neighbors
 #endif

 static const char FUNC_NAME[] = "MPI_Dist_graph_neighbors";
--- a/ompi/mpi/c/dist_graph_neighbors_count.c
+++ b/ompi/mpi/c/dist_graph_neighbors_count.c
@ -7,6 +7,11 @@
 *                         reserved.
 * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2012-2013 Inria.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
 *
 */
 #include <assert.h>
@ -22,12 +27,12 @@
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Dist_graph_neighbors_count = PMPI_Dist_graph_neighbors_count
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Dist_graph_neighbors_count PMPI_Dist_graph_neighbors_count
 #endif

 static const char FUNC_NAME[] = "MPI_Dist_graph_neighbors_count";
--- a/ompi/mpi/c/errhandler_c2f.c
+++ b/ompi/mpi/c/errhandler_c2f.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/mpi/fortran/base/fint_2_int.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Errhandler_c2f = PMPI_Errhandler_c2f
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Errhandler_c2f PMPI_Errhandler_c2f
 #endif

 static const char FUNC_NAME[] = "MPI_Errhandler_c2f";
--- a/ompi/mpi/c/errhandler_create.c
+++ b/ompi/mpi/c/errhandler_create.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -22,14 +24,17 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Errhandler_create = PMPI_Errhandler_create
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Errhandler_create PMPI_Errhandler_create
 #endif

+#if OMPI_ENABLE_MPI_PROFILING
+#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler
+#endif

 int MPI_Errhandler_create(MPI_Handler_function *function,
                          MPI_Errhandler *errhandler)
--- a/ompi/mpi/c/errhandler_f2c.c
+++ b/ompi/mpi/c/errhandler_f2c.c
@ -11,6 +11,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/mpi/fortran/base/fint_2_int.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Errhandler_f2c = PMPI_Errhandler_f2c
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Errhandler_f2c PMPI_Errhandler_f2c
 #endif

 static const char FUNC_NAME[] = "MPI_Errhandler_f2c";
--- a/ompi/mpi/c/errhandler_free.c
+++ b/ompi/mpi/c/errhandler_free.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -23,12 +25,12 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Errhandler_free = PMPI_Errhandler_free
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Errhandler_free PMPI_Errhandler_free
 #endif

 static const char FUNC_NAME[] = "MPI_Errhandler_free";
--- a/ompi/mpi/c/errhandler_get.c
+++ b/ompi/mpi/c/errhandler_get.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,16 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Errhandler_get = PMPI_Errhandler_get
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Errhandler_get PMPI_Errhandler_get
+#endif
+
+#if OMPI_ENABLE_MPI_PROFILING
+#define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler
 #endif

 static const char FUNC_NAME[] = "MPI_Errhandler_get";
--- a/ompi/mpi/c/errhandler_set.c
+++ b/ompi/mpi/c/errhandler_set.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,16 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Errhandler_set = PMPI_Errhandler_set
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Errhandler_set PMPI_Errhandler_set
+#endif
+
+#if OMPI_ENABLE_MPI_PROFILING
+#define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler
 #endif

 static const char FUNC_NAME[] = "MPI_Errhandler_set";
--- a/ompi/mpi/c/error_class.c
+++ b/ompi/mpi/c/error_class.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Error_class = PMPI_Error_class
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Error_class PMPI_Error_class
 #endif

 static const char FUNC_NAME[] = "MPI_Error_class";
--- a/ompi/mpi/c/error_string.c
+++ b/ompi/mpi/c/error_string.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006      University of Houston. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Error_string = PMPI_Error_string
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Error_string PMPI_Error_string
 #endif

 static const char FUNC_NAME[] = "MPI_Error_string";
--- a/ompi/mpi/c/exscan.c
+++ b/ompi/mpi/c/exscan.c
@ -31,12 +31,12 @@
 #include "ompi/op/op.h"
 #include "ompi/memchecker.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Exscan = PMPI_Exscan
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Exscan PMPI_Exscan
 #endif

 static const char FUNC_NAME[] = "MPI_Exscan";
--- a/ompi/mpi/c/fetch_and_op.c
+++ b/ompi/mpi/c/fetch_and_op.c
@ -30,12 +30,12 @@
 #include "ompi/mca/osc/osc.h"
 #include "ompi/datatype/ompi_datatype.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_Fetch_and_op = PMPI_Fetch_and_op
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_Fetch_and_op PMPI_Fetch_and_op
 #endif

 static const char FUNC_NAME[] = "MPI_Fetch_and_op";
--- a/ompi/mpi/c/file_c2f.c
+++ b/ompi/mpi/c/file_c2f.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_c2f = PMPI_File_c2f
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_c2f PMPI_File_c2f
 #endif

 static const char FUNC_NAME[] = "MPI_File_c2f";
--- a/ompi/mpi/c/file_call_errhandler.c
+++ b/ompi/mpi/c/file_call_errhandler.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_call_errhandler = PMPI_File_call_errhandler
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_call_errhandler PMPI_File_call_errhandler
 #endif

 static const char FUNC_NAME[] = "MPI_File_call_errhandler";
--- a/ompi/mpi/c/file_close.c
+++ b/ompi/mpi/c/file_close.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -23,12 +25,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_close = PMPI_File_close
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_close PMPI_File_close
 #endif

 static const char FUNC_NAME[] = "MPI_File_close";
--- a/ompi/mpi/c/file_create_errhandler.c
+++ b/ompi/mpi/c/file_create_errhandler.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_create_errhandler = PMPI_File_create_errhandler
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_create_errhandler PMPI_File_create_errhandler
 #endif

 static const char FUNC_NAME[] = "MPI_File_create_errhandler";
--- a/ompi/mpi/c/file_delete.c
+++ b/ompi/mpi/c/file_delete.c
@ -31,12 +31,12 @@
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/base.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_delete = PMPI_File_delete
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_delete PMPI_File_delete
 #endif

 static const char FUNC_NAME[] = "MPI_File_delete";
--- a/ompi/mpi/c/file_f2c.c
+++ b/ompi/mpi/c/file_f2c.c
@ -11,6 +11,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -26,12 +28,12 @@
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_f2c = PMPI_File_f2c
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_f2c PMPI_File_f2c
 #endif

 static const char FUNC_NAME[] = "MPI_File_f2c";
--- a/ompi/mpi/c/file_get_amode.c
+++ b/ompi/mpi/c/file_get_amode.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_get_amode = PMPI_File_get_amode
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_amode PMPI_File_get_amode
 #endif

 static const char FUNC_NAME[] = "MPI_File_get_amode";
--- a/ompi/mpi/c/file_get_atomicity.c
+++ b/ompi/mpi/c/file_get_atomicity.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_get_atomicity = PMPI_File_get_atomicity
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_atomicity PMPI_File_get_atomicity
 #endif

 static const char FUNC_NAME[] = "MPI_File_get_atomicity";
--- a/ompi/mpi/c/file_get_byte_offset.c
+++ b/ompi/mpi/c/file_get_byte_offset.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_get_byte_offset = PMPI_File_get_byte_offset
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_byte_offset PMPI_File_get_byte_offset
 #endif

 static const char FUNC_NAME[] = "MPI_File_get_byte_offset";
--- a/ompi/mpi/c/file_get_errhandler.c
+++ b/ompi/mpi/c/file_get_errhandler.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,12 +27,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_get_errhandler = PMPI_File_get_errhandler
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_errhandler PMPI_File_get_errhandler
 #endif

 static const char FUNC_NAME[] = "MPI_File_get_errhandler";
--- a/ompi/mpi/c/file_get_group.c
+++ b/ompi/mpi/c/file_get_group.c
@ -9,6 +9,8 @@
 *                         University of Stuttgart.  All rights reserved.
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_get_group = PMPI_File_get_group
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_group PMPI_File_get_group
 #endif

 static const char FUNC_NAME[] = "MPI_File_get_group";
--- a/ompi/mpi/c/file_get_info.c
+++ b/ompi/mpi/c/file_get_info.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_get_info = PMPI_File_get_info
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_info PMPI_File_get_info
 #endif

 static const char FUNC_NAME[] = "MPI_File_get_info";
--- a/ompi/mpi/c/file_get_position.c
+++ b/ompi/mpi/c/file_get_position.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_get_position = PMPI_File_get_position
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_position PMPI_File_get_position
 #endif

 static const char FUNC_NAME[] = "MPI_File_get_position";
--- a/ompi/mpi/c/file_get_position_shared.c
+++ b/ompi/mpi/c/file_get_position_shared.c
@ -10,6 +10,8 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -24,12 +26,12 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/file/file.h"

-#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
+#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_BUILD_MPI_PROFILING
 #pragma weak MPI_File_get_position_shared = PMPI_File_get_position_shared
 #endif

-#if OMPI_PROFILING_DEFINES
-#include "ompi/mpi/c/profile/defines.h"
+#if OMPI_BUILD_MPI_PROFILING
+#define MPI_File_get_position_shared PMPI_File_get_position_shared
 #endif

 static const char FUNC_NAME[] = "MPI_File_get_position_shared";
--- a/Показать больше
+++ b/Показать больше