From e7b2c64a6e4cb5ef0efdf4204977ff701027d7ae Mon Sep 17 00:00:00 2001 From: Andrey Churbanov Date: Tue, 2 Jul 2019 13:45:40 +0000 Subject: [PATCH] Cleanup of unused code Patch by Terry Wilmarth Differential Revision: https://reviews.llvm.org/D63891 llvm-svn: 364925 --- openmp/runtime/src/dllexports | 6 ------ openmp/runtime/src/exports_so.txt | 1 - openmp/runtime/src/kmp_ftn_os.h | 8 -------- openmp/runtime/src/kmp_stub.cpp | 9 +-------- openmp/runtime/src/kmp_stub.h | 1 - openmp/runtime/src/z_Linux_asm.S | 1 - 6 files changed, 1 insertion(+), 25 deletions(-) diff --git a/openmp/runtime/src/dllexports b/openmp/runtime/src/dllexports index 63ac88b..f9f8648 100644 --- a/openmp/runtime/src/dllexports +++ b/openmp/runtime/src/dllexports @@ -181,7 +181,6 @@ __kmp_printf %endif - %ifdef USE_DEBUGGER __kmp_debugging DATA __kmp_omp_debug_struct_info DATA @@ -190,14 +189,9 @@ # Symbols for MS mutual detection: _You_must_link_with_exactly_one_OpenMP_library DATA _You_must_link_with_Intel_OpenMP_library DATA - %ifdef msvc_compat - _You_must_link_with_Microsoft_OpenMP_library DATA - %endif - __kmp_wait_64 __kmp_release_64 - # VT_getthid 1 # vtgthid 2 diff --git a/openmp/runtime/src/exports_so.txt b/openmp/runtime/src/exports_so.txt index dd0fa59..f7de5fd 100644 --- a/openmp/runtime/src/exports_so.txt +++ b/openmp/runtime/src/exports_so.txt @@ -38,7 +38,6 @@ VERSION { _You_must_link_with_*; # Mutual detection/MS compatibility symbols. - # # Debugger support. # diff --git a/openmp/runtime/src/kmp_ftn_os.h b/openmp/runtime/src/kmp_ftn_os.h index b0ced0e..462c60c 100644 --- a/openmp/runtime/src/kmp_ftn_os.h +++ b/openmp/runtime/src/kmp_ftn_os.h @@ -70,9 +70,7 @@ #define FTN_GET_ANCESTOR_THREAD_NUM omp_get_ancestor_thread_num #define FTN_GET_TEAM_SIZE omp_get_team_size #define FTN_IN_FINAL omp_in_final -// #define FTN_SET_PROC_BIND omp_set_proc_bind #define FTN_GET_PROC_BIND omp_get_proc_bind -// #define FTN_CURR_PROC_BIND omp_curr_proc_bind #if OMP_40_ENABLED #define FTN_GET_NUM_TEAMS omp_get_num_teams #define FTN_GET_TEAM_NUM omp_get_team_num @@ -203,9 +201,7 @@ #define FTN_GET_ANCESTOR_THREAD_NUM omp_get_ancestor_thread_num_ #define FTN_GET_TEAM_SIZE omp_get_team_size_ #define FTN_IN_FINAL omp_in_final_ -// #define FTN_SET_PROC_BIND omp_set_proc_bind_ #define FTN_GET_PROC_BIND omp_get_proc_bind_ -// #define FTN_CURR_PROC_BIND omp_curr_proc_bind_ #if OMP_40_ENABLED #define FTN_GET_NUM_TEAMS omp_get_num_teams_ #define FTN_GET_TEAM_NUM omp_get_team_num_ @@ -338,9 +334,7 @@ #define FTN_GET_ANCESTOR_THREAD_NUM OMP_GET_ANCESTOR_THREAD_NUM #define FTN_GET_TEAM_SIZE OMP_GET_TEAM_SIZE #define FTN_IN_FINAL OMP_IN_FINAL -// #define FTN_SET_PROC_BIND OMP_SET_PROC_BIND #define FTN_GET_PROC_BIND OMP_GET_PROC_BIND -// #define FTN_CURR_PROC_BIND OMP_CURR_PROC_BIND #if OMP_40_ENABLED #define FTN_GET_NUM_TEAMS OMP_GET_NUM_TEAMS #define FTN_GET_TEAM_NUM OMP_GET_TEAM_NUM @@ -471,9 +465,7 @@ #define FTN_GET_ANCESTOR_THREAD_NUM OMP_GET_ANCESTOR_THREAD_NUM_ #define FTN_GET_TEAM_SIZE OMP_GET_TEAM_SIZE_ #define FTN_IN_FINAL OMP_IN_FINAL_ -// #define FTN_SET_PROC_BIND OMP_SET_PROC_BIND_ #define FTN_GET_PROC_BIND OMP_GET_PROC_BIND_ -// #define FTN_CURR_PROC_BIND OMP_CURR_PROC_BIND_ #if OMP_40_ENABLED #define FTN_GET_NUM_TEAMS OMP_GET_NUM_TEAMS_ #define FTN_GET_TEAM_NUM OMP_GET_TEAM_NUM_ diff --git a/openmp/runtime/src/kmp_stub.cpp b/openmp/runtime/src/kmp_stub.cpp index 094f71f..03d5a8f 100644 --- a/openmp/runtime/src/kmp_stub.cpp +++ b/openmp/runtime/src/kmp_stub.cpp @@ -277,16 +277,9 @@ void __kmps_get_schedule(kmp_sched_t *kind, int *modifier) { #if OMP_40_ENABLED -static kmp_proc_bind_t __kmps_proc_bind = proc_bind_false; - -void __kmps_set_proc_bind(kmp_proc_bind_t arg) { - i; - __kmps_proc_bind = arg; -} // __kmps_set_proc_bind - kmp_proc_bind_t __kmps_get_proc_bind(void) { i; - return __kmps_proc_bind; + return 0; } // __kmps_get_proc_bind #endif /* OMP_40_ENABLED */ diff --git a/openmp/runtime/src/kmp_stub.h b/openmp/runtime/src/kmp_stub.h index 9407872..737d1c7 100644 --- a/openmp/runtime/src/kmp_stub.h +++ b/openmp/runtime/src/kmp_stub.h @@ -42,7 +42,6 @@ void __kmps_set_schedule(kmp_sched_t kind, int modifier); void __kmps_get_schedule(kmp_sched_t *kind, int *modifier); #if OMP_40_ENABLED -void __kmps_set_proc_bind(kmp_proc_bind_t arg); kmp_proc_bind_t __kmps_get_proc_bind(void); #endif /* OMP_40_ENABLED */ diff --git a/openmp/runtime/src/z_Linux_asm.S b/openmp/runtime/src/z_Linux_asm.S index 39bf427..0d8885ec 100644 --- a/openmp/runtime/src/z_Linux_asm.S +++ b/openmp/runtime/src/z_Linux_asm.S @@ -1185,7 +1185,6 @@ KMP_LABEL(kmp_1_exit): DEBUG_INFO __kmp_bsr32 - // ----------------------------------------------------------------------- #endif /* KMP_ARCH_X86_64 */ -- 2.7.4