Remove the libopenmpi_malloc library; it is only necessary for

backwards compatibility in the v1.3 series.

This commit was SVN r22013.

NEWS

@@ -35,6 +35,8 @@ Trunk (not on release branches yet)
 1.5
 ---
 
+- Removed the libopenmpi_malloc library (added in the v1.3 series)
+  since it is no longer necessary
 - Add several notifier plugins (generally used when Open MPI detects
   system/network administrator-worthy problems); each have their own
   MCA parameters to govern their usage.  See "ompi_info --param

README

@@ -817,25 +817,6 @@ for a full list); a summary of the more commonly used ones follows:
   with different endian representations).  Heterogeneous support is
   disabled by default because it imposes a minor performance penalty.
 
---enable-ptmalloc2-internal
-  ***NOTE: This option no longer exists.
-
-  This option was introduced in Open MPI v1.3 and was then removed in
-  Open MPI v1.3.2.  Open MPI fundamentally changed how it uses
-  ptmalloc2 support in v1.3.2 such that the
-  --enable-ptmalloc2-internal flag was no longer necessary.  It can
-  still harmlessly be supplied to Open MPI's configure script, but a
-  warning will appear about how it is an unrecognized option.
-
-  In v1.3 and v1.3.1, Open MPI built the ptmalloc2 library as a
-  standalone library that users could choose to link in or not (by
-  adding -lopenmpi-malloc to their link command).  Using this option
-  restored pre-v1.3 behavior of *always* forcing the user to use the
-  ptmalloc2 memory manager (because it is part of libmpi).
-
-  Starting with v1.3.2, ptmalloc2 is always built into Open MPI, but
-  is only activated in certain scenarios.
-
 --with-wrapper-cflags=<cflags>
 --with-wrapper-cxxflags=<cxxflags>
 --with-wrapper-fflags=<fflags>

opal/mca/memory/ptmalloc2/Makefile.am

@@ -59,11 +59,6 @@ libmca_memory_ptmalloc2_la_LDFLAGS = \
    -module -avoid-version $(memory_ptmalloc2_LDFLAGS)
 libmca_memory_ptmalloc2_la_LIBADD = $(memory_ptmalloc2_LIBS)
 
-# For hysterical raisins, we create a dummy libopenmpi_malloc.la.  See
-# README-open-mpi.txt for details
-lib_LTLIBRARIES = libopenmpi_malloc.la
-libopenmpi_malloc_la_SOURCES = dummy.c
-
 # these are included directly and shouldn't be built solo
 EXTRA_libmca_memory_ptmalloc2_la_SOURCES = \
     arena.c \

opal/mca/memory/ptmalloc2/README-open-mpi.txt

@@ -51,16 +51,6 @@ present in all OMPI executables and user-level applications, it won't
 necessarily be used -- it's a separate/run-time decision as to whether
 it will be used.
 
-For hysterical raisins (v1.3.0 and v1.3.1), an empty
-libopenmpi_malloc.la is created.  This library *used* to be the whole
-ptmalloc2 allocator, but since we're now name-shifting all the
-ptmalloc2 symbols, it's no longer necessary to make it a separate
-library.  Having an empty/dummy library of this name ensures that
-users who added -lopenmpi_malloc to their compile/link lines won't
-fail linking.  They may get a linker warning about no symbols being
-used in this library -- but that's a Good Thing; it'll encourage users
-to stop linking in this library.
-
 We set the __malloc_initialize_hook variable to point to
 opal_memory_ptmalloc2_malloc_init_hook (in hooks.c).  This function is
 called by the underlying glibc allocator before any allocations occur

opal/mca/memory/ptmalloc2/dummy.c

@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
- * $COPYRIGHT$
- * 
- * Additional copyrights may follow
- * 
- * $HEADER$
- */
-
-int opal_this_library_is_not_used_anymore(void);
-
-int opal_this_library_is_not_used_anymore(void) {
-    return 0;
-}