diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-09-21 17:24:46 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-09-21 17:24:46 +0000 |
| commit | 441f33769eeae58532bb5e7f79c2d755ea984272 (patch) | |
| tree | d1f9691d2b7243a7aac699e81138075d22145fac /openmp/runtime/src/kmp_omp.h | |
| parent | 7d8e7bd7b5aa6d0b4b4c469e0581d407c6205134 (diff) | |
| download | bcm5719-llvm-441f33769eeae58532bb5e7f79c2d755ea984272.tar.gz bcm5719-llvm-441f33769eeae58532bb5e7f79c2d755ea984272.zip | |
Fix the OpenMP 3.0 build
This change adds guards to the code in places where they are missing to enable
the OpenMP 3.0 build.
Patch by Diego Caballero and Johnny Peyton
Mailing List: http://lists.llvm.org/pipermail/openmp-dev/2015-September/000935.html
llvm-svn: 248178
Diffstat (limited to 'openmp/runtime/src/kmp_omp.h')
| -rw-r--r-- | openmp/runtime/src/kmp_omp.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openmp/runtime/src/kmp_omp.h b/openmp/runtime/src/kmp_omp.h index 5a9419ff35c..fc4de0f2360 100644 --- a/openmp/runtime/src/kmp_omp.h +++ b/openmp/runtime/src/kmp_omp.h @@ -109,11 +109,13 @@ typedef struct { 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; @@ -133,7 +135,9 @@ typedef struct { 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 @@ -194,6 +198,7 @@ typedef struct { 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 @@ -207,6 +212,7 @@ typedef struct { 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 */ |
