Get rid of some dead code.

Some old references to RML and IOMP which aren't used anywhere are deleted.
http://lists.cs.uiuc.edu/pipermail/openmp-dev/2015-June/000664.html

Patch by Jack Howarth and Jonathan Peyton

llvm-svn: 238878

diff --git a/openmp/runtime/src/i18n/en_US.txt b/openmp/runtime/src/i18n/en_US.txt
index f2fabbf..cc9eb8f 100644 (file)
--- a/openmp/runtime/src/i18n/en_US.txt
+++ b/openmp/runtime/src/i18n/en_US.txt
@@ -135,7 +135,6 @@ Pragma                       "%1$s pragma (at %2$s:%3$s():%4$s)"
 #    Aff -- Affinity messages.
 #    Cns -- Consistency check failures (KMP_CONSISTENCY_CHECK).
 #    Itt -- ITT Notify-related messages.
-#    Rml -- RML-related messages.
 
 LibraryIsSerial              "Library is \"serial\"."
 CantOpenMessageCatalog       "Cannot open message catalog \"%1$s\":"
@@ -352,7 +351,7 @@ CantConnectUsing             "Cannot connect to %1$s - Using %2$s"
 LibNotSupport                "%1$s does not support %2$s. Continuing without using %2$s."
 LibNotSupportFor             "%1$s does not support %2$s for %3$s. Continuing without using %2$s."
 StaticLibNotSupport          "Static %1$s does not support %2$s. Continuing without using %2$s."
-DynIRMLwoUseIrml             "KMP_DYNAMIC_MODE=irml cannot be used with KMP_USE_IRML=0"
+OBSOLETE                     "KMP_DYNAMIC_MODE=irml cannot be used with KMP_USE_IRML=0"
 IttUnknownGroup              "ittnotify: Unknown group \"%2$s\" specified in environment variable \"%1$s\"."
 IttEnvVarTooLong             "ittnotify: Environment variable \"%1$s\" too long: Actual lengths is %2$lu, max allowed length is %3$lu."
 AffUseGlobCpuidL11           "%1$s: Affinity capable, using global cpuid leaf 11 info"
@@ -372,10 +371,10 @@ CnsLockNotDestroyed          "Lock initialized at %1$s(%2$d) was not destroyed"
 CantLoadBalUsing             "Cannot determine machine load balance - Using %1$s"
 AffNotCapableUsePthread      "%1$s: Affinity not capable, using pthread info"
 AffUsePthread                "%1$s: Affinity capable, using pthread info"
-RmlLoadLibFailed             "Loading \"%1$s\" library failed:"
-RmlLookupFailed              "Lookup of \"%1$s\" function failed:"
-RmlBufferTooSmall            "Buffer too small."
-RmlUnknownError              "Error #%1$d."
+OBSOLETE                     "Loading \"%1$s\" library failed:"
+OBSOLETE                     "Lookup of \"%1$s\" function failed:"
+OBSOLETE                     "Buffer too small."
+OBSOLETE                     "Error #%1$d."
 NthSyntaxError               "%1$s: Invalid symbols found. Check the value \"%2$s\"."
 NthSpacesNotAllowed          "%1$s: Spaces between digits are not allowed \"%2$s\"."
 AffStrParseFilename          "%1$s: %2$s - parsing %3$s."
@@ -454,8 +453,8 @@ GetNewerLibrary              "It could be a result of using an older OMP library
                              "compiler or memory corruption. You may check the proper OMP library "
                              "is linked to the application."
 CheckEnvVar                  "Check %1$s environment variable, its value is \"%2$s\"."
-GetNewerIOMPLibrary          "You may want to use an %1$s library that supports %2$s interface with version %3$s."
-GetNewerIRMLLibrary          "You may want to use an %1$s library with version %2$s."
+OBSOLETE                     "You may want to use an %1$s library that supports %2$s interface with version %3$s."
+OBSOLETE                     "You may want to use an %1$s library with version %2$s."
 BadExeFormat                 "System error #193 is \"Bad format of EXE or DLL file\". "
                              "Usually it means the file is found, but it is corrupted or "
                              "a file for another architecture. "

diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h
index cb8f2bd..d9aee8c 100644 (file)
--- a/openmp/runtime/src/kmp.h
+++ b/openmp/runtime/src/kmp.h
@@ -2542,7 +2542,7 @@ extern char const   *__kmp_barrier_pattern_name        [ bp_last_bar ];
 
 /* Global Locks */
 extern kmp_bootstrap_lock_t __kmp_initz_lock;     /* control initialization */
-extern kmp_bootstrap_lock_t __kmp_forkjoin_lock;  /* control fork/join access and load calculation if rml is used*/
+extern kmp_bootstrap_lock_t __kmp_forkjoin_lock;  /* control fork/join access */
 extern kmp_bootstrap_lock_t __kmp_exit_lock;      /* exit() is not always thread-safe */
 extern kmp_bootstrap_lock_t __kmp_monitor_lock;   /* control monitor thread creation */
 extern kmp_bootstrap_lock_t __kmp_tp_cached_lock; /* used for the hack to allow threadprivate cache and __kmp_threads expansion to co-exist */

diff --git a/openmp/runtime/src/kmp_runtime.c b/openmp/runtime/src/kmp_runtime.c
index fd79a6b..343cd6f 100644 (file)
--- a/openmp/runtime/src/kmp_runtime.c
+++ b/openmp/runtime/src/kmp_runtime.c
@@ -870,7 +870,6 @@ __kmp_reserve_threads( kmp_root_t *root, kmp_team_t *parent_team,
 {
     int capacity;
     int new_nthreads;
-    int use_rml_to_adjust_nth;
     KMP_DEBUG_ASSERT( __kmp_init_serial );
     KMP_DEBUG_ASSERT( root && parent_team );
 
@@ -897,7 +896,6 @@ __kmp_reserve_threads( kmp_root_t *root, kmp_team_t *parent_team,
     // according to the method specified by dynamic_mode.
     //
     new_nthreads = set_nthreads;
-    use_rml_to_adjust_nth = FALSE;
     if ( ! get__dynamic_2( parent_team, master_tid ) ) {
         ;
     }