Correct the handling of various map/bind combinations when pe=N is given. Thanks to Elena Elkina for reporting it.

Refs trac:4117

This commit was SVN r30663.

The following Trac tickets were found above:
  Ticket 4117 --> https://svn.open-mpi.org/trac/ompi/ticket/4117

orte/mca/rmaps/base/rmaps_base_frame.c

@@ -393,20 +393,21 @@ static int orte_rmaps_base_open(mca_base_open_flag_t flags)
          * bind to those cpus - any other binding policy is an
          * error
          */
-        if (OPAL_BIND_TO_NONE == OPAL_GET_BINDING_POLICY(opal_hwloc_binding_policy)) {
+        if (!(OPAL_BIND_GIVEN & OPAL_GET_BINDING_POLICY(opal_hwloc_binding_policy))) {
             if (opal_hwloc_use_hwthreads_as_cpus) {
                 OPAL_SET_BINDING_POLICY(opal_hwloc_binding_policy, OPAL_BIND_TO_HWTHREAD);
             } else {
                 OPAL_SET_BINDING_POLICY(opal_hwloc_binding_policy, OPAL_BIND_TO_CORE);
             }
         } else {
-            if (opal_hwloc_use_hwthreads_as_cpus &&
-                (OPAL_BIND_TO_HWTHREAD != OPAL_GET_BINDING_POLICY(opal_hwloc_binding_policy))) {
+            if (opal_hwloc_use_hwthreads_as_cpus) {
+                if (OPAL_BIND_TO_HWTHREAD != OPAL_GET_BINDING_POLICY(opal_hwloc_binding_policy)) {
                     orte_show_help("help-orte-rmaps-base.txt", "mismatch-binding", true,
                                    orte_rmaps_base.cpus_per_rank, "use-hwthreads-as-cpus",
                                    opal_hwloc_base_print_binding(opal_hwloc_binding_policy),
                                    "bind-to hwthread");
                     return ORTE_ERR_SILENT;
+                }
             } else if (OPAL_BIND_TO_CORE != OPAL_GET_BINDING_POLICY(opal_hwloc_binding_policy)) {
                 orte_show_help("help-orte-rmaps-base.txt", "mismatch-binding", true,
                                orte_rmaps_base.cpus_per_rank, "cores as cpus",