diff --git a/system/lib/llvm-openmp/LICENSE.TXT b/system/lib/openmp/LICENSE.TXT similarity index 100% rename from system/lib/llvm-openmp/LICENSE.TXT rename to system/lib/openmp/LICENSE.TXT diff --git a/system/lib/llvm-openmp/include/omp.h b/system/lib/openmp/include/omp.h similarity index 100% rename from system/lib/llvm-openmp/include/omp.h rename to system/lib/openmp/include/omp.h diff --git a/system/lib/llvm-openmp/include/ompx.h b/system/lib/openmp/include/ompx.h similarity index 100% rename from system/lib/llvm-openmp/include/ompx.h rename to system/lib/openmp/include/ompx.h diff --git a/system/lib/llvm-openmp/prebuilt/kmp_config.h b/system/lib/openmp/prebuilt/kmp_config.h similarity index 100% rename from system/lib/llvm-openmp/prebuilt/kmp_config.h rename to system/lib/openmp/prebuilt/kmp_config.h diff --git a/system/lib/llvm-openmp/prebuilt/kmp_i18n_default.inc b/system/lib/openmp/prebuilt/kmp_i18n_default.inc similarity index 100% rename from system/lib/llvm-openmp/prebuilt/kmp_i18n_default.inc rename to system/lib/openmp/prebuilt/kmp_i18n_default.inc diff --git a/system/lib/llvm-openmp/prebuilt/kmp_i18n_id.inc b/system/lib/openmp/prebuilt/kmp_i18n_id.inc similarity index 100% rename from system/lib/llvm-openmp/prebuilt/kmp_i18n_id.inc rename to system/lib/openmp/prebuilt/kmp_i18n_id.inc diff --git a/system/lib/llvm-openmp/readme.txt b/system/lib/openmp/readme.txt similarity index 100% rename from system/lib/llvm-openmp/readme.txt rename to system/lib/openmp/readme.txt diff --git a/system/lib/llvm-openmp/src/CMakeLists.txt b/system/lib/openmp/src/CMakeLists.txt similarity index 100% rename from system/lib/llvm-openmp/src/CMakeLists.txt rename to system/lib/openmp/src/CMakeLists.txt diff --git a/system/lib/llvm-openmp/src/dllexports b/system/lib/openmp/src/dllexports similarity index 100% rename from system/lib/llvm-openmp/src/dllexports rename to system/lib/openmp/src/dllexports diff --git a/system/lib/llvm-openmp/src/exports_so.txt b/system/lib/openmp/src/exports_so.txt similarity index 100% rename from system/lib/llvm-openmp/src/exports_so.txt rename to system/lib/openmp/src/exports_so.txt diff --git a/system/lib/llvm-openmp/src/exports_test_so.txt b/system/lib/openmp/src/exports_test_so.txt similarity index 100% rename from system/lib/llvm-openmp/src/exports_test_so.txt rename to system/lib/openmp/src/exports_test_so.txt diff --git a/system/lib/llvm-openmp/src/extractExternal.cpp b/system/lib/openmp/src/extractExternal.cpp similarity index 100% rename from system/lib/llvm-openmp/src/extractExternal.cpp rename to system/lib/openmp/src/extractExternal.cpp diff --git a/system/lib/llvm-openmp/src/i18n/en_US.txt b/system/lib/openmp/src/i18n/en_US.txt similarity index 100% rename from system/lib/llvm-openmp/src/i18n/en_US.txt rename to system/lib/openmp/src/i18n/en_US.txt diff --git a/system/lib/llvm-openmp/src/include/omp-tools.h.var b/system/lib/openmp/src/include/omp-tools.h.var similarity index 100% rename from system/lib/llvm-openmp/src/include/omp-tools.h.var rename to system/lib/openmp/src/include/omp-tools.h.var diff --git a/system/lib/llvm-openmp/src/include/omp.h.var b/system/lib/openmp/src/include/omp.h.var similarity index 100% rename from system/lib/llvm-openmp/src/include/omp.h.var rename to system/lib/openmp/src/include/omp.h.var diff --git a/system/lib/llvm-openmp/src/include/ompx.h.var b/system/lib/openmp/src/include/ompx.h.var similarity index 100% rename from system/lib/llvm-openmp/src/include/ompx.h.var rename to system/lib/openmp/src/include/ompx.h.var diff --git a/system/lib/llvm-openmp/src/kmp.h b/system/lib/openmp/src/kmp.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp.h rename to system/lib/openmp/src/kmp.h diff --git a/system/lib/llvm-openmp/src/kmp_adt.cpp b/system/lib/openmp/src/kmp_adt.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_adt.cpp rename to system/lib/openmp/src/kmp_adt.cpp diff --git a/system/lib/llvm-openmp/src/kmp_adt.h b/system/lib/openmp/src/kmp_adt.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_adt.h rename to system/lib/openmp/src/kmp_adt.h diff --git a/system/lib/llvm-openmp/src/kmp_affinity.cpp b/system/lib/openmp/src/kmp_affinity.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_affinity.cpp rename to system/lib/openmp/src/kmp_affinity.cpp diff --git a/system/lib/llvm-openmp/src/kmp_affinity.h b/system/lib/openmp/src/kmp_affinity.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_affinity.h rename to system/lib/openmp/src/kmp_affinity.h diff --git a/system/lib/llvm-openmp/src/kmp_alloc.cpp b/system/lib/openmp/src/kmp_alloc.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_alloc.cpp rename to system/lib/openmp/src/kmp_alloc.cpp diff --git a/system/lib/llvm-openmp/src/kmp_atomic.cpp b/system/lib/openmp/src/kmp_atomic.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_atomic.cpp rename to system/lib/openmp/src/kmp_atomic.cpp diff --git a/system/lib/llvm-openmp/src/kmp_atomic.h b/system/lib/openmp/src/kmp_atomic.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_atomic.h rename to system/lib/openmp/src/kmp_atomic.h diff --git a/system/lib/llvm-openmp/src/kmp_barrier.cpp b/system/lib/openmp/src/kmp_barrier.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_barrier.cpp rename to system/lib/openmp/src/kmp_barrier.cpp diff --git a/system/lib/llvm-openmp/src/kmp_barrier.h b/system/lib/openmp/src/kmp_barrier.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_barrier.h rename to system/lib/openmp/src/kmp_barrier.h diff --git a/system/lib/llvm-openmp/src/kmp_cancel.cpp b/system/lib/openmp/src/kmp_cancel.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_cancel.cpp rename to system/lib/openmp/src/kmp_cancel.cpp diff --git a/system/lib/llvm-openmp/src/kmp_collapse.cpp b/system/lib/openmp/src/kmp_collapse.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_collapse.cpp rename to system/lib/openmp/src/kmp_collapse.cpp diff --git a/system/lib/llvm-openmp/src/kmp_collapse.h b/system/lib/openmp/src/kmp_collapse.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_collapse.h rename to system/lib/openmp/src/kmp_collapse.h diff --git a/system/lib/llvm-openmp/src/kmp_config.h.cmake b/system/lib/openmp/src/kmp_config.h.cmake similarity index 100% rename from system/lib/llvm-openmp/src/kmp_config.h.cmake rename to system/lib/openmp/src/kmp_config.h.cmake diff --git a/system/lib/llvm-openmp/src/kmp_csupport.cpp b/system/lib/openmp/src/kmp_csupport.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_csupport.cpp rename to system/lib/openmp/src/kmp_csupport.cpp diff --git a/system/lib/llvm-openmp/src/kmp_debug.cpp b/system/lib/openmp/src/kmp_debug.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_debug.cpp rename to system/lib/openmp/src/kmp_debug.cpp diff --git a/system/lib/llvm-openmp/src/kmp_debug.h b/system/lib/openmp/src/kmp_debug.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_debug.h rename to system/lib/openmp/src/kmp_debug.h diff --git a/system/lib/llvm-openmp/src/kmp_debugger.cpp b/system/lib/openmp/src/kmp_debugger.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_debugger.cpp rename to system/lib/openmp/src/kmp_debugger.cpp diff --git a/system/lib/llvm-openmp/src/kmp_debugger.h b/system/lib/openmp/src/kmp_debugger.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_debugger.h rename to system/lib/openmp/src/kmp_debugger.h diff --git a/system/lib/llvm-openmp/src/kmp_dispatch.cpp b/system/lib/openmp/src/kmp_dispatch.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_dispatch.cpp rename to system/lib/openmp/src/kmp_dispatch.cpp diff --git a/system/lib/llvm-openmp/src/kmp_dispatch.h b/system/lib/openmp/src/kmp_dispatch.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_dispatch.h rename to system/lib/openmp/src/kmp_dispatch.h diff --git a/system/lib/llvm-openmp/src/kmp_dispatch_hier.h b/system/lib/openmp/src/kmp_dispatch_hier.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_dispatch_hier.h rename to system/lib/openmp/src/kmp_dispatch_hier.h diff --git a/system/lib/llvm-openmp/src/kmp_dummy.txt b/system/lib/openmp/src/kmp_dummy.txt similarity index 100% rename from system/lib/llvm-openmp/src/kmp_dummy.txt rename to system/lib/openmp/src/kmp_dummy.txt diff --git a/system/lib/llvm-openmp/src/kmp_environment.cpp b/system/lib/openmp/src/kmp_environment.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_environment.cpp rename to system/lib/openmp/src/kmp_environment.cpp diff --git a/system/lib/llvm-openmp/src/kmp_environment.h b/system/lib/openmp/src/kmp_environment.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_environment.h rename to system/lib/openmp/src/kmp_environment.h diff --git a/system/lib/llvm-openmp/src/kmp_error.cpp b/system/lib/openmp/src/kmp_error.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_error.cpp rename to system/lib/openmp/src/kmp_error.cpp diff --git a/system/lib/llvm-openmp/src/kmp_error.h b/system/lib/openmp/src/kmp_error.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_error.h rename to system/lib/openmp/src/kmp_error.h diff --git a/system/lib/llvm-openmp/src/kmp_ftn_cdecl.cpp b/system/lib/openmp/src/kmp_ftn_cdecl.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_ftn_cdecl.cpp rename to system/lib/openmp/src/kmp_ftn_cdecl.cpp diff --git a/system/lib/llvm-openmp/src/kmp_ftn_entry.h b/system/lib/openmp/src/kmp_ftn_entry.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_ftn_entry.h rename to system/lib/openmp/src/kmp_ftn_entry.h diff --git a/system/lib/llvm-openmp/src/kmp_ftn_extra.cpp b/system/lib/openmp/src/kmp_ftn_extra.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_ftn_extra.cpp rename to system/lib/openmp/src/kmp_ftn_extra.cpp diff --git a/system/lib/llvm-openmp/src/kmp_ftn_os.h b/system/lib/openmp/src/kmp_ftn_os.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_ftn_os.h rename to system/lib/openmp/src/kmp_ftn_os.h diff --git a/system/lib/llvm-openmp/src/kmp_ftn_stdcall.cpp b/system/lib/openmp/src/kmp_ftn_stdcall.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_ftn_stdcall.cpp rename to system/lib/openmp/src/kmp_ftn_stdcall.cpp diff --git a/system/lib/llvm-openmp/src/kmp_global.cpp b/system/lib/openmp/src/kmp_global.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_global.cpp rename to system/lib/openmp/src/kmp_global.cpp diff --git a/system/lib/llvm-openmp/src/kmp_gsupport.cpp b/system/lib/openmp/src/kmp_gsupport.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_gsupport.cpp rename to system/lib/openmp/src/kmp_gsupport.cpp diff --git a/system/lib/llvm-openmp/src/kmp_i18n.cpp b/system/lib/openmp/src/kmp_i18n.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_i18n.cpp rename to system/lib/openmp/src/kmp_i18n.cpp diff --git a/system/lib/llvm-openmp/src/kmp_i18n.h b/system/lib/openmp/src/kmp_i18n.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_i18n.h rename to system/lib/openmp/src/kmp_i18n.h diff --git a/system/lib/llvm-openmp/src/kmp_invoke_microtask.cpp b/system/lib/openmp/src/kmp_invoke_microtask.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_invoke_microtask.cpp rename to system/lib/openmp/src/kmp_invoke_microtask.cpp diff --git a/system/lib/llvm-openmp/src/kmp_io.cpp b/system/lib/openmp/src/kmp_io.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_io.cpp rename to system/lib/openmp/src/kmp_io.cpp diff --git a/system/lib/llvm-openmp/src/kmp_io.h b/system/lib/openmp/src/kmp_io.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_io.h rename to system/lib/openmp/src/kmp_io.h diff --git a/system/lib/llvm-openmp/src/kmp_itt.cpp b/system/lib/openmp/src/kmp_itt.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_itt.cpp rename to system/lib/openmp/src/kmp_itt.cpp diff --git a/system/lib/llvm-openmp/src/kmp_itt.h b/system/lib/openmp/src/kmp_itt.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_itt.h rename to system/lib/openmp/src/kmp_itt.h diff --git a/system/lib/llvm-openmp/src/kmp_itt.inl b/system/lib/openmp/src/kmp_itt.inl similarity index 100% rename from system/lib/llvm-openmp/src/kmp_itt.inl rename to system/lib/openmp/src/kmp_itt.inl diff --git a/system/lib/llvm-openmp/src/kmp_lock.cpp b/system/lib/openmp/src/kmp_lock.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_lock.cpp rename to system/lib/openmp/src/kmp_lock.cpp diff --git a/system/lib/llvm-openmp/src/kmp_lock.h b/system/lib/openmp/src/kmp_lock.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_lock.h rename to system/lib/openmp/src/kmp_lock.h diff --git a/system/lib/llvm-openmp/src/kmp_omp.h b/system/lib/openmp/src/kmp_omp.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_omp.h rename to system/lib/openmp/src/kmp_omp.h diff --git a/system/lib/llvm-openmp/src/kmp_os.h b/system/lib/openmp/src/kmp_os.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_os.h rename to system/lib/openmp/src/kmp_os.h diff --git a/system/lib/llvm-openmp/src/kmp_platform.h b/system/lib/openmp/src/kmp_platform.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_platform.h rename to system/lib/openmp/src/kmp_platform.h diff --git a/system/lib/llvm-openmp/src/kmp_runtime.cpp b/system/lib/openmp/src/kmp_runtime.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_runtime.cpp rename to system/lib/openmp/src/kmp_runtime.cpp diff --git a/system/lib/llvm-openmp/src/kmp_safe_c_api.h b/system/lib/openmp/src/kmp_safe_c_api.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_safe_c_api.h rename to system/lib/openmp/src/kmp_safe_c_api.h diff --git a/system/lib/llvm-openmp/src/kmp_sched.cpp b/system/lib/openmp/src/kmp_sched.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_sched.cpp rename to system/lib/openmp/src/kmp_sched.cpp diff --git a/system/lib/llvm-openmp/src/kmp_settings.cpp b/system/lib/openmp/src/kmp_settings.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_settings.cpp rename to system/lib/openmp/src/kmp_settings.cpp diff --git a/system/lib/llvm-openmp/src/kmp_settings.h b/system/lib/openmp/src/kmp_settings.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_settings.h rename to system/lib/openmp/src/kmp_settings.h diff --git a/system/lib/llvm-openmp/src/kmp_stats.cpp b/system/lib/openmp/src/kmp_stats.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_stats.cpp rename to system/lib/openmp/src/kmp_stats.cpp diff --git a/system/lib/llvm-openmp/src/kmp_stats.h b/system/lib/openmp/src/kmp_stats.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_stats.h rename to system/lib/openmp/src/kmp_stats.h diff --git a/system/lib/llvm-openmp/src/kmp_stats_timing.cpp b/system/lib/openmp/src/kmp_stats_timing.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_stats_timing.cpp rename to system/lib/openmp/src/kmp_stats_timing.cpp diff --git a/system/lib/llvm-openmp/src/kmp_stats_timing.h b/system/lib/openmp/src/kmp_stats_timing.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_stats_timing.h rename to system/lib/openmp/src/kmp_stats_timing.h diff --git a/system/lib/llvm-openmp/src/kmp_str.cpp b/system/lib/openmp/src/kmp_str.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_str.cpp rename to system/lib/openmp/src/kmp_str.cpp diff --git a/system/lib/llvm-openmp/src/kmp_str.h b/system/lib/openmp/src/kmp_str.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_str.h rename to system/lib/openmp/src/kmp_str.h diff --git a/system/lib/llvm-openmp/src/kmp_stub.cpp b/system/lib/openmp/src/kmp_stub.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_stub.cpp rename to system/lib/openmp/src/kmp_stub.cpp diff --git a/system/lib/llvm-openmp/src/kmp_stub.h b/system/lib/openmp/src/kmp_stub.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_stub.h rename to system/lib/openmp/src/kmp_stub.h diff --git a/system/lib/llvm-openmp/src/kmp_taskdeps.cpp b/system/lib/openmp/src/kmp_taskdeps.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_taskdeps.cpp rename to system/lib/openmp/src/kmp_taskdeps.cpp diff --git a/system/lib/llvm-openmp/src/kmp_taskdeps.h b/system/lib/openmp/src/kmp_taskdeps.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_taskdeps.h rename to system/lib/openmp/src/kmp_taskdeps.h diff --git a/system/lib/llvm-openmp/src/kmp_tasking.cpp b/system/lib/openmp/src/kmp_tasking.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_tasking.cpp rename to system/lib/openmp/src/kmp_tasking.cpp diff --git a/system/lib/llvm-openmp/src/kmp_threadprivate.cpp b/system/lib/openmp/src/kmp_threadprivate.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_threadprivate.cpp rename to system/lib/openmp/src/kmp_threadprivate.cpp diff --git a/system/lib/llvm-openmp/src/kmp_utility.cpp b/system/lib/openmp/src/kmp_utility.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_utility.cpp rename to system/lib/openmp/src/kmp_utility.cpp diff --git a/system/lib/llvm-openmp/src/kmp_utils.h b/system/lib/openmp/src/kmp_utils.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_utils.h rename to system/lib/openmp/src/kmp_utils.h diff --git a/system/lib/llvm-openmp/src/kmp_version.cpp b/system/lib/openmp/src/kmp_version.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_version.cpp rename to system/lib/openmp/src/kmp_version.cpp diff --git a/system/lib/llvm-openmp/src/kmp_version.h b/system/lib/openmp/src/kmp_version.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_version.h rename to system/lib/openmp/src/kmp_version.h diff --git a/system/lib/llvm-openmp/src/kmp_wait_release.cpp b/system/lib/openmp/src/kmp_wait_release.cpp similarity index 100% rename from system/lib/llvm-openmp/src/kmp_wait_release.cpp rename to system/lib/openmp/src/kmp_wait_release.cpp diff --git a/system/lib/llvm-openmp/src/kmp_wait_release.h b/system/lib/openmp/src/kmp_wait_release.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_wait_release.h rename to system/lib/openmp/src/kmp_wait_release.h diff --git a/system/lib/llvm-openmp/src/kmp_wrapper_getpid.h b/system/lib/openmp/src/kmp_wrapper_getpid.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_wrapper_getpid.h rename to system/lib/openmp/src/kmp_wrapper_getpid.h diff --git a/system/lib/llvm-openmp/src/kmp_wrapper_malloc.h b/system/lib/openmp/src/kmp_wrapper_malloc.h similarity index 100% rename from system/lib/llvm-openmp/src/kmp_wrapper_malloc.h rename to system/lib/openmp/src/kmp_wrapper_malloc.h diff --git a/system/lib/llvm-openmp/src/libomp.rc.var b/system/lib/openmp/src/libomp.rc.var similarity index 100% rename from system/lib/llvm-openmp/src/libomp.rc.var rename to system/lib/openmp/src/libomp.rc.var diff --git a/system/lib/llvm-openmp/src/ompd-specific.cpp b/system/lib/openmp/src/ompd-specific.cpp similarity index 100% rename from system/lib/llvm-openmp/src/ompd-specific.cpp rename to system/lib/openmp/src/ompd-specific.cpp diff --git a/system/lib/llvm-openmp/src/ompd-specific.h b/system/lib/openmp/src/ompd-specific.h similarity index 100% rename from system/lib/llvm-openmp/src/ompd-specific.h rename to system/lib/openmp/src/ompd-specific.h diff --git a/system/lib/llvm-openmp/src/ompt-event-specific.h b/system/lib/openmp/src/ompt-event-specific.h similarity index 100% rename from system/lib/llvm-openmp/src/ompt-event-specific.h rename to system/lib/openmp/src/ompt-event-specific.h diff --git a/system/lib/llvm-openmp/src/ompt-general.cpp b/system/lib/openmp/src/ompt-general.cpp similarity index 100% rename from system/lib/llvm-openmp/src/ompt-general.cpp rename to system/lib/openmp/src/ompt-general.cpp diff --git a/system/lib/llvm-openmp/src/ompt-internal.h b/system/lib/openmp/src/ompt-internal.h similarity index 100% rename from system/lib/llvm-openmp/src/ompt-internal.h rename to system/lib/openmp/src/ompt-internal.h diff --git a/system/lib/llvm-openmp/src/ompt-specific.cpp b/system/lib/openmp/src/ompt-specific.cpp similarity index 100% rename from system/lib/llvm-openmp/src/ompt-specific.cpp rename to system/lib/openmp/src/ompt-specific.cpp diff --git a/system/lib/llvm-openmp/src/ompt-specific.h b/system/lib/openmp/src/ompt-specific.h similarity index 100% rename from system/lib/llvm-openmp/src/ompt-specific.h rename to system/lib/openmp/src/ompt-specific.h diff --git a/system/lib/llvm-openmp/src/test-touch.c b/system/lib/openmp/src/test-touch.c similarity index 100% rename from system/lib/llvm-openmp/src/test-touch.c rename to system/lib/openmp/src/test-touch.c diff --git a/system/lib/llvm-openmp/src/thirdparty/ittnotify/LICENSE.txt b/system/lib/openmp/src/thirdparty/ittnotify/LICENSE.txt similarity index 100% rename from system/lib/llvm-openmp/src/thirdparty/ittnotify/LICENSE.txt rename to system/lib/openmp/src/thirdparty/ittnotify/LICENSE.txt diff --git a/system/lib/llvm-openmp/src/thirdparty/ittnotify/disable_warnings.h b/system/lib/openmp/src/thirdparty/ittnotify/disable_warnings.h similarity index 100% rename from system/lib/llvm-openmp/src/thirdparty/ittnotify/disable_warnings.h rename to system/lib/openmp/src/thirdparty/ittnotify/disable_warnings.h diff --git a/system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify.h b/system/lib/openmp/src/thirdparty/ittnotify/ittnotify.h similarity index 100% rename from system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify.h rename to system/lib/openmp/src/thirdparty/ittnotify/ittnotify.h diff --git a/system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify_config.h b/system/lib/openmp/src/thirdparty/ittnotify/ittnotify_config.h similarity index 100% rename from system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify_config.h rename to system/lib/openmp/src/thirdparty/ittnotify/ittnotify_config.h diff --git a/system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify_static.cpp b/system/lib/openmp/src/thirdparty/ittnotify/ittnotify_static.cpp similarity index 100% rename from system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify_static.cpp rename to system/lib/openmp/src/thirdparty/ittnotify/ittnotify_static.cpp diff --git a/system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify_static.h b/system/lib/openmp/src/thirdparty/ittnotify/ittnotify_static.h similarity index 100% rename from system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify_static.h rename to system/lib/openmp/src/thirdparty/ittnotify/ittnotify_static.h diff --git a/system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify_types.h b/system/lib/openmp/src/thirdparty/ittnotify/ittnotify_types.h similarity index 100% rename from system/lib/llvm-openmp/src/thirdparty/ittnotify/ittnotify_types.h rename to system/lib/openmp/src/thirdparty/ittnotify/ittnotify_types.h diff --git a/system/lib/llvm-openmp/src/thirdparty/ittnotify/legacy/ittnotify.h b/system/lib/openmp/src/thirdparty/ittnotify/legacy/ittnotify.h similarity index 100% rename from system/lib/llvm-openmp/src/thirdparty/ittnotify/legacy/ittnotify.h rename to system/lib/openmp/src/thirdparty/ittnotify/legacy/ittnotify.h diff --git a/system/lib/llvm-openmp/src/z_AIX_asm.S b/system/lib/openmp/src/z_AIX_asm.S similarity index 100% rename from system/lib/llvm-openmp/src/z_AIX_asm.S rename to system/lib/openmp/src/z_AIX_asm.S diff --git a/system/lib/llvm-openmp/src/z_Linux_asm.S b/system/lib/openmp/src/z_Linux_asm.S similarity index 100% rename from system/lib/llvm-openmp/src/z_Linux_asm.S rename to system/lib/openmp/src/z_Linux_asm.S diff --git a/system/lib/llvm-openmp/src/z_Linux_util.cpp b/system/lib/openmp/src/z_Linux_util.cpp similarity index 100% rename from system/lib/llvm-openmp/src/z_Linux_util.cpp rename to system/lib/openmp/src/z_Linux_util.cpp diff --git a/system/lib/llvm-openmp/src/z_Windows_NT-586_asm.asm b/system/lib/openmp/src/z_Windows_NT-586_asm.asm similarity index 100% rename from system/lib/llvm-openmp/src/z_Windows_NT-586_asm.asm rename to system/lib/openmp/src/z_Windows_NT-586_asm.asm diff --git a/system/lib/llvm-openmp/src/z_Windows_NT-586_util.cpp b/system/lib/openmp/src/z_Windows_NT-586_util.cpp similarity index 100% rename from system/lib/llvm-openmp/src/z_Windows_NT-586_util.cpp rename to system/lib/openmp/src/z_Windows_NT-586_util.cpp diff --git a/system/lib/llvm-openmp/src/z_Windows_NT_util.cpp b/system/lib/openmp/src/z_Windows_NT_util.cpp similarity index 100% rename from system/lib/llvm-openmp/src/z_Windows_NT_util.cpp rename to system/lib/openmp/src/z_Windows_NT_util.cpp diff --git a/system/lib/update_llvm_openmp.py b/system/lib/update_openmp.py similarity index 97% rename from system/lib/update_llvm_openmp.py rename to system/lib/update_openmp.py index ea1b721919006..db4a3f5adda16 100644 --- a/system/lib/update_llvm_openmp.py +++ b/system/lib/update_openmp.py @@ -14,8 +14,8 @@ emscripten_root = os.path.dirname(os.path.dirname(script_dir)) default_llvm_dir = os.path.join(os.path.dirname(emscripten_root), 'llvm-project') -# system/lib/llvm-openmp (to be updated) -local_root = os.path.join(script_dir, 'llvm-openmp') +# system/lib/openmp (to be updated) +local_root = os.path.join(script_dir, 'openmp') local_src = os.path.join(local_root, 'src') local_include = os.path.join(local_root, 'include') local_prebuilt = os.path.join(local_root, 'prebuilt') diff --git a/tools/system_libs.py b/tools/system_libs.py index 039b1e63a843b..037b01fab3f14 100644 --- a/tools/system_libs.py +++ b/tools/system_libs.py @@ -2304,13 +2304,13 @@ class libstubs(DebugLibrary): src_files = ['emscripten_syscall_stubs.c', 'emscripten_libc_stubs.c'] -class libllvmopenmp(Library): - name = 'libllvmopenmp' +class libopenmp(Library): + name = 'libopenmp' includes = [ - 'system/lib/llvm-openmp/src', - 'system/lib/llvm-openmp/src/i18n', - 'system/lib/llvm-openmp/src/thirdparty/ittnotify', - 'system/lib/llvm-openmp/prebuilt', + 'system/lib/openmp/src', + 'system/lib/openmp/src/i18n', + 'system/lib/openmp/src/thirdparty/ittnotify', + 'system/lib/openmp/prebuilt', ] # This needs to come from the flags. If it does not, llvm won't add proper magic symbols never_force = True @@ -2326,7 +2326,7 @@ class libllvmopenmp(Library): '-Wno-int-to-void-pointer-cast', '-Wno-#warnings', '-Wno-unused-function', '-Wno-sign-compare', '-Wno-comment', '-Wno-unused-variable', '-Wno-unused-but-set-global', ] - src_dir = 'system/lib/llvm-openmp/src' + src_dir = 'system/lib/openmp/src' src_files = [ 'kmp_alloc.cpp', 'kmp_atomic.cpp', 'kmp_csupport.cpp', 'kmp_debug.cpp', 'kmp_itt.cpp', 'kmp_environment.cpp', 'kmp_error.cpp', 'kmp_global.cpp', @@ -2449,7 +2449,7 @@ def add_sanitizer_libs(): add_library('libjsmath') if options.openmp: - add_library("libllvmopenmp") + add_library('libopenmp') # C libraries that override libc must come before it if settings.PRINTF_LONG_DOUBLE: @@ -2567,7 +2567,7 @@ def install_system_headers(stamp): 'system/lib/libcxxabi/include': 'c++/v1', 'system/lib/mimalloc/include': '', # Install openmp headers - 'system/lib/llvm-openmp/include': '', + 'system/lib/openmp/include': '', 'system/lib/libcxx/modules/prebuilt/lib/emscripten': cache.get_lib_dir(absolute=True), 'system/lib/libcxx/modules/prebuilt/share': cache.get_sysroot_dir('share'), 'system/lib/libcxx/modules/std': cache.get_sysroot_dir('share/libc++/v1/std'),