[Openmp-commits] [PATCH] D145837: [OpenMP] remove obsolete symbol defintions

[Vadim Paretsky via Phabricator via Openmp-commits]

vadikp-intel created this revision.
Herald added subscribers: sunshaoce, guansong, yaxunl.
Herald added a project: All.
vadikp-intel requested review of this revision.
Herald added a reviewer: jdoerfert.
Herald added subscribers: openmp-commits, sstefan1.
Herald added a project: OpenMP.

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).


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D145837

Files:
  openmp/runtime/src/dllexports
  openmp/runtime/src/kmp.h
  openmp/runtime/src/kmp_global.cpp
  openmp/runtime/src/kmp_import.cpp


Index: openmp/runtime/src/kmp_import.cpp
===================================================================
--- 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 //
Index: openmp/runtime/src/kmp_global.cpp
===================================================================
--- openmp/runtime/src/kmp_global.cpp
+++ openmp/runtime/src/kmp_global.cpp
@@ -547,13 +547,6 @@
 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
Index: openmp/runtime/src/kmp.h
===================================================================
--- openmp/runtime/src/kmp.h
+++ openmp/runtime/src/kmp.h
@@ -4184,13 +4184,6 @@
                                              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,
Index: openmp/runtime/src/dllexports
===================================================================
--- openmp/runtime/src/dllexports
+++ 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
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D145837.504315.patch
Type: text/x-patch
Size: 3132 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20230311/59fa3bc0/attachment.bin>