intermediate changes

ref:cd5650e6e3121abe5e016337114b9d0598256cb5

13 files changed, 667 insertions, 341 deletions

diff --git a/contrib/libs/cxxsupp/openmp/.yandex_meta/devtools.copyrights.report b/contrib/libs/cxxsupp/openmp/.yandex_meta/devtools.copyrights.report
index 9678df6118..16914508a8 100644
--- a/contrib/libs/cxxsupp/openmp/.yandex_meta/devtools.copyrights.report
+++ b/contrib/libs/cxxsupp/openmp/.yandex_meta/devtools.copyrights.report
@@ -28,3 +28,25 @@
 # FILE_IGNORE - ignore file (do nothing)
 # FILE_INCLUDE - include all file data into licenses text file
 # =======================
+
+KEEP     COPYRIGHT_SERVICE_LABEL a45ba012bf883779e8052cbbb4ec2dc9
+BELONGS ya.make
+    License text:
+        Copyright (c) 1997-2014 Intel Corporation
+    Scancode info:
+        Original SPDX id: COPYRIGHT_SERVICE_LABEL
+        Score           : 100.00
+        Match type      : COPYRIGHT
+    Files with this license:
+        LICENSE.txt [54:54]
+
+KEEP     COPYRIGHT_SERVICE_LABEL cdad5d413fb18dfe859c02e52a91e497
+BELONGS ya.make
+    License text:
+        Copyright (c) 1997-2015 Intel Corporation
+    Scancode info:
+        Original SPDX id: COPYRIGHT_SERVICE_LABEL
+        Score           : 100.00
+        Match type      : COPYRIGHT
+    Files with this license:
+        LICENSE.txt [17:17]
diff --git a/contrib/libs/cxxsupp/openmp/.yandex_meta/devtools.licenses.report b/contrib/libs/cxxsupp/openmp/.yandex_meta/devtools.licenses.report
index 7643356c03..46d25816cf 100644
--- a/contrib/libs/cxxsupp/openmp/.yandex_meta/devtools.licenses.report
+++ b/contrib/libs/cxxsupp/openmp/.yandex_meta/devtools.licenses.report
@@ -31,6 +31,7 @@
 
 KEEP     NCSA AND MIT         0791db4b6d90edd44c715bba1e426f74
 BELONGS ya.make
+FILE_INCLUDE LICENSE.txt found in files: kmp.h at line 12, kmp_affinity.cpp at line 11, kmp_affinity.h at line 11, kmp_alloc.c at line 11, kmp_atomic.c at line 11, kmp_atomic.h at line 11, kmp_barrier.cpp at line 11, kmp_cancel.cpp at line 7, kmp_config.h at line 9, kmp_csupport.c at line 11, kmp_debug.c at line 11, kmp_debug.h at line 11, kmp_dispatch.cpp at line 11, kmp_environment.c at line 11, kmp_environment.h at line 11, kmp_error.c at line 11, kmp_error.h at line 11, kmp_ftn_cdecl.c at line 11, kmp_ftn_entry.h at line 11, kmp_ftn_extra.c at line 11, kmp_ftn_os.h at line 11, kmp_global.c at line 11, kmp_gsupport.c at line 11, kmp_i18n.c at line 11, kmp_i18n.h at line 11, kmp_io.c at line 11, kmp_io.h at line 11, kmp_itt.c at line 14, kmp_itt.h at line 12, kmp_itt.inl at line 12, kmp_lock.cpp at line 11, kmp_lock.h at line 11, kmp_os.h at line 11, kmp_platform.h at line 10, kmp_runtime.c at line 11, kmp_safe_c_api.h at line 7, kmp_sched.cpp at line 11, kmp_settings.c at line 11, kmp_settings.h at line 11, kmp_stats.h at line 14, kmp_str.c at line 11, kmp_str.h at line 11, kmp_taskdeps.cpp at line 11, kmp_tasking.c at line 11, kmp_taskq.c at line 11, kmp_threadprivate.c at line 11, kmp_utility.c at line 11, kmp_version.c at line 11, kmp_version.h at line 11, kmp_wait_release.cpp at line 11, kmp_wait_release.h at line 11, kmp_wrapper_getpid.h at line 11, kmp_wrapper_malloc.h at line 12, omp.h at line 11, thirdparty/ittnotify/disable_warnings.h at line 7, thirdparty/ittnotify/ittnotify.h at line 7, thirdparty/ittnotify/ittnotify_config.h at line 7, thirdparty/ittnotify/ittnotify_static.c at line 7, thirdparty/ittnotify/ittnotify_types.h at line 7, thirdparty/ittnotify/legacy/ittnotify.h at line 7, z_Linux_util.c at line 11
     License text:
         // This file is dual licensed under the MIT and the University of Illinois Open
         // Source Licenses. See LICENSE.txt for details.
@@ -40,10 +41,6 @@ BELONGS ya.make
         Match type      : NOTICE
         Links           : http://www.otm.illinois.edu/faculty/forms/opensource.asp, https://spdx.org/licenses/NCSA
     Files with this license:
-        extractExternal.cpp [10:11]
-        include/30/omp.h.var [10:11]
-        include/40/omp.h.var [10:11]
-        include/41/omp.h.var [10:11]
         kmp.h [11:12]
         kmp_affinity.cpp [10:11]
         kmp_affinity.h [10:11]
@@ -56,8 +53,6 @@ BELONGS ya.make
         kmp_csupport.c [10:11]
         kmp_debug.c [10:11]
         kmp_debug.h [10:11]
-        kmp_debugger.c [11:12]
-        kmp_debugger.h [11:12]
         kmp_dispatch.cpp [10:11]
         kmp_environment.c [10:11]
         kmp_environment.h [10:11]
@@ -67,12 +62,10 @@ BELONGS ya.make
         kmp_ftn_entry.h [10:11]
         kmp_ftn_extra.c [10:11]
         kmp_ftn_os.h [10:11]
-        kmp_ftn_stdcall.c [10:11]
         kmp_global.c [10:11]
         kmp_gsupport.c [10:11]
         kmp_i18n.c [10:11]
         kmp_i18n.h [10:11]
-        kmp_import.c [10:11]
         kmp_io.c [10:11]
         kmp_io.h [10:11]
         kmp_itt.c [13:14]
@@ -80,7 +73,6 @@ BELONGS ya.make
         kmp_itt.inl [11:12]
         kmp_lock.cpp [10:11]
         kmp_lock.h [10:11]
-        kmp_omp.h [12:13]
         kmp_os.h [10:11]
         kmp_platform.h [9:10]
         kmp_runtime.c [10:11]
@@ -88,14 +80,9 @@ BELONGS ya.make
         kmp_sched.cpp [10:11]
         kmp_settings.c [10:11]
         kmp_settings.h [10:11]
-        kmp_stats.cpp [10:11]
         kmp_stats.h [13:14]
-        kmp_stats_timing.cpp [10:11]
-        kmp_stats_timing.h [13:14]
         kmp_str.c [10:11]
         kmp_str.h [10:11]
-        kmp_stub.c [10:11]
-        kmp_stub.h [10:11]
         kmp_taskdeps.cpp [10:11]
         kmp_tasking.c [10:11]
         kmp_taskq.c [10:11]
@@ -108,7 +95,6 @@ BELONGS ya.make
         kmp_wrapper_getpid.h [10:11]
         kmp_wrapper_malloc.h [11:12]
         omp.h [10:11]
-        test-touch.c [8:9]
         thirdparty/ittnotify/disable_warnings.h [6:7]
         thirdparty/ittnotify/ittnotify.h [6:7]
         thirdparty/ittnotify/ittnotify_config.h [6:7]
@@ -116,18 +102,12 @@ BELONGS ya.make
         thirdparty/ittnotify/ittnotify_types.h [6:7]
         thirdparty/ittnotify/legacy/ittnotify.h [6:7]
         z_Linux_util.c [10:11]
-        z_Windows_NT-586_util.c [10:11]
-        z_Windows_NT_util.c [10:11]
     Scancode info:
         Original SPDX id: MIT
         Score           : 100.00
         Match type      : NOTICE
         Links           : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
     Files with this license:
-        extractExternal.cpp [10:11]
-        include/30/omp.h.var [10:11]
-        include/40/omp.h.var [10:11]
-        include/41/omp.h.var [10:11]
         kmp.h [11:12]
         kmp_affinity.cpp [10:11]
         kmp_affinity.h [10:11]
@@ -140,8 +120,6 @@ BELONGS ya.make
         kmp_csupport.c [10:11]
         kmp_debug.c [10:11]
         kmp_debug.h [10:11]
-        kmp_debugger.c [11:12]
-        kmp_debugger.h [11:12]
         kmp_dispatch.cpp [10:11]
         kmp_environment.c [10:11]
         kmp_environment.h [10:11]
@@ -151,12 +129,10 @@ BELONGS ya.make
         kmp_ftn_entry.h [10:11]
         kmp_ftn_extra.c [10:11]
         kmp_ftn_os.h [10:11]
-        kmp_ftn_stdcall.c [10:11]
         kmp_global.c [10:11]
         kmp_gsupport.c [10:11]
         kmp_i18n.c [10:11]
         kmp_i18n.h [10:11]
-        kmp_import.c [10:11]
         kmp_io.c [10:11]
         kmp_io.h [10:11]
         kmp_itt.c [13:14]
@@ -164,7 +140,6 @@ BELONGS ya.make
         kmp_itt.inl [11:12]
         kmp_lock.cpp [10:11]
         kmp_lock.h [10:11]
-        kmp_omp.h [12:13]
         kmp_os.h [10:11]
         kmp_platform.h [9:10]
         kmp_runtime.c [10:11]
@@ -172,14 +147,9 @@ BELONGS ya.make
         kmp_sched.cpp [10:11]
         kmp_settings.c [10:11]
         kmp_settings.h [10:11]
-        kmp_stats.cpp [10:11]
         kmp_stats.h [13:14]
-        kmp_stats_timing.cpp [10:11]
-        kmp_stats_timing.h [13:14]
         kmp_str.c [10:11]
         kmp_str.h [10:11]
-        kmp_stub.c [10:11]
-        kmp_stub.h [10:11]
         kmp_taskdeps.cpp [10:11]
         kmp_tasking.c [10:11]
         kmp_taskq.c [10:11]
@@ -192,7 +162,6 @@ BELONGS ya.make
         kmp_wrapper_getpid.h [10:11]
         kmp_wrapper_malloc.h [11:12]
         omp.h [10:11]
-        test-touch.c [8:9]
         thirdparty/ittnotify/disable_warnings.h [6:7]
         thirdparty/ittnotify/ittnotify.h [6:7]
         thirdparty/ittnotify/ittnotify_config.h [6:7]
@@ -200,11 +169,35 @@ BELONGS ya.make
         thirdparty/ittnotify/ittnotify_types.h [6:7]
         thirdparty/ittnotify/legacy/ittnotify.h [6:7]
         z_Linux_util.c [10:11]
-        z_Windows_NT-586_util.c [10:11]
-        z_Windows_NT_util.c [10:11]
+
+KEEP     NCSA AND MIT         1046d955b73b76a5985bad28cebed867
+BELONGS ya.make
+    Note: matched license text is too long. Read it in the source files.
+    Scancode info:
+        Original SPDX id: NCSA
+        Score           : 100.00
+        Match type      : NOTICE
+        Links           : http://www.otm.illinois.edu/faculty/forms/opensource.asp, https://spdx.org/licenses/NCSA
+    Files with this license:
+        LICENSE.txt [3:10]
+    Scancode info:
+        Original SPDX id: MIT
+        Score           : 100.00
+        Match type      : NOTICE
+        Links           : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
+    Files with this license:
+        LICENSE.txt [3:10]
+    Scancode info:
+        Original SPDX id: LicenseRef-scancode-generic-cla
+        Score           : 100.00
+        Match type      : NOTICE
+        Links           : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/generic-cla.LICENSE
+    Files with this license:
+        LICENSE.txt [3:10]
 
 KEEP     NCSA AND MIT         479de2cae020eacfac58212c03d33ab1
 BELONGS ya.make
+FILE_INCLUDE LICENSE.txt found in files: thirdparty/ittnotify/ittnotify_static.h at line 7
     License text:
         // This file is dual licensed under the MIT and the University of Illinois Open
         // Source Licenses. See LICENSE.txt for details.
@@ -223,8 +216,20 @@ BELONGS ya.make
     Files with this license:
         thirdparty/ittnotify/ittnotify_static.h [6:7]
 
+KEEP     MIT                  5debb370f50e1dfd24ff5144233a2ef6
+BELONGS ya.make
+    Note: matched license text is too long. Read it in the source files.
+    Scancode info:
+        Original SPDX id: MIT
+        Score           : 100.00
+        Match type      : TEXT
+        Links           : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
+    Files with this license:
+        LICENSE.txt [56:72]
+
 KEEP     NCSA AND MIT         61ab203794bd26e0aab2c6b954e30d9a
 BELONGS ya.make
+FILE_INCLUDE LICENSE.txt found in files: z_Linux_asm.s at line 10
     License text:
         //// This file is dual licensed under the MIT and the University of Illinois Open
         //// Source Licenses. See LICENSE.txt for details.
@@ -234,7 +239,6 @@ BELONGS ya.make
         Match type      : NOTICE
         Links           : http://www.otm.illinois.edu/faculty/forms/opensource.asp, https://spdx.org/licenses/NCSA
     Files with this license:
-        libomp.rc.var [8:9]
         z_Linux_asm.s [9:10]
     Scancode info:
         Original SPDX id: MIT
@@ -242,67 +246,46 @@ BELONGS ya.make
         Match type      : NOTICE
         Links           : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
     Files with this license:
-        libomp.rc.var [8:9]
         z_Linux_asm.s [9:10]
 
-KEEP     NCSA AND MIT         9d5ffd6253d2b406a8bc3bbf3cb4f38b
+KEEP     NCSA                 6caabae7bd314fb6e6055ec150ee747f
 BELONGS ya.make
-    License text:
-        !// This file is dual licensed under the MIT and the University of Illinois Open
-        !// Source Licenses. See LICENSE.txt for details.
+    Note: matched license text is too long. Read it in the source files.
     Scancode info:
         Original SPDX id: NCSA
-        Score           : 100.00
-        Match type      : NOTICE
+        Score           : 99.55
+        Match type      : TEXT
         Links           : http://www.otm.illinois.edu/faculty/forms/opensource.asp, https://spdx.org/licenses/NCSA
     Files with this license:
-        include/30/omp_lib.f.var [8:9]
-        include/30/omp_lib.f90.var [8:9]
-        include/30/omp_lib.h.var [8:9]
-        include/40/omp_lib.f.var [8:9]
-        include/40/omp_lib.f90.var [8:9]
-        include/40/omp_lib.h.var [8:9]
-        include/41/omp_lib.f.var [8:9]
-        include/41/omp_lib.f90.var [8:9]
-        include/41/omp_lib.h.var [8:9]
-    Scancode info:
-        Original SPDX id: MIT
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
-    Files with this license:
-        include/30/omp_lib.f.var [8:9]
-        include/30/omp_lib.f90.var [8:9]
-        include/30/omp_lib.h.var [8:9]
-        include/40/omp_lib.f.var [8:9]
-        include/40/omp_lib.f90.var [8:9]
-        include/40/omp_lib.h.var [8:9]
-        include/41/omp_lib.f.var [8:9]
-        include/41/omp_lib.f90.var [8:9]
-        include/41/omp_lib.h.var [8:9]
+        LICENSE.txt [26:50]
 
-KEEP     NCSA AND MIT         d2725783fa0a2f24d855943aac3dbdf9
+KEEP     NCSA                 c26d0b72f92421989c4471ae0acbc943
 BELONGS ya.make
     License text:
-        ;// This file is dual licensed under the MIT and the University of Illinois Open
-        ;// Source Licenses. See LICENSE.txt for details.
+        University of Illinois/NCSA
+        Open Source License
     Scancode info:
         Original SPDX id: NCSA
         Score           : 100.00
-        Match type      : NOTICE
+        Match type      : REFERENCE
         Links           : http://www.otm.illinois.edu/faculty/forms/opensource.asp, https://spdx.org/licenses/NCSA
     Files with this license:
-        z_Windows_NT-586_asm.asm [9:10]
+        LICENSE.txt [14:15]
+
+KEEP     Intel-LLVM-SGA       d5a6528c4e206fd72c16045a75e34576
+BELONGS ya.make
+    Note: matched license text is too long. Read it in the source files.
     Scancode info:
-        Original SPDX id: MIT
-        Score           : 100.00
-        Match type      : NOTICE
-        Links           : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
+        Original SPDX id: LicenseRef-scancode-arm-llvm-sga
+        Score           : 99.00
+        Match type      : TEXT
+        Links           : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/arm-llvm-sga.LICENSE
     Files with this license:
-        z_Windows_NT-586_asm.asm [9:10]
+        LICENSE.txt [78:122]
 
 KEEP     NCSA AND MIT         e56769dac6aaa0678164025adda8a1da
 BELONGS ya.make
+FILE_INCLUDE LICENSE.txt found in files: exports_so.txt at line 9
     License text:
         \#// This file is dual licensed under the MIT and the University of Illinois Open
         \#// Source Licenses. See LICENSE.txt for details.
@@ -312,11 +295,11 @@ BELONGS ya.make
         Match type      : NOTICE
         Links           : http://www.otm.illinois.edu/faculty/forms/opensource.asp, https://spdx.org/licenses/NCSA
     Files with this license:
-        i18n/en_US.txt [8:9]
+        exports_so.txt [8:9]
     Scancode info:
         Original SPDX id: MIT
         Score           : 100.00
         Match type      : NOTICE
         Links           : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
     Files with this license:
-        i18n/en_US.txt [8:9]
+        exports_so.txt [8:9]
diff --git a/contrib/libs/cxxsupp/openmp/.yandex_meta/licenses.list.txt b/contrib/libs/cxxsupp/openmp/.yandex_meta/licenses.list.txt
index 9276ae1ece..5ac3a3561b 100644
--- a/contrib/libs/cxxsupp/openmp/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/cxxsupp/openmp/.yandex_meta/licenses.list.txt
@@ -1,6 +1,237 @@
-====================NCSA AND MIT====================
-!// This file is dual licensed under the MIT and the University of Illinois Open
-!// Source Licenses. See LICENSE.txt for details.
+====================COPYRIGHT====================
+Copyright (c) 1997-2014 Intel Corporation
+
+
+====================COPYRIGHT====================
+Copyright (c) 1997-2015 Intel Corporation
+
+
+====================File: LICENSE.txt====================
+==============================================================================
+
+The software contained in this directory tree is dual licensed under both the
+University of Illinois "BSD-Like" license and the MIT license.  As a user of
+this code you may choose to use it under either license.  As a contributor,
+you agree to allow your code to be used under both.  The full text of the
+relevant licenses is included below.
+
+In addition, a license agreement from the copyright/patent holders of the
+software contained in this directory tree is included below.
+
+==============================================================================
+
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 1997-2015 Intel Corporation
+
+All rights reserved.
+
+Developed by:
+    OpenMP Runtime Team
+    Intel Corporation
+    http://www.openmprtl.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of Intel Corporation OpenMP Runtime Team nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this Software without specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+
+Copyright (c) 1997-2014 Intel Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+==============================================================================
+
+Intel Corporation
+
+Software Grant License Agreement ("Agreement")
+
+Except for the license granted herein to you, Intel Corporation ("Intel") reserves
+all right, title, and interest in and to the Software (defined below).
+
+Definition
+
+"Software" means the code and documentation as well as any original work of
+authorship, including any modifications or additions to an existing work, that
+is intentionally submitted by Intel to llvm.org (http://llvm.org) ("LLVM") for
+inclusion in, or documentation of, any of the products owned or managed by LLVM
+(the "Work"). For the purposes of this definition, "submitted" means any form of
+electronic, verbal, or written communication sent to LLVM or its
+representatives, including but not limited to communication on electronic
+mailing lists, source code control systems, and issue tracking systems that are
+managed by, or on behalf of, LLVM for the purpose of discussing and improving
+the Work, but excluding communication that is conspicuously marked otherwise.
+
+1. Grant of Copyright License. Subject to the terms and conditions of this
+   Agreement, Intel hereby grants to you and to recipients of the Software
+   distributed by LLVM a perpetual, worldwide, non-exclusive, no-charge,
+   royalty-free, irrevocable copyright license to reproduce, prepare derivative
+   works of, publicly display, publicly perform, sublicense, and distribute the
+   Software and such derivative works.
+
+2. Grant of Patent License. Subject to the terms and conditions of this
+   Agreement, Intel hereby grants you and to recipients of the Software
+   distributed by LLVM a perpetual, worldwide, non-exclusive, no-charge,
+   royalty-free, irrevocable (except as stated in this section) patent license
+   to make, have made, use, offer to sell, sell, import, and otherwise transfer
+   the Work, where such license applies only to those patent claims licensable
+   by Intel that are necessarily infringed by Intel's Software alone or by
+   combination of the Software with the Work to which such Software was
+   submitted. If any entity institutes patent litigation against Intel or any
+   other entity (including a cross-claim or counterclaim in a lawsuit) alleging
+   that Intel's Software, or the Work to which Intel has contributed constitutes
+   direct or contributory patent infringement, then any patent licenses granted
+   to that entity under this Agreement for the Software or Work shall terminate
+   as of the date such litigation is filed.
+
+Unless required by applicable law or agreed to in writing, the software is
+provided on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+either express or implied, including, without limitation, any warranties or
+conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE.
+
+==============================================================================
+
+
+====================Intel-LLVM-SGA====================
+Software Grant License Agreement ("Agreement")
+
+Except for the license granted herein to you, Intel Corporation ("Intel") reserves
+all right, title, and interest in and to the Software (defined below).
+
+Definition
+
+"Software" means the code and documentation as well as any original work of
+authorship, including any modifications or additions to an existing work, that
+is intentionally submitted by Intel to llvm.org (http://llvm.org) ("LLVM") for
+inclusion in, or documentation of, any of the products owned or managed by LLVM
+(the "Work"). For the purposes of this definition, "submitted" means any form of
+electronic, verbal, or written communication sent to LLVM or its
+representatives, including but not limited to communication on electronic
+mailing lists, source code control systems, and issue tracking systems that are
+managed by, or on behalf of, LLVM for the purpose of discussing and improving
+the Work, but excluding communication that is conspicuously marked otherwise.
+
+1. Grant of Copyright License. Subject to the terms and conditions of this
+   Agreement, Intel hereby grants to you and to recipients of the Software
+   distributed by LLVM a perpetual, worldwide, non-exclusive, no-charge,
+   royalty-free, irrevocable copyright license to reproduce, prepare derivative
+   works of, publicly display, publicly perform, sublicense, and distribute the
+   Software and such derivative works.
+
+2. Grant of Patent License. Subject to the terms and conditions of this
+   Agreement, Intel hereby grants you and to recipients of the Software
+   distributed by LLVM a perpetual, worldwide, non-exclusive, no-charge,
+   royalty-free, irrevocable (except as stated in this section) patent license
+   to make, have made, use, offer to sell, sell, import, and otherwise transfer
+   the Work, where such license applies only to those patent claims licensable
+   by Intel that are necessarily infringed by Intel's Software alone or by
+   combination of the Software with the Work to which such Software was
+   submitted. If any entity institutes patent litigation against Intel or any
+   other entity (including a cross-claim or counterclaim in a lawsuit) alleging
+   that Intel's Software, or the Work to which Intel has contributed constitutes
+   direct or contributory patent infringement, then any patent licenses granted
+   to that entity under this Agreement for the Software or Work shall terminate
+   as of the date such litigation is filed.
+
+Unless required by applicable law or agreed to in writing, the software is
+provided on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+either express or implied, including, without limitation, any warranties or
+conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE.
+
+
+====================MIT====================
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+====================NCSA====================
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of Intel Corporation OpenMP Runtime Team nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this Software without specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+
+====================NCSA====================
+University of Illinois/NCSA
+Open Source License
 
 
 ====================NCSA AND MIT====================
@@ -19,5 +250,11 @@
 
 
 ====================NCSA AND MIT====================
-;// This file is dual licensed under the MIT and the University of Illinois Open
-;// Source Licenses. See LICENSE.txt for details.
+The software contained in this directory tree is dual licensed under both the
+University of Illinois "BSD-Like" license and the MIT license.  As a user of
+this code you may choose to use it under either license.  As a contributor,
+you agree to allow your code to be used under both.  The full text of the
+relevant licenses is included below.
+
+In addition, a license agreement from the copyright/patent holders of the
+software contained in this directory tree is included below.
diff --git a/contrib/libs/cxxsupp/openmp/CREDITS.txt b/contrib/libs/cxxsupp/openmp/CREDITS.txt
new file mode 100644
index 0000000000..781da21e57
--- /dev/null
+++ b/contrib/libs/cxxsupp/openmp/CREDITS.txt
@@ -0,0 +1,53 @@
+This file is a partial list of people who have contributed to the LLVM/openmp
+project.  If you have contributed a patch or made some other contribution to
+LLVM/openmp, please submit a patch to this file to add yourself, and it will be
+done!
+
+The list is sorted by surname and formatted to allow easy grepping and
+beautification by scripts.  The fields are: name (N), email (E), web-address
+(W), PGP key ID and fingerprint (P), description (D), and snail-mail address
+(S).
+
+N: Carlo Bertolli
+W: http://ibm.com
+D: IBM contributor to PowerPC support in CMake files and elsewhere.
+
+N: Sunita Chandrasekaran
+D: Contributor to testsuite from OpenUH
+
+N: Barbara Chapman
+D: Contributor to testsuite from OpenUH
+
+N: University of Houston 
+W: http://web.cs.uh.edu/~openuh/download/
+D: OpenUH test suite
+
+N: Intel Corporation OpenMP runtime team
+W: http://openmprtl.org
+D: Created the runtime.
+
+N: John Mellor-Crummey and other members of the OpenMP Tools Working Group
+E: johnmc@rice.edu
+D: OpenMP Tools Interface (OMPT)
+
+N: Matthias Muller
+D: Contributor to testsuite from OpenUH
+
+N: Tal Nevo
+E: tal@scalemp.com
+D: ScaleMP contributor to improve runtime performance there.
+W: http://scalemp.com
+
+N: Pavel Neytchev
+D: Contributor to testsuite from OpenUH
+
+N: Steven Noonan
+E: steven@uplinklabs.net
+D: Patches for the ARM architecture and removal of several inconsistencies.
+
+N: Alp Toker
+E: alp@nuanti.com
+D: Making build work for FreeBSD.
+
+N: Cheng Wang 
+D: Contributor to testsuite from OpenUH
diff --git a/contrib/libs/cxxsupp/openmp/LICENSE.txt b/contrib/libs/cxxsupp/openmp/LICENSE.txt
new file mode 100644
index 0000000000..97dc20c1eb
--- /dev/null
+++ b/contrib/libs/cxxsupp/openmp/LICENSE.txt
@@ -0,0 +1,124 @@
+==============================================================================
+
+The software contained in this directory tree is dual licensed under both the
+University of Illinois "BSD-Like" license and the MIT license.  As a user of
+this code you may choose to use it under either license.  As a contributor,
+you agree to allow your code to be used under both.  The full text of the
+relevant licenses is included below.
+
+In addition, a license agreement from the copyright/patent holders of the
+software contained in this directory tree is included below.
+
+==============================================================================
+
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 1997-2015 Intel Corporation
+
+All rights reserved.
+
+Developed by:
+    OpenMP Runtime Team
+    Intel Corporation
+    http://www.openmprtl.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of Intel Corporation OpenMP Runtime Team nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this Software without specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+
+Copyright (c) 1997-2014 Intel Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+==============================================================================
+
+Intel Corporation
+
+Software Grant License Agreement ("Agreement")
+
+Except for the license granted herein to you, Intel Corporation ("Intel") reserves
+all right, title, and interest in and to the Software (defined below).
+
+Definition
+
+"Software" means the code and documentation as well as any original work of
+authorship, including any modifications or additions to an existing work, that
+is intentionally submitted by Intel to llvm.org (http://llvm.org) ("LLVM") for
+inclusion in, or documentation of, any of the products owned or managed by LLVM
+(the "Work"). For the purposes of this definition, "submitted" means any form of
+electronic, verbal, or written communication sent to LLVM or its
+representatives, including but not limited to communication on electronic
+mailing lists, source code control systems, and issue tracking systems that are
+managed by, or on behalf of, LLVM for the purpose of discussing and improving
+the Work, but excluding communication that is conspicuously marked otherwise.
+
+1. Grant of Copyright License. Subject to the terms and conditions of this
+   Agreement, Intel hereby grants to you and to recipients of the Software
+   distributed by LLVM a perpetual, worldwide, non-exclusive, no-charge,
+   royalty-free, irrevocable copyright license to reproduce, prepare derivative
+   works of, publicly display, publicly perform, sublicense, and distribute the
+   Software and such derivative works.
+
+2. Grant of Patent License. Subject to the terms and conditions of this
+   Agreement, Intel hereby grants you and to recipients of the Software
+   distributed by LLVM a perpetual, worldwide, non-exclusive, no-charge,
+   royalty-free, irrevocable (except as stated in this section) patent license
+   to make, have made, use, offer to sell, sell, import, and otherwise transfer
+   the Work, where such license applies only to those patent claims licensable
+   by Intel that are necessarily infringed by Intel's Software alone or by
+   combination of the Software with the Work to which such Software was
+   submitted. If any entity institutes patent litigation against Intel or any
+   other entity (including a cross-claim or counterclaim in a lawsuit) alleging
+   that Intel's Software, or the Work to which Intel has contributed constitutes
+   direct or contributory patent infringement, then any patent licenses granted
+   to that entity under this Agreement for the Software or Work shall terminate
+   as of the date such litigation is filed.
+
+Unless required by applicable law or agreed to in writing, the software is
+provided on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+either express or implied, including, without limitation, any warranties or
+conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE.
+
+==============================================================================
diff --git a/contrib/libs/cxxsupp/openmp/exports_so.txt b/contrib/libs/cxxsupp/openmp/exports_so.txt
new file mode 100644
index 0000000000..27c20abcd7
--- /dev/null
+++ b/contrib/libs/cxxsupp/openmp/exports_so.txt
@@ -0,0 +1,134 @@
+# exports_so.txt #
+
+#
+#//===----------------------------------------------------------------------===//
+#//
+#//                     The LLVM Compiler Infrastructure
+#//
+#// This file is dual licensed under the MIT and the University of Illinois Open
+#// Source Licenses. See LICENSE.txt for details.
+#//
+#//===----------------------------------------------------------------------===//
+#
+
+# This is version script for OMP RTL shared library (libomp*.so)
+
+VERSION {
+
+    global: # Exported symbols.
+
+        #
+        # "Normal" symbols.
+        #
+        omp_*;     # Standard OpenMP functions.
+
+        #
+        # OMPT API
+        #
+        ompt_tool;           # OMPT initialization interface
+        ompt_control;        # OMPT control interface
+        
+        #
+        # OMPT state placeholders
+        #
+        ompt_idle;
+        ompt_overhead;
+        ompt_barrier_wait;
+        ompt_task_wait;
+        ompt_mutex_wait;
+
+        ompc_*;    # omp.h renames some standard functions to ompc_*.
+        kmp_*;     # Intel extensions.
+        kmpc_*;    # Intel extensions.
+        __kmpc_*;  # Functions called by compiler-generated code.
+        GOMP_*;    # GNU C compatibility functions.
+
+        _You_must_link_with_*;     # Mutual detection/MS compatibility symbols.
+
+
+        #
+        # Debugger support.
+        #
+#if USE_DEBUGGER
+        __kmp_debugging;
+        __kmp_omp_debug_struct_info;
+#endif /* USE_DEBUGGER */
+
+        #
+        # Internal functions exported for testing purposes.
+        #
+        __kmp_get_reduce_method;
+        ___kmp_allocate;
+        ___kmp_free;
+        __kmp_thread_pool;
+        __kmp_thread_pool_nth;
+
+	__kmp_reset_stats;
+
+#if USE_ITT_BUILD
+        #
+        # ITT support.
+        #
+        # The following entry points are added so that the backtraces from
+        # the tools contain meaningful names for all the functions that might
+        # appear in a backtrace of a thread which is blocked in the RTL.
+        __kmp_acquire_drdpa_lock;
+        __kmp_acquire_nested_drdpa_lock;
+        __kmp_acquire_nested_queuing_lock;
+        __kmp_acquire_nested_tas_lock;
+        __kmp_acquire_nested_ticket_lock;
+        __kmp_acquire_queuing_lock;
+        __kmp_acquire_tas_lock;
+        __kmp_acquire_ticket_lock;
+        __kmp_fork_call;
+        __kmp_get_reduce_method;
+        __kmp_invoke_microtask;
+        __kmp_itt_fini_ittlib;
+        __kmp_itt_init_ittlib;
+        __kmp_launch_monitor;
+        __kmp_launch_worker;
+        __kmp_reap_monitor;
+        __kmp_reap_worker;
+        __kmp_release_32;
+        __kmp_release_64;
+        __kmp_release_oncore;
+        __kmp_wait_32;
+        __kmp_wait_64;
+        __kmp_wait_oncore;
+        __kmp_wait_yield_4;
+        __kmp_wait_yield_8;
+
+        # ittnotify symbols to be used by debugger
+        __kmp_itt_fini_ittlib;
+        __kmp_itt_init_ittlib;
+#endif /* USE_ITT_BUILD */
+
+    local: # Non-exported symbols.
+
+        *;         # All other symbols are not exported.
+
+}; # VERSION
+
+# sets up GCC OMP_ version dependency chain
+OMP_1.0 {
+};
+OMP_2.0 {
+} OMP_1.0;
+OMP_3.0 {
+} OMP_2.0;
+OMP_3.1 {
+} OMP_3.0;
+OMP_4.0 {
+} OMP_3.1;
+
+# sets up GCC GOMP_ version dependency chain
+GOMP_1.0 {
+};
+GOMP_2.0 {
+} GOMP_1.0;
+GOMP_3.0 {
+} GOMP_2.0;
+GOMP_4.0 {
+} GOMP_3.0;
+
+# end of file #
diff --git a/contrib/libs/cxxsupp/openmp/kmp_i18n_default.inc b/contrib/libs/cxxsupp/openmp/kmp_i18n_default.inc
index 0a1aa74adf..a81671da06 100644
--- a/contrib/libs/cxxsupp/openmp/kmp_i18n_default.inc
+++ b/contrib/libs/cxxsupp/openmp/kmp_i18n_default.inc
@@ -1,5 +1,5 @@
 // Do not edit this file! //
-// The file was generated from en_US.txt by message-converter.pl on Fri Dec 18 12:25:36 2015. //
+// The file was generated from en_US.txt by message-converter.pl. //
 
 static char const *
 __kmp_i18n_default_meta[] =
diff --git a/contrib/libs/cxxsupp/openmp/kmp_i18n_id.inc b/contrib/libs/cxxsupp/openmp/kmp_i18n_id.inc
index 5de276377c..63e3208898 100644
--- a/contrib/libs/cxxsupp/openmp/kmp_i18n_id.inc
+++ b/contrib/libs/cxxsupp/openmp/kmp_i18n_id.inc
@@ -1,5 +1,5 @@
 // Do not edit this file! //
-// The file was generated from en_US.txt by message-converter.pl on Fri Dec 18 12:25:36 2015. //
+// The file was generated from en_US.txt by message-converter.pl. //
 
 enum kmp_i18n_id {
 
diff --git a/contrib/libs/cxxsupp/openmp/kmp_omp.h b/contrib/libs/cxxsupp/openmp/kmp_omp.h
deleted file mode 100644
index fc4de0f236..0000000000
--- a/contrib/libs/cxxsupp/openmp/kmp_omp.h
+++ /dev/null
@@ -1,233 +0,0 @@
-#if USE_DEBUGGER
-/*
- * kmp_omp.h -- OpenMP definition for kmp_omp_struct_info_t.
- *              This is for information about runtime library structures.
- */
-
-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.txt for details.
-//
-//===----------------------------------------------------------------------===//
-
-
-/* THIS FILE SHOULD NOT BE MODIFIED IN IDB INTERFACE LIBRARY CODE
- * It should instead be modified in the OpenMP runtime and copied
- * to the interface library code.  This way we can minimize the
- * problems that this is sure to cause having two copies of the
- * same file.
- *
- * files live in libomp and libomp_db/src/include
- */
-
-/* CHANGE THIS WHEN STRUCTURES BELOW CHANGE
- * Before we release this to a customer, please don't change this value.  After it is released and
- * stable, then any new updates to the structures or data structure traversal algorithms need to
- * change this value.
- */
-#define KMP_OMP_VERSION 9
-
-typedef struct {
-    kmp_int32  offset;
-    kmp_int32  size;
-} offset_and_size_t;
-
-typedef struct {
-    kmp_uint64    addr;
-    kmp_int32     size;
-    kmp_int32     padding;
-} addr_and_size_t;
-
-typedef struct {
-    kmp_uint64   flags;         // Flags for future extensions.
-    kmp_uint64   file;          // Pointer to name of source file where the parallel region is.
-    kmp_uint64   func;          // Pointer to name of routine where the parallel region is.
-    kmp_int32    begin;         // Beginning of source line range.
-    kmp_int32    end;           // End of source line range.
-    kmp_int32    num_threads;   // Specified number of threads.
-} kmp_omp_nthr_item_t;
-
-typedef struct {
-    kmp_int32     num;          // Number of items in the arrray.
-    kmp_uint64    array;        // Address of array of kmp_omp_num_threads_item_t.
-} kmp_omp_nthr_info_t;
-
-
-/* This structure is known to the idb interface library */
-typedef struct {
-
-    /* Change this only if you make a fundamental data structure change here */
-    kmp_int32          lib_version;
-
-    /* sanity check.  Only should be checked if versions are identical
-     * This is also used for backward compatibility to get the runtime
-     * structure size if it the runtime is older than the interface */
-    kmp_int32          sizeof_this_structure;
-
-    /* OpenMP RTL version info. */
-    addr_and_size_t    major;
-    addr_and_size_t    minor;
-    addr_and_size_t    build;
-    addr_and_size_t    openmp_version;
-    addr_and_size_t    banner;
-
-    /* Various globals. */
-    addr_and_size_t  threads;            // Pointer to __kmp_threads.
-    addr_and_size_t  roots;              // Pointer to __kmp_root.
-    addr_and_size_t  capacity;           // Pointer to __kmp_threads_capacity.
-    addr_and_size_t  monitor;            // Pointer to __kmp_monitor.
-#if ! KMP_USE_DYNAMIC_LOCK
-    addr_and_size_t  lock_table;         // Pointer to __kmp_lock_table.
-#endif
-    addr_and_size_t  func_microtask;
-    addr_and_size_t  func_fork;
-    addr_and_size_t  func_fork_teams;
-    addr_and_size_t  team_counter;
-    addr_and_size_t  task_counter;
-    addr_and_size_t  nthr_info;
-    kmp_int32        address_width;
-    kmp_int32        indexed_locks;
-    kmp_int32        last_barrier;       // The end in enum barrier_type
-    kmp_int32        deque_size;         // TASK_DEQUE_SIZE
-
-    /* thread structure information. */
-    kmp_int32          th_sizeof_struct;
-    offset_and_size_t  th_info;          // descriptor for thread
-    offset_and_size_t  th_team;          // team for this thread
-    offset_and_size_t  th_root;          // root for this thread
-    offset_and_size_t  th_serial_team;   // serial team under this thread
-    offset_and_size_t  th_ident;         // location for this thread (if available)
-    offset_and_size_t  th_spin_here;     // is thread waiting for lock (if available)
-    offset_and_size_t  th_next_waiting;  // next thread waiting for lock (if available)
-    offset_and_size_t  th_task_team;     // task team struct
-    offset_and_size_t  th_current_task;  // innermost task being executed
-    offset_and_size_t  th_task_state;    // alternating 0/1 for task team identification
-    offset_and_size_t  th_bar;
-    offset_and_size_t  th_b_worker_arrived; // the worker increases it by 1 when it arrives to the barrier
-
-#if OMP_40_ENABLED
-    /* teams information */
-    offset_and_size_t th_teams_microtask;// entry address for teams construct
-    offset_and_size_t th_teams_level;    // initial level of teams construct
-    offset_and_size_t th_teams_nteams;   // number of teams in a league
-    offset_and_size_t th_teams_nth;      // number of threads in each team of the league
-#endif
-
-    /* kmp_desc structure (for info field above) */
-    kmp_int32          ds_sizeof_struct;
-    offset_and_size_t  ds_tid;           // team thread id
-    offset_and_size_t  ds_gtid;          // global thread id
-    offset_and_size_t  ds_thread;        // native thread id
-
-    /* team structure information */
-    kmp_int32          t_sizeof_struct;
-    offset_and_size_t  t_master_tid;     // tid of master in parent team
-    offset_and_size_t  t_ident;          // location of parallel region
-    offset_and_size_t  t_parent;         // parent team
-    offset_and_size_t  t_nproc;          // # team threads
-    offset_and_size_t  t_threads;        // array of threads
-    offset_and_size_t  t_serialized;     // # levels of serialized teams
-    offset_and_size_t  t_id;             // unique team id
-    offset_and_size_t  t_pkfn;
-    offset_and_size_t  t_task_team;      // task team structure
-    offset_and_size_t  t_implicit_task;  // taskdata for the thread's implicit task
-#if OMP_40_ENABLED
-    offset_and_size_t  t_cancel_request;
-#endif
-    offset_and_size_t  t_bar;
-    offset_and_size_t  t_b_master_arrived; // increased by 1 when master arrives to a barrier
-    offset_and_size_t  t_b_team_arrived;   // increased by one when all the threads arrived
-
-    /* root structure information */
-    kmp_int32          r_sizeof_struct;
-    offset_and_size_t  r_root_team;      // team at root
-    offset_and_size_t  r_hot_team;       // hot team for this root
-    offset_and_size_t  r_uber_thread;    // root thread
-    offset_and_size_t  r_root_id;        // unique root id (if available)
-
-    /* ident structure information */
-    kmp_int32          id_sizeof_struct;
-    offset_and_size_t  id_psource;       /* address of string ";file;func;line1;line2;;". */
-    offset_and_size_t  id_flags;
-
-    /* lock structure information */
-    kmp_int32          lk_sizeof_struct;
-    offset_and_size_t  lk_initialized;
-    offset_and_size_t  lk_location;
-    offset_and_size_t  lk_tail_id;
-    offset_and_size_t  lk_head_id;
-    offset_and_size_t  lk_next_ticket;
-    offset_and_size_t  lk_now_serving;
-    offset_and_size_t  lk_owner_id;
-    offset_and_size_t  lk_depth_locked;
-    offset_and_size_t  lk_lock_flags;
-
-#if ! KMP_USE_DYNAMIC_LOCK
-    /* lock_table_t */
-    kmp_int32          lt_size_of_struct;    /* Size and layout of kmp_lock_table_t. */
-    offset_and_size_t  lt_used;
-    offset_and_size_t  lt_allocated;
-    offset_and_size_t  lt_table;
-#endif
-
-    /* task_team_t */
-    kmp_int32          tt_sizeof_struct;
-    offset_and_size_t  tt_threads_data;
-    offset_and_size_t  tt_found_tasks;
-    offset_and_size_t  tt_nproc;
-    offset_and_size_t  tt_unfinished_threads;
-    offset_and_size_t  tt_active;
-
-    /* kmp_taskdata_t */
-    kmp_int32          td_sizeof_struct;
-    offset_and_size_t  td_task_id;                  // task id
-    offset_and_size_t  td_flags;                    // task flags
-    offset_and_size_t  td_team;                     // team for this task
-    offset_and_size_t  td_parent;                   // parent task
-    offset_and_size_t  td_level;                    // task testing level
-    offset_and_size_t  td_ident;                    // task identifier
-    offset_and_size_t  td_allocated_child_tasks;    // child tasks (+ current task) not yet deallocated
-    offset_and_size_t  td_incomplete_child_tasks;   // child tasks not yet complete
-
-    /* Taskwait */
-    offset_and_size_t  td_taskwait_ident;
-    offset_and_size_t  td_taskwait_counter;
-    offset_and_size_t  td_taskwait_thread;          // gtid + 1 of thread encountered taskwait
-
-#if OMP_40_ENABLED
-    /* Taskgroup */
-    offset_and_size_t  td_taskgroup;                // pointer to the current taskgroup
-    offset_and_size_t  td_task_count;               // number of allocated and not yet complete tasks
-    offset_and_size_t  td_cancel;                   // request for cancellation of this taskgroup
-
-    /* Task dependency */
-    offset_and_size_t  td_depnode;                  // pointer to graph node if the task has dependencies
-    offset_and_size_t  dn_node;
-    offset_and_size_t  dn_next;
-    offset_and_size_t  dn_successors;
-    offset_and_size_t  dn_task;
-    offset_and_size_t  dn_npredecessors;
-    offset_and_size_t  dn_nrefs;
-#endif
-    offset_and_size_t  dn_routine;
-
-    /* kmp_thread_data_t */
-    kmp_int32          hd_sizeof_struct;
-    offset_and_size_t  hd_deque;
-    offset_and_size_t  hd_deque_head;
-    offset_and_size_t  hd_deque_tail;
-    offset_and_size_t  hd_deque_ntasks;
-    offset_and_size_t  hd_deque_last_stolen;
-
-    // The last field of stable version.
-    kmp_uint64         last_field;
-
-} kmp_omp_struct_info_t;
-
-#endif /* USE_DEBUGGER */
-
-/* end of file */
diff --git a/contrib/libs/cxxsupp/openmp/kmp_runtime.c b/contrib/libs/cxxsupp/openmp/kmp_runtime.c
index c5247d80cf..45b3740939 100644
--- a/contrib/libs/cxxsupp/openmp/kmp_runtime.c
+++ b/contrib/libs/cxxsupp/openmp/kmp_runtime.c
@@ -38,6 +38,7 @@
 #include <process.h>
 #endif
 
+
 #if defined(KMP_GOMP_COMPAT)
 char const __kmp_version_alt_comp[] = KMP_VERSION_PREFIX "alternative compiler support: yes";
 #endif /* defined(KMP_GOMP_COMPAT) */
diff --git a/contrib/libs/cxxsupp/openmp/kmp_utility.c b/contrib/libs/cxxsupp/openmp/kmp_utility.c
index c777d7dc0c..613545d2a6 100644
--- a/contrib/libs/cxxsupp/openmp/kmp_utility.c
+++ b/contrib/libs/cxxsupp/openmp/kmp_utility.c
@@ -438,3 +438,4 @@ __kmp_expand_file_name( char *result, size_t rlen, char *pattern )
 
     *pos = '\0';
 }
+
diff --git a/contrib/libs/cxxsupp/openmp/ya.make b/contrib/libs/cxxsupp/openmp/ya.make
index c4f2170d75..9d58259012 100644
--- a/contrib/libs/cxxsupp/openmp/ya.make
+++ b/contrib/libs/cxxsupp/openmp/ya.make
@@ -1,25 +1,43 @@
+# Generated by devtools/yamaker from nixpkgs 21.11.
+
 LIBRARY()
 
+OWNER(
+    pg
+    setser
+    g:contrib
+    g:cpp-contrib
+)
+
+VERSION(5.0)
+
+ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/f9cc9d7392adeffc52a4cdf3f93d42f2a18b68f9.tar.gz)
+
 LICENSE(
+    Intel-LLVM-SGA AND
     MIT AND
     NCSA
 )
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(5.0)
-
-OWNER(
-    pg
-    g:contrib
-    g:cpp-contrib
+ADDINCL(
+    GLOBAL contrib/libs/cxxsupp/openmp
+    contrib/libs/cxxsupp/openmp/thirdparty/ittnotify
 )
 
-NO_UTIL()
+NO_COMPILER_WARNINGS()
 
 NO_PLATFORM()
 
-NO_COMPILER_WARNINGS()
+NO_UTIL()
+
+CFLAGS(
+    -fno-exceptions
+    -fno-lto
+)
+
+COMPILE_C_AS_CXX()
 
 IF (SANITIZER_TYPE == thread)
     NO_SANITIZE()
@@ -35,20 +53,6 @@ IF (SANITIZER_TYPE == memory)
     )
 ENDIF()
 
-COMPILE_C_AS_CXX()
-
-CXXFLAGS(-fno-exceptions)
-
-SET_APPEND(CFLAGS -fno-lto)
-
-ADDINCL(
-    GLOBAL contrib/libs/cxxsupp/openmp
-)
-
-ADDINCL(
-    contrib/libs/cxxsupp/openmp/thirdparty/ittnotify
-)
-
 SRCS(
     asm.S
     kmp_affinity.cpp
@@ -80,7 +84,6 @@ SRCS(
     kmp_utility.c
     kmp_version.c
     kmp_wait_release.cpp
-    #ompt-general.c
     thirdparty/ittnotify/ittnotify_static.c
     z_Linux_util.c
 )
diff --git a/contrib/libs/cxxsupp/ya.make b/contrib/libs/cxxsupp/ya.make
index 4d2adce431..5e0e6757e8 100644
--- a/contrib/libs/cxxsupp/ya.make
+++ b/contrib/libs/cxxsupp/ya.make
@@ -28,4 +28,5 @@ RECURSE(
     libcxx
     libcxxabi
     libcxxrt
+    openmp
 )