proc_bind_disabled enum value removed, its usage replased with proc_bind_false

llvm-svn: 231776

3 files changed, 3 insertions, 9 deletions

diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h
index 1addf4b9aba..ec7e8babeaa 100644
--- a/openmp/runtime/src/kmp.h
+++ b/openmp/runtime/src/kmp.h
@@ -761,7 +761,6 @@ typedef enum kmp_proc_bind_t {
     proc_bind_master,
     proc_bind_close,
     proc_bind_spread,
-    proc_bind_disabled,
     proc_bind_intel,    // use KMP_AFFINITY interface
     proc_bind_default
 } kmp_proc_bind_t;
diff --git a/openmp/runtime/src/kmp_barrier.cpp b/openmp/runtime/src/kmp_barrier.cpp
index eb3c21a673d..f6e0d0a494f 100644
--- a/openmp/runtime/src/kmp_barrier.cpp
+++ b/openmp/runtime/src/kmp_barrier.cpp
@@ -1550,8 +1550,7 @@ __kmp_fork_barrier(int gtid, int tid)
 #endif // KMP_AFFINITY_SUPPORTED
 #if OMP_40_ENABLED && KMP_AFFINITY_SUPPORTED
     }
-    else if ((proc_bind != proc_bind_false)
-             && (proc_bind != proc_bind_disabled)) {
+    else if (proc_bind != proc_bind_false) {
         if (this_thr->th.th_new_place == this_thr->th.th_current_place) {
             KA_TRACE(100, ("__kmp_fork_barrier: T#%d already in correct place %d\n",
                            __kmp_gtid_from_thread(this_thr), this_thr->th.th_current_place));
diff --git a/openmp/runtime/src/kmp_settings.c b/openmp/runtime/src/kmp_settings.c
index f22fdc2432f..97dd1f7623e 100644
--- a/openmp/runtime/src/kmp_settings.c
+++ b/openmp/runtime/src/kmp_settings.c
@@ -3216,7 +3216,7 @@ __kmp_stg_parse_proc_bind( char const * name, char const * value, void * data )
         __kmp_affinity_type = affinity_disabled;
 # endif /* KMP_AFFINITY_SUPPORTED */
         __kmp_nested_proc_bind.used = 1;
-        __kmp_nested_proc_bind.bind_types[0] = proc_bind_disabled;
+        __kmp_nested_proc_bind.bind_types[0] = proc_bind_false;
     }
     else if ( ( num == (int)proc_bind_false )
       || __kmp_match_str( "false", buf, &next ) ) {
@@ -3362,10 +3362,6 @@ __kmp_stg_print_proc_bind( kmp_str_buf_t * buffer, char const * name,
                 __kmp_str_buf_print( buffer, "spread" );
                 break;
 
-                case proc_bind_disabled:
-                __kmp_str_buf_print( buffer, "disabled" );
-                break;
-
                 case proc_bind_intel:
                 __kmp_str_buf_print( buffer, "intel" );
                 break;
@@ -5120,7 +5116,7 @@ __kmp_env_initialize( char const * string ) {
 
 # if OMP_40_ENABLED
         if ( __kmp_affinity_type == affinity_disabled )  {
-            __kmp_nested_proc_bind.bind_types[0] = proc_bind_disabled;
+            __kmp_nested_proc_bind.bind_types[0] = proc_bind_false;
         }
         else if ( __kmp_nested_proc_bind.bind_types[0] == proc_bind_true ) {
             //