diff options
| -rw-r--r-- | openmp/runtime/cmake/LibompHandleFlags.cmake | 1 | ||||
| -rw-r--r-- | openmp/runtime/cmake/config-ix.cmake | 1 | ||||
| -rw-r--r-- | openmp/runtime/src/kmp.h | 1 | ||||
| -rw-r--r-- | openmp/runtime/src/kmp_runtime.cpp | 6 |
4 files changed, 0 insertions, 9 deletions
diff --git a/openmp/runtime/cmake/LibompHandleFlags.cmake b/openmp/runtime/cmake/LibompHandleFlags.cmake index 046c5d81375..0b8e3a35c88 100644 --- a/openmp/runtime/cmake/LibompHandleFlags.cmake +++ b/openmp/runtime/cmake/LibompHandleFlags.cmake @@ -99,7 +99,6 @@ function(libomp_get_ldflags ldflags) libomp_append(ldflags_local "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG) libomp_append(ldflags_local -static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG) libomp_append(ldflags_local -Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG) - libomp_append(ldflags_local -Wl,-fini=__kmp_internal_end_fini LIBOMP_HAVE_FINI_FLAG) libomp_append(ldflags_local -no-intel-extensions LIBOMP_HAVE_NO_INTEL_EXTENSIONS_FLAG) libomp_append(ldflags_local -static-intel LIBOMP_HAVE_STATIC_INTEL_FLAG) libomp_append(ldflags_local /SAFESEH LIBOMP_HAVE_SAFESEH_FLAG) diff --git a/openmp/runtime/cmake/config-ix.cmake b/openmp/runtime/cmake/config-ix.cmake index 6a19e322f49..f00746d9ead 100644 --- a/openmp/runtime/cmake/config-ix.cmake +++ b/openmp/runtime/cmake/config-ix.cmake @@ -105,7 +105,6 @@ elseif(NOT APPLE) libomp_check_linker_flag("-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG) libomp_check_linker_flag(-static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG) libomp_check_linker_flag(-Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG) - libomp_check_linker_flag(-Wl,-fini=__kmp_internal_end_fini LIBOMP_HAVE_FINI_FLAG) endif() # Check Intel(R) C Compiler specific flags diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h index 23eebe67312..6d690fc4a70 100644 --- a/openmp/runtime/src/kmp.h +++ b/openmp/runtime/src/kmp.h @@ -3115,7 +3115,6 @@ extern void __kmp_internal_begin(void); extern void __kmp_internal_end_library(int gtid); extern void __kmp_internal_end_thread(int gtid); extern void __kmp_internal_end_atexit(void); -extern void __kmp_internal_end_fini(void); extern void __kmp_internal_end_dtor(void); extern void __kmp_internal_end_dest(void *); diff --git a/openmp/runtime/src/kmp_runtime.cpp b/openmp/runtime/src/kmp_runtime.cpp index dd6e0ff7019..b219c60ee65 100644 --- a/openmp/runtime/src/kmp_runtime.cpp +++ b/openmp/runtime/src/kmp_runtime.cpp @@ -5799,16 +5799,10 @@ void __kmp_internal_end_dest(void *specific_gtid) { #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 libomp.so I have no evidence it is -// ever called. However, -fini linker option in makefile.mk works fine. - __attribute__((destructor)) void __kmp_internal_end_dtor(void) { __kmp_internal_end_atexit(); } -void __kmp_internal_end_fini(void) { __kmp_internal_end_atexit(); } - #endif /* [Windows] josh: when the atexit handler is called, there may still be more |
