summaryrefslogtreecommitdiff
path: root/openmp/runtime
diff options
context:
space:
mode:
authorVadim Paretsky <b-vadipa@microsoft.com>2023-03-13 10:11:12 -0700
committerVadim Paretsky <b-vadipa@microsoft.com>2023-03-13 10:33:16 -0700
commit8d8cca05a268ee11b50e2347ba16dfc94260071b (patch)
tree1fc7d0ea13c07d4ec07b22d0cde0db6276cb45d0 /openmp/runtime
parenta92eaa3ebee6ff85549e8f1c50da4958dbbdcb30 (diff)
downloadllvm-8d8cca05a268ee11b50e2347ba16dfc94260071b.tar.gz
[OpenMP] remove obsolete symbol defintions
Some globals were used for enforcing certain linking rules in the Intel OpenMP implementation's MSVC compatibility layer and are not applicable to the LLVM implementation (kmp_import.cpp has already been removed from the build). Differential Revision:https://reviews.llvm.org/D145837
Diffstat (limited to 'openmp/runtime')
-rw-r--r--openmp/runtime/src/dllexports3
-rw-r--r--openmp/runtime/src/kmp.h7
-rw-r--r--openmp/runtime/src/kmp_global.cpp7
-rw-r--r--openmp/runtime/src/kmp_import.cpp33
4 files changed, 0 insertions, 50 deletions
diff --git a/openmp/runtime/src/dllexports b/openmp/runtime/src/dllexports
index 991f173b66ab..192668364504 100644
--- a/openmp/runtime/src/dllexports
+++ b/openmp/runtime/src/dllexports
@@ -186,9 +186,6 @@
__kmp_omp_debug_struct_info DATA
%endif
- # Symbols for MS mutual detection:
- _You_must_link_with_exactly_one_OpenMP_library DATA
- _You_must_link_with_Intel_OpenMP_library DATA
__kmp_wait_64
__kmp_release_64
diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h
index 08ce0a4af889..43e723fa7387 100644
--- a/openmp/runtime/src/kmp.h
+++ b/openmp/runtime/src/kmp.h
@@ -4184,13 +4184,6 @@ KMP_EXPORT void *__kmpc_threadprivate_cached(ident_t *loc, kmp_int32 global_tid,
void *data, size_t size,
void ***cache);
-// Symbols for MS mutual detection.
-extern int _You_must_link_with_exactly_one_OpenMP_library;
-extern int _You_must_link_with_Intel_OpenMP_library;
-#if KMP_OS_WINDOWS && (KMP_VERSION_MAJOR > 4)
-extern int _You_must_link_with_Microsoft_OpenMP_library;
-#endif
-
// The routines below are not exported.
// Consider making them 'static' in corresponding source files.
void kmp_threadprivate_insert_private_data(int gtid, void *pc_addr,
diff --git a/openmp/runtime/src/kmp_global.cpp b/openmp/runtime/src/kmp_global.cpp
index b1eca773db1e..0163846b4454 100644
--- a/openmp/runtime/src/kmp_global.cpp
+++ b/openmp/runtime/src/kmp_global.cpp
@@ -547,13 +547,6 @@ int get_suspend_count_(void) {
void set_suspend_count_(int *value) { __kmp_suspend_count = *value; }
#endif
-// Symbols for MS mutual detection.
-int _You_must_link_with_exactly_one_OpenMP_library = 1;
-int _You_must_link_with_Intel_OpenMP_library = 1;
-#if KMP_OS_WINDOWS && (KMP_VERSION_MAJOR > 4)
-int _You_must_link_with_Microsoft_OpenMP_library = 1;
-#endif
-
kmp_target_offload_kind_t __kmp_target_offload = tgt_default;
// OMP Pause Resources
diff --git a/openmp/runtime/src/kmp_import.cpp b/openmp/runtime/src/kmp_import.cpp
deleted file mode 100644
index 39d841d9d468..000000000000
--- a/openmp/runtime/src/kmp_import.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * kmp_import.cpp
- */
-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-/* 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 libompmd.lib (but not in
- libompmt.lib and libompmd.dll) should be placed in this file. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*These symbols are required for mutual exclusion with Microsoft OpenMP RTL
- (and compatibility with MS Compiler). */
-
-int _You_must_link_with_exactly_one_OpenMP_library = 1;
-int _You_must_link_with_Intel_OpenMP_library = 1;
-int _You_must_link_with_Microsoft_OpenMP_library = 1;
-
-#ifdef __cplusplus
-}
-#endif
-
-// end of file //