Update the embedded PLPA version to v1.3.2. Since this is a 3rd

party/"vendor" import, the changes are actually far smaller than the size of this changeset implies. Here's a list of the changes: * Update the AMD license header in plpa_map.c to be less restrictive (see https://svn.open-mpi.org/trac/plpa/changeset/262 for details) -- '''this is the most/only important change of this update.''' No code is changed by this; only removing a clase from a license header in plpa_map.c. * Changes to the generated {{{configure}}}, {{{config.guess}}}, and {{{config.sub}}} scripts (which aren't used by OMPI). * soname version tracking changes (which also aren't used by OMPI; they're only used when PLPA is built/installed in "standalone" mode). * Update the "get version" m4 (which was stolen from OMPI's m4 to begin with, and is only used during OMPI's autogen.sh step). * Update various PLPA version numbers to 1.3.2. * Bug fix in plpa-taskset (which is not built in the OMPI PLPA build). This commit was SVN r22367.
2010-01-06 00:44:14 +00:00 · 2010-01-06 00:44:14 +00:00 · dbb29663e8
--- a/opal/mca/paffinity/linux/plpa/NEWS
+++ b/opal/mca/paffinity/linux/plpa/NEWS
@ -3,7 +3,7 @@ Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
                        Corporation.  All rights reserved.
 Copyright (c) 2004-2005 The Regents of the University of California.
                        All rights reserved.
-Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
 $COPYRIGHT$

 Additional copyrights may follow
@ -16,6 +16,31 @@ This file contains the main features as well as overviews of specific
 bug fixes (and other actions) for each version of PLPA since
 version 1.0.

+1.3.2
+-----
+
+- Removed a clause from AMD's license notice in plpa_map.c by
+  direction from Barry S. Newberger, Ph.D., Assistant General Counsel,
+  Advanced Micro Devices, Inc. per a Red Hat licensing concern
+  (initiated at https://bugzilla.redhat.com/show_bug.cgi?id=530230).
+  Removing this clause alleviates Red Hat's concern, even though this
+  resolution not shown on the above-cited bugzilla ticket.
+- Julian Seward noticed that PLPA's use of the Valgrind API in the
+  affinity API probe was incorrect and suggested an improvement.  Even
+  though we're ramping down PLPA development, I couldn't really ignore
+  the Valgrind author's suggestion!
+
+
+1.3.1
+-----
+
+- Fixed bug identified by Eugene Loh at Sun; plpa-taskset -c ranges
+  were accidentally excluding the processor ID at the top of the
+  range.
+- For standalone PLPA builds, the .so library is now versioned
+  according to the GNU Libtool guidelines.
+
+
 1.3
 ---

--- a/opal/mca/paffinity/linux/plpa/VERSION
+++ b/opal/mca/paffinity/linux/plpa/VERSION
@ -7,7 +7,7 @@

 major=1
 minor=3
-release=0
+release=2

 # greek is used for alpha or beta release tags.  If it is non-empty,
 # it will be appended to the version number.  It does not have to be
@ -16,7 +16,7 @@ release=0
 # requirement is that it must be entirely printable ASCII characters
 # and have no white space.

-greek=rc4
+greek=

 # If want_svn=1, then the SVN r number will be included in the overall
 # PLPA version number in some form.
@ -33,4 +33,20 @@ want_svn=0
 # distribution tarball is being made from an SVN checkout, the value
 # of svn_r in this file is replaced with the output of "svnversion".

-svn_r=r241
+svn_r=r264
+
+# The shared library version of PLPA's public library.  This version
+# is maintained in accordance with the "Library Interface Versions"
+# chapter from the GNU Libtool documentation.  PLPA v<=1.3 reported
+# version 0:0:0; the next release after v1.3 will explicitly set its
+# .so version numbers according to the rules in the Libtool
+# documentation.  Notes:
+
+# 1. Since version numbers are associated with *releases*, the version
+# number maintained on the PLPA SVN trunk (and developer branches) is
+# always 0:0:0.
+
+# 2. Version numbers are described in the Libtool current:revision:age
+# format.
+
+libplpa_so_version=0:1:0
--- a/opal/mca/paffinity/linux/plpa/autogen.sh
+++ b/opal/mca/paffinity/linux/plpa/autogen.sh
@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # 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) 2007-2009 Cisco, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -349,7 +349,7 @@ run_gnu_tools() {
 echo "[Checking] prerequisites"

 # sanity check to make sure user isn't being stupid
-if test ! -d .svn ; then
+if test ! -d .svn -a ! -d .hg ; then
    cat <<EOF

 This doesn't look like a developer copy of PLPA.  You probably do not
--- a/opal/mca/paffinity/linux/plpa/config/config.guess
+++ b/opal/mca/paffinity/linux/plpa/config/config.guess
@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.

-timestamp='2009-02-03'
+timestamp='2009-12-30'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -27,16 +27,16 @@ timestamp='2009-02-03'
 # the same distribution terms that you use for the rest of that program.


-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD

 me=`echo "$0" | sed -e 's,.*/,,'`

@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)

 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@ -324,12 +325,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
    sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@ -653,7 +660,7 @@ EOF
 	    # => hppa64-hp-hpux11.23

 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@ -804,12 +811,12 @@ EOF
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
    	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@ -819,6 +826,9 @@ EOF
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@ -848,6 +858,20 @@ EOF
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
    arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@ -870,6 +894,17 @@ EOF
    frv:Linux:*:*)
    	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@ -879,78 +914,34 @@ EOF
    m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
    or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
    padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@ -959,8 +950,11 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@ -983,66 +977,6 @@ EOF
    xtensa*:Linux:*:*)
    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
    i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@ -1071,7 +1005,7 @@ EOF
    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    i*86:*DOS:*:*)
@ -1115,8 +1049,11 @@ EOF
    pc:*:*:*)
 	# Left here for compatibility:
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
        exit ;;
    Intel:Mach:3*:*)
 	echo i386-pc-mach3
@ -1176,7 +1113,7 @@ EOF
    rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    SM[BE]S:UNIX_SV:*:*)
@ -1269,6 +1206,16 @@ EOF
    *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--- a/opal/mca/paffinity/linux/plpa/config/config.sub
+++ b/opal/mca/paffinity/linux/plpa/config/config.sub
@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.

-timestamp='2009-02-03'
+timestamp='2009-12-31'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -32,13 +32,16 @@ timestamp='2009-02-03'


 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.

+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -149,10 +153,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@ -272,6 +279,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@ -280,6 +288,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@ -287,13 +296,14 @@ case $basic_machine in
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@ -336,7 +346,7 @@ case $basic_machine in
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@ -364,7 +374,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@ -373,6 +383,7 @@ case $basic_machine in
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@ -466,6 +477,10 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@ -718,6 +733,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@ -1239,6 +1257,9 @@ case $os in
        # First match some system type aliases
        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@ -1259,9 +1280,9 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@ -1282,7 +1303,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1415,6 +1436,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@ -1612,7 +1635,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
--- a/opal/mca/paffinity/linux/plpa/config/plpa_get_version.sh
+++ b/opal/mca/paffinity/linux/plpa/config/plpa_get_version.sh
@ -1,6 +1,8 @@
 #!/bin/sh
 #
-# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+# ompi_get_version is created from ompi_get_version.m4 and ompi_get_version.m4sh.
+#
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
 #                         University Research and Technology
 #                         Corporation.  All rights reserved.
 # Copyright (c) 2004-2005 The University of Tennessee and The University
@ -10,6 +12,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # 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$
 #
 # Additional copyrights may follow
@ -17,13 +20,27 @@
 # $HEADER$
 #

+# 5 June 2009: this file was copied from Open MPI's SVN trunk as of
+# r21383 on 5 June 2009.  The only change made to it was
+# s/OMPI/PLPA/ig.
+
+
+# PLPA_GET_VERSION(version_file, variable_prefix)
+# -----------------------------------------------
+# parse version_file for version information, setting
+# the following shell variables:
 #
-# This file is almost identical in functionality to
-# ompi_get_version.m4.  It is unfortunate that we have to duplicate
-# code, but it is really the only what that I can think to do it.  :-(
-# Hence, if you change the logic here for determining version numbers,
-# YOU MUST ALSO CHANGE IT IN ompi_get_version.m4!!
-#
+#  prefix_VERSION
+#  prefix_BASE_VERSION
+#  prefix_MAJOR_VERSION
+#  prefix_MINOR_VERSION
+#  prefix_RELEASE_VERSION
+#  prefix_GREEK_VERSION
+#  prefix_WANT_SVN
+#  prefix_SVN_R
+#  prefix_RELEASE_DATE
+
+

 srcfile="$1"
 option="$2"
@ -31,43 +48,67 @@ option="$2"
 case "$option" in
    # svnversion can take a while to run.  If we don't need it, don't run it.
    --major|--minor|--release|--greek|--base|--help)
-        OMPI_NEED_SVN=0
+        ompi_ver_need_svn=0
        ;;
    *)
-        OMPI_NEED_SVN=1
+        ompi_ver_need_svn=1
 esac


-if test "$srcfile" = ""; then
+if test -z "$srcfile"; then
    option="--help"
 else
-    OMPI_MAJOR_VERSION="`cat $srcfile | egrep '^major=' | cut -d= -f2`"
-    OMPI_MINOR_VERSION="`cat $srcfile | egrep '^minor=' | cut -d= -f2`"
-    OMPI_RELEASE_VERSION="`cat $srcfile | egrep '^release=' | cut -d= -f2`"
-    OMPI_GREEK_VERSION="`cat $srcfile | egrep '^greek=' | cut -d= -f2`"
-    OMPI_WANT_SVN="`cat $srcfile | egrep '^want_svn=' | cut -d= -f2`"
-    OMPI_SVN_R="`cat $srcfile | egrep '^svn_r=' | cut -d= -f2`"
-    if test "$OMPI_RELEASE_VERSION" != "0" -a "$OMPI_RELEASE_VERSION" != ""; then
-	OMPI_VERSION="$OMPI_MAJOR_VERSION.$OMPI_MINOR_VERSION.$OMPI_RELEASE_VERSION"
+
+    : ${ompi_ver_need_svn=1}
+    : ${srcdir=.}
+    : ${svnversion_result=-1}
+
+        if test -f "$srcfile"; then
+        ompi_vers=`sed -n "
+	t clear
+	: clear
+	s/^major/PLPA_MAJOR_VERSION/
+	s/^minor/PLPA_MINOR_VERSION/
+	s/^release/PLPA_RELEASE_VERSION/
+	s/^greek/PLPA_GREEK_VERSION/
+	s/^want_svn/PLPA_WANT_SVN/
+	s/^svn_r/PLPA_SVN_R/
+	s/^date/PLPA_RELEASE_DATE/
+	t print
+	b
+	: print
+	p" < "$srcfile"`
+	eval "$ompi_vers"
+
+        # Only print release version if it isn't 0
+        if test $PLPA_RELEASE_VERSION -ne 0 ; then
+            PLPA_VERSION="$PLPA_MAJOR_VERSION.$PLPA_MINOR_VERSION.$PLPA_RELEASE_VERSION"
        else
-	OMPI_VERSION="$OMPI_MAJOR_VERSION.$OMPI_MINOR_VERSION"
+            PLPA_VERSION="$PLPA_MAJOR_VERSION.$PLPA_MINOR_VERSION"
+        fi
+        PLPA_VERSION="${PLPA_VERSION}${PLPA_GREEK_VERSION}"
+        PLPA_BASE_VERSION=$PLPA_VERSION
+
+        if test $PLPA_WANT_SVN -eq 1 && test $ompi_ver_need_svn -eq 1 ; then
+            if test "$svnversion_result" != "-1" ; then
+                PLPA_SVN_R=$svnversion_result
+            fi
+            if test "$PLPA_SVN_R" = "-1" ; then
+
+                if test -d "$srcdir/.svn" ; then
+                    PLPA_SVN_R=r`svnversion "$srcdir"`
+                elif test -d "$srcdir/.hg" ; then
+                    PLPA_SVN_R=hg`hg -v -R "$srcdir" tip | grep changeset | cut -d: -f3`
+                fi
+                if test "PLPA_SVN_R" = ""; then
+                    PLPA_SVN_R=svn`date '+%m%d%Y'`
                fi

-    OMPI_VERSION="${OMPI_VERSION}${OMPI_GREEK_VERSION}"
+            fi
+            PLPA_VERSION="${PLPA_VERSION}${PLPA_SVN_R}"
+        fi
+    fi

-    OMPI_BASE_VERSION="$OMPI_VERSION"
-
-    if test "$OMPI_WANT_SVN" = "1" -a "$OMPI_NEED_SVN" = "1" ; then
-        if test "$OMPI_SVN_R" = "-1"; then
-            if test -d .svn; then
-                ver="r`svnversion .`"
-            else
-                ver="svn`date '+%m%d%Y'`"
-            fi
-            OMPI_SVN_R="$ver"
-        fi
-	OMPI_VERSION="${OMPI_VERSION}$OMPI_SVN_R"
-    fi

    if test "$option" = ""; then
 	option="--full"
@ -76,32 +117,35 @@ fi

 case "$option" in
    --full|-v|--version)
-	echo $OMPI_VERSION
+	echo $PLPA_VERSION
 	;;
    --major)
-	echo $OMPI_MAJOR_VERSION
+	echo $PLPA_MAJOR_VERSION
 	;;
    --minor)
-	echo $OMPI_MINOR_VERSION
+	echo $PLPA_MINOR_VERSION
 	;;
    --release)
-	echo $OMPI_RELEASE_VERSION
+	echo $PLPA_RELEASE_VERSION
 	;;
    --greek)
-	echo $OMPI_GREEK_VERSION
+	echo $PLPA_GREEK_VERSION
 	;;
    --svn)
-	echo $OMPI_SVN_R
+	echo $PLPA_SVN_R
 	;;
    --base)
-        echo $OMPI_BASE_VERSION
+        echo $PLPA_BASE_VERSION
+        ;;
+    --release-date)
+        echo $PLPA_RELEASE_DATE
        ;;
    --all)
-        echo ${OMPI_VERSION} ${OMPI_MAJOR_VERSION} ${OMPI_MINOR_VERSION} ${OMPI_RELEASE_VERSION} ${OMPI_GREEK_VERSION} ${OMPI_SVN_R}
+        echo ${PLPA_VERSION} ${PLPA_MAJOR_VERSION} ${PLPA_MINOR_VERSION} ${PLPA_RELEASE_VERSION} ${PLPA_GREEK_VERSION} ${PLPA_SVN_R}
        ;;
    -h|--help)
 	cat <<EOF
-$0 <srcfile> [<option>]
+$0 <srcfile> <option>

 <srcfile> - Text version file
 <option>  - One of:
@ -113,6 +157,7 @@ $0 <srcfile> [<option>]
    --svn          - Subversion repository number
    --all          - Show all version numbers, separated by :
    --base         - Show base version number (no svn number)
+    --release-date - Show the release date
    --help         - This message
 EOF
        ;;
--- a/opal/mca/paffinity/linux/plpa/configure
+++ b/opal/mca/paffinity/linux/plpa/configure
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for plpa 1.3rc4.
+# Generated by GNU Autoconf 2.63 for plpa 1.3.2a1.
 #
 # Report bugs to <http://www.open-mpi.org/community/help/>.
 #
@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='plpa'
 PACKAGE_TARNAME='plpa'
-PACKAGE_VERSION='1.3rc4'
-PACKAGE_STRING='plpa 1.3rc4'
+PACKAGE_VERSION='1.3.2a1'
+PACKAGE_STRING='plpa 1.3.2a1'
 PACKAGE_BUGREPORT='http://www.open-mpi.org/community/help/'

 # Factoring default headers for most tests.
@ -840,6 +840,7 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+libplpa_so_version
 PLPA_SVN_R
 PLPA_VERSION
 CONFIGURE_DEPENDENCIES
@ -1484,7 +1485,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures plpa 1.3rc4 to adapt to many kinds of systems.
+\`configure' configures plpa 1.3.2a1 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@ -1554,7 +1555,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of plpa 1.3rc4:";;
+     short | recursive ) echo "Configuration of plpa 1.3.2a1:";;
   esac
  cat <<\_ACEOF

@ -1679,7 +1680,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-plpa configure 1.3rc4
+plpa configure 1.3.2a1
 generated by GNU Autoconf 2.63

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1693,7 +1694,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by plpa $as_me 1.3rc4, which was
+It was created by plpa $as_me 1.3.2a1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was

  $ $0 $@
@ -2413,7 +2414,7 @@ fi

 # Define the identity of the package.
 PACKAGE='plpa'
- VERSION='1.3rc4'
+ VERSION='1.3.2a1'


 # Some tools Automake needs.
@ -2590,6 +2591,11 @@ PACKAGE_VERSION="$PLPA_VERSION"
 PACKAGE_STRING="${PACKAGE_NAME} ${PACKAGE_VERSION}"
 VERSION="${PACKAGE_VERSION}"

+# For standalone configurations, we include a .so version number.
+
+. $srcdir/VERSION
+
+
 # Setup the header file


@ -6424,13 +6430,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
  lt_cv_nm_interface="BSD nm"
  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6427: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6433: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:6430: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6436: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:6433: output\"" >&5)
+  (eval echo "\"\$as_me:6439: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@ -7635,7 +7641,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 7638 "configure"' > conftest.$ac_ext
+  echo '#line 7644 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@ -8940,11 +8946,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8943: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8949: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:8947: \$? = $ac_status" >&5
+   echo "$as_me:8953: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -9279,11 +9285,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9282: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9288: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:9286: \$? = $ac_status" >&5
+   echo "$as_me:9292: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -9384,11 +9390,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9387: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9393: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:9391: \$? = $ac_status" >&5
+   echo "$as_me:9397: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -9439,11 +9445,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9442: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9448: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:9446: \$? = $ac_status" >&5
+   echo "$as_me:9452: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -12239,7 +12245,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 12242 "configure"
+#line 12248 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -12335,7 +12341,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 12338 "configure"
+#line 12344 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -13011,7 +13017,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by plpa $as_me 1.3rc4, which was
+This file was extended by plpa $as_me 1.3.2a1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@ -13074,7 +13080,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-plpa config.status 1.3rc4
+plpa config.status 1.3.2a1
 configured by $0, generated by GNU Autoconf 2.63,
  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

--- a/opal/mca/paffinity/linux/plpa/configure.ac
+++ b/opal/mca/paffinity/linux/plpa/configure.ac
@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # 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) 2006-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -59,6 +59,11 @@ PACKAGE_VERSION="$PLPA_VERSION"
 PACKAGE_STRING="${PACKAGE_NAME} ${PACKAGE_VERSION}"
 VERSION="${PACKAGE_VERSION}"

+# For standalone configurations, we include a .so version number.
+
+. $srcdir/VERSION
+AC_SUBST([libplpa_so_version])
+
 # Setup the header file
 AH_TOP([/* -*- c -*-
 *
--- a/opal/mca/paffinity/linux/plpa/src/libplpa/Makefile.am
+++ b/opal/mca/paffinity/linux/plpa/src/libplpa/Makefile.am
@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2006-2007 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -32,6 +32,7 @@ public_headers = plpa.h
 if PLPA_BUILD_STANDALONE
 lib_LTLIBRARIES += libplpa.la
 nodist_include_HEADERS += $(public_headers)
+libplpa_la_LDFLAGS = -version-info $(libplpa_so_version)
 else
 noinst_LTLIBRARIES += libplpa_included.la
 nodist_noinst_HEADERS += $(public_headers)
--- a/opal/mca/paffinity/linux/plpa/src/libplpa/plpa_map.c
+++ b/opal/mca/paffinity/linux/plpa/src/libplpa/plpa_map.c
@ -36,13 +36,6 @@
 Devices, Inc.
 and any copyright holders and contributors.

- + In no event shall anyone redistributing or accessing or using this
- material commence or participate in any arbitration or legal action 
- relating to this material against Advanced Micro Devices, Inc. or any 
- copyright holders or contributors. The foregoing shall survive any 
- expiration or termination of this license or any agreement or access 
- or use related to this material.
-
 + ANY BREACH OF ANY TERM OF THIS LICENSE SHALL RESULT IN THE IMMEDIATE
 REVOCATION OF ALL RIGHTS TO REDISTRIBUTE, ACCESS OR USE THIS MATERIAL.

--- a/opal/mca/paffinity/linux/plpa/src/plpa-taskset/Makefile.am
+++ b/opal/mca/paffinity/linux/plpa/src/plpa-taskset/Makefile.am
@ -4,7 +4,7 @@
 #                         Corporation.  All rights reserved.
 # 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) 2007-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -22,6 +22,11 @@ if PLPA_BUILD_EXECUTABLES
 bin_PROGRAMS += plpa-taskset
 endif

+# Set some dependencies just to ensure that things are built in the
+# right order, regardless of the ordering of sources in the _SOURCES
+# macro.  The parser lex code depends on the output from bison.
+parser.l: tokens.h
+
 plpa_taskset_SOURCES = \
        plpa-taskset.c \
        plpa-taskset.h \
--- a/opal/mca/paffinity/linux/plpa/src/plpa-taskset/tokens.c
+++ b/opal/mca/paffinity/linux/plpa/src/plpa-taskset/tokens.c
@ -73,7 +73,7 @@
 #line 1 "tokens.y"


-/* Copyright 2007-2008 Cisco Systems, Inc.  All rights reserved. */
+/* Copyright 2007-2009 Cisco Systems, Inc.  All rights reserved. */

 #include "plpa_config.h"

@ -1554,7 +1554,7 @@ static void cpu_set_range(PLPA_NAME(cpu_set_t) *out, int min, int max)
 {
    int i;
    PLPA_CPU_ZERO(out);
-    for (i = min; i < max && i < PLPA_BITMASK_CPU_MAX; ++i) {
+    for (i = min; i <= max && i < PLPA_BITMASK_CPU_MAX; ++i) {
        PLPA_CPU_SET(i, out);
    }
 }
--- a/opal/mca/paffinity/linux/plpa/src/plpa-taskset/tokens.y
+++ b/opal/mca/paffinity/linux/plpa/src/plpa-taskset/tokens.y
@ -1,6 +1,6 @@
 %{

-/* Copyright 2007-2008 Cisco Systems, Inc.  All rights reserved. */
+/* Copyright 2007-2009 Cisco Systems, Inc.  All rights reserved. */

 #include "plpa_config.h"

@ -261,7 +261,7 @@ static void cpu_set_range(PLPA_NAME(cpu_set_t) *out, int min, int max)
 {
    int i;
    PLPA_CPU_ZERO(out);
-    for (i = min; i < max && i < PLPA_BITMASK_CPU_MAX; ++i) {
+    for (i = min; i <= max && i < PLPA_BITMASK_CPU_MAX; ++i) {
        PLPA_CPU_SET(i, out);
    }
 }