Apply name change to src/* files.
These changes are mostly in comments, but there are a few
that aren't. Change libiomp5 => libomp everywhere. One internal
function name is changed in kmp_gsupport.c, and in kmp_i18n.c, the
static char[] variable 'name' is changed to "libomp".
llvm-svn: 238712
GitOrigin-RevId: 663382950dbb4fbb5695eb4dc4dc7a060c80c118
diff --git a/runtime/src/exports_so.txt b/runtime/src/exports_so.txt
index a32edce..0fc5a0a 100644
--- a/runtime/src/exports_so.txt
+++ b/runtime/src/exports_so.txt
@@ -11,7 +11,7 @@
#//===----------------------------------------------------------------------===//
#
-# This is version script for OMP RTL shared library (libiomp5*.so)
+# This is version script for OMP RTL shared library (libomp*.so)
VERSION {
diff --git a/runtime/src/kmp_affinity.cpp b/runtime/src/kmp_affinity.cpp
index 4e9fc4d..d9ff4e6 100644
--- a/runtime/src/kmp_affinity.cpp
+++ b/runtime/src/kmp_affinity.cpp
@@ -123,7 +123,7 @@
//
// Unfortunately, my attempts to reproduce it in a smaller example have
// failed - I'm not sure what the prospects are of getting it fixed
-// properly - but we need a reproducer smaller than all of libiomp.
+// properly - but we need a reproducer smaller than all of libomp.
//
// Work around the problem by avoiding inline constructors in such builds.
// We do this for all platforms, not just Linux* OS - non-inline functions are
diff --git a/runtime/src/kmp_ftn_entry.h b/runtime/src/kmp_ftn_entry.h
index 8d7cbc6..a04b284 100644
--- a/runtime/src/kmp_ftn_entry.h
+++ b/runtime/src/kmp_ftn_entry.h
@@ -1088,7 +1088,7 @@
These following sections create function aliases (dummy symbols) for the omp_* routines.
These aliases will then be versioned according to how libgomp ``versions'' its
symbols (OMP_1.0, OMP_2.0, OMP_3.0, ...) while also retaining the
- default version which libiomp5 uses: VERSION (defined in exports_so.txt)
+ default version which libomp uses: VERSION (defined in exports_so.txt)
If you want to see the versioned symbols for libgomp.so.1 then just type:
objdump -T /path/to/libgomp.so.1 | grep omp_
diff --git a/runtime/src/kmp_ftn_os.h b/runtime/src/kmp_ftn_os.h
index 290c712..197779f 100644
--- a/runtime/src/kmp_ftn_os.h
+++ b/runtime/src/kmp_ftn_os.h
@@ -475,7 +475,7 @@
#define KMP_API_NAME_GOMP_TASKYIELD GOMP_taskyield
// All GOMP_4.0 symbols
-// TODO: As of 2013-10-14, none of the GOMP_4.0 functions are implemented in libiomp5
+// TODO: As of 2013-10-14, none of the GOMP_4.0 functions are implemented in libomp
#define KMP_API_NAME_GOMP_BARRIER_CANCEL GOMP_barrier_cancel
#define KMP_API_NAME_GOMP_CANCEL GOMP_cancel
#define KMP_API_NAME_GOMP_CANCELLATION_POINT GOMP_cancellation_point
diff --git a/runtime/src/kmp_gsupport.c b/runtime/src/kmp_gsupport.c
index 99dc822..e7bac02 100644
--- a/runtime/src/kmp_gsupport.c
+++ b/runtime/src/kmp_gsupport.c
@@ -1212,7 +1212,7 @@
#ifndef KMP_DEBUG
static
#endif /* KMP_DEBUG */
-kmp_int32 __kmp_gomp_to_iomp_cancellation_kind(int gomp_kind) {
+kmp_int32 __kmp_gomp_to_omp_cancellation_kind(int gomp_kind) {
kmp_int32 cncl_kind = 0;
switch(gomp_kind) {
case 1:
@@ -1241,7 +1241,7 @@
MKLOC(loc, "GOMP_cancellation_point");
KA_TRACE(20, ("GOMP_cancellation_point: T#%d\n", gtid));
- kmp_int32 cncl_kind = __kmp_gomp_to_iomp_cancellation_kind(which);
+ kmp_int32 cncl_kind = __kmp_gomp_to_omp_cancellation_kind(which);
return __kmpc_cancellationpoint(&loc, gtid, cncl_kind);
}
@@ -1273,7 +1273,7 @@
MKLOC(loc, "GOMP_cancel");
KA_TRACE(20, ("GOMP_cancel: T#%d\n", gtid));
- kmp_int32 cncl_kind = __kmp_gomp_to_iomp_cancellation_kind(which);
+ kmp_int32 cncl_kind = __kmp_gomp_to_omp_cancellation_kind(which);
if(do_cancel == FALSE) {
return xexpand(KMP_API_NAME_GOMP_CANCELLATION_POINT)(which);
diff --git a/runtime/src/kmp_i18n.c b/runtime/src/kmp_i18n.c
index aacd558..8dad255 100644
--- a/runtime/src/kmp_i18n.c
+++ b/runtime/src/kmp_i18n.c
@@ -89,7 +89,7 @@
#define KMP_I18N_NULLCAT ((nl_catd)( -1 ))
static nl_catd cat = KMP_I18N_NULLCAT; // !!! Shall it be volatile?
-static char const * name = ( KMP_VERSION_MAJOR == 4 ? "libguide.cat" : "libiomp5.cat" );
+static char const * name = ( KMP_VERSION_MAJOR == 4 ? "libguide.cat" : "libomp.cat" );
/*
Useful links:
@@ -258,7 +258,7 @@
#define KMP_I18N_NULLCAT NULL
static HMODULE cat = KMP_I18N_NULLCAT; // !!! Shall it be volatile?
-static char const * name = ( KMP_VERSION_MAJOR == 4 ? "libguide40ui.dll" : "libiomp5ui.dll" );
+static char const * name = ( KMP_VERSION_MAJOR == 4 ? "libguide40ui.dll" : "libompui.dll" );
static kmp_i18n_table_t table = { 0, NULL };
// Messages formatted by FormatMessage() should be freed, but catgets() interface assumes
@@ -400,12 +400,12 @@
// __kmp_i18n_catgets() will not try to open catalog but will return default message.
/*
If message catalog for another architecture found (e.g. OpenMP RTL
- for IA-32 architecture opens libiomp5ui.dll for Intel(R) 64)
+ for IA-32 architecture opens libompui.dll for Intel(R) 64)
Windows* OS returns error 193 (ERROR_BAD_EXE_FORMAT). However,
FormatMessage fails to return a message for this error, so user
will see:
- OMP: Warning #2: Cannot open message catalog "1041\libiomp5ui.dll":
+ OMP: Warning #2: Cannot open message catalog "1041\libompui.dll":
OMP: System error #193: (No system error message available)
OMP: Info #3: Default messages will be used.
@@ -477,7 +477,7 @@
Additional mess comes from message catalog: Our catalog source en_US.mc file (generated by
message-converter.pl) contains only "\n" characters, but en_US_msg_1033.bin file (produced by
mc.exe) may contain "\r\n" or just "\n". This mess goes from en_US_msg_1033.bin file to
- message catalog, libiomp5ui.dll. For example, message
+ message catalog, libompui.dll. For example, message
Error
diff --git a/runtime/src/kmp_import.c b/runtime/src/kmp_import.c
index 1021a61..42fba41 100644
--- a/runtime/src/kmp_import.c
+++ b/runtime/src/kmp_import.c
@@ -15,9 +15,9 @@
/*
------------------------------------------------------------------------------------------------
- Object generated from this source file is linked to Windows* OS DLL import library (libiomp5md.lib)
+ Object generated from this source file is linked to Windows* OS DLL import library (libompmd.lib)
only! It is not a part of regular static or dynamic OpenMP RTL. Any code that just needs to go
- in the libiomp5md.lib (but not in libiomp5mt.lib and libiomp5md.dll) should be placed in this
+ in the libompmd.lib (but not in libompmt.lib and libompmd.dll) should be placed in this
file.
------------------------------------------------------------------------------------------------
*/
diff --git a/runtime/src/kmp_runtime.c b/runtime/src/kmp_runtime.c
index 46a50e0..fd79a6b 100644
--- a/runtime/src/kmp_runtime.c
+++ b/runtime/src/kmp_runtime.c
@@ -5614,7 +5614,7 @@
#if KMP_OS_UNIX && KMP_DYNAMIC_LIB
// 2009-09-08 (lev): It looks the destructor does not work. In simple test cases destructors work
-// perfectly, but in real libiomp5.so I have no evidence it is ever called. However, -fini linker
+// perfectly, but in real libomp.so I have no evidence it is ever called. However, -fini linker
// option in makefile.mk works fine.
__attribute__(( destructor ))
diff --git a/runtime/src/kmp_version.h b/runtime/src/kmp_version.h
index 949c50a..212853b 100644
--- a/runtime/src/kmp_version.h
+++ b/runtime/src/kmp_version.h
@@ -27,7 +27,7 @@
/*
Using "magic" prefix in all the version strings is rather convenient to get static version info
from binaries by using standard utilities "strings" and "grep", e. g.:
- $ strings libiomp5.so | grep "@(#)"
+ $ strings libomp.so | grep "@(#)"
gives clean list of all version strings in the library. Leading zero helps to keep version
string separate from printable characters which may occurs just before version string.
*/
