diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2019-07-12 21:45:36 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2019-07-12 21:45:36 +0000 |
| commit | e4b4f994d2f6a090694276b40d433dc1a58beb24 (patch) | |
| tree | 9b652f3db2787e6c8f18aa74d87eedd890ed0a64 /openmp/runtime/cmake | |
| parent | 603580216f0aa387b0d4c01b8d2f05873e6a98e2 (diff) | |
| download | bcm5719-llvm-e4b4f994d2f6a090694276b40d433dc1a58beb24.tar.gz bcm5719-llvm-e4b4f994d2f6a090694276b40d433dc1a58beb24.zip | |
[OpenMP] Remove OMP spec versioning
Remove all older OMP spec versioning from the runtime and build system.
Patch by Terry Wilmarth
Differential Revision: https://reviews.llvm.org/D64534
llvm-svn: 365963
Diffstat (limited to 'openmp/runtime/cmake')
| -rw-r--r-- | openmp/runtime/cmake/LibompDefinitions.cmake | 1 | ||||
| -rw-r--r-- | openmp/runtime/cmake/LibompExports.cmake | 10 | ||||
| -rw-r--r-- | openmp/runtime/cmake/LibompHandleFlags.cmake | 12 |
3 files changed, 3 insertions, 20 deletions
diff --git a/openmp/runtime/cmake/LibompDefinitions.cmake b/openmp/runtime/cmake/LibompDefinitions.cmake index cc93ad08c84..46beec79f70 100644 --- a/openmp/runtime/cmake/LibompDefinitions.cmake +++ b/openmp/runtime/cmake/LibompDefinitions.cmake @@ -28,4 +28,3 @@ function(libomp_get_definitions_flags cppflags) # CMake doesn't include CPPFLAGS from environment, but we will. set(${cppflags} ${cppflags_local} ${LIBOMP_CPPFLAGS} $ENV{CPPFLAGS} PARENT_SCOPE) endfunction() - diff --git a/openmp/runtime/cmake/LibompExports.cmake b/openmp/runtime/cmake/LibompExports.cmake index e252c6252dc..f98de2631b8 100644 --- a/openmp/runtime/cmake/LibompExports.cmake +++ b/openmp/runtime/cmake/LibompExports.cmake @@ -13,16 +13,13 @@ # Create the suffix for the export directory # - Only add to suffix when not a default value -# - Example suffix: .deb.30.s1 -# final export directory: exports/lin_32e.deb.30.s1/lib -# - These suffixes imply the build is a Debug, OpenMP 3.0, Stats-Gathering version of the library +# - Example suffix: .deb.s1 +# final export directory: exports/lin_32e.deb.s1/lib +# - These suffixes imply the build is a Debug, Stats-Gathering version of the library set(libomp_suffix) libomp_append(libomp_suffix .deb DEBUG_BUILD) libomp_append(libomp_suffix .dia RELWITHDEBINFO_BUILD) libomp_append(libomp_suffix .min MINSIZEREL_BUILD) -if(NOT "${LIBOMP_OMP_VERSION}" STREQUAL "45") - libomp_append(libomp_suffix .${LIBOMP_OMP_VERSION}) -endif() libomp_append(libomp_suffix .s1 LIBOMP_STATS) libomp_append(libomp_suffix .ompt LIBOMP_OMPT_SUPPORT) if(${LIBOMP_OMPT_SUPPORT}) @@ -95,4 +92,3 @@ if(WIN32) COMMAND ${CMAKE_COMMAND} -E copy ${LIBOMPIMP_OUTPUT_DIRECTORY}/${LIBOMP_IMP_LIB_FILE} ${LIBOMP_EXPORTS_LIB_DIR} ) endif() - diff --git a/openmp/runtime/cmake/LibompHandleFlags.cmake b/openmp/runtime/cmake/LibompHandleFlags.cmake index 86f629478be..030e6f091a0 100644 --- a/openmp/runtime/cmake/LibompHandleFlags.cmake +++ b/openmp/runtime/cmake/LibompHandleFlags.cmake @@ -198,18 +198,6 @@ function(libomp_get_gdflags gdflags) libomp_append(gdflags_local "-D stub" STUBS_LIBRARY) libomp_append(gdflags_local "-D HAVE_QUAD" LIBOMP_USE_QUAD_PRECISION) libomp_append(gdflags_local "-D USE_DEBUGGER" LIBOMP_USE_DEBUGGER) - if(${LIBOMP_OMP_VERSION} GREATER 50 OR ${LIBOMP_OMP_VERSION} EQUAL 50) - libomp_append(gdflags_local "-D OMP_50") - endif() - if(${LIBOMP_OMP_VERSION} GREATER 45 OR ${LIBOMP_OMP_VERSION} EQUAL 45) - libomp_append(gdflags_local "-D OMP_45") - endif() - if(${LIBOMP_OMP_VERSION} GREATER 40 OR ${LIBOMP_OMP_VERSION} EQUAL 40) - libomp_append(gdflags_local "-D OMP_40") - endif() - if(${LIBOMP_OMP_VERSION} GREATER 30 OR ${LIBOMP_OMP_VERSION} EQUAL 30) - libomp_append(gdflags_local "-D OMP_30") - endif() if(${DEBUG_BUILD} OR ${RELWITHDEBINFO_BUILD}) libomp_append(gdflags_local "-D KMP_DEBUG") endif() |
