diff --git a/openmp/runtime/cmake/LibompHandleFlags.cmake b/openmp/runtime/cmake/LibompHandleFlags.cmake
index 470f94ee90cb..61fc31d0fc7f 100644
--- a/openmp/runtime/cmake/LibompHandleFlags.cmake
+++ b/openmp/runtime/cmake/LibompHandleFlags.cmake
@@ -60,10 +60,10 @@ function(libomp_get_cxxflags cxxflags)
     libomp_append(flags_local -Qinline-min-size=1 LIBOMP_HAVE_INLINE_MIN_SIZE_FLAG)
   endif()
   # Architectural C and C++ flags
+  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    libomp_append(flags_local -m32 LIBOMP_HAVE_M32_FLAG)
+  endif()
   if(${IA32})
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      libomp_append(flags_local -m32 LIBOMP_HAVE_M32_FLAG)
-    endif()
     libomp_append(flags_local /arch:SSE2 LIBOMP_HAVE_ARCH_SSE2_FLAG)
     libomp_append(flags_local -msse2 LIBOMP_HAVE_MSSE2_FLAG)
     libomp_append(flags_local -falign-stack=maintain-16-byte LIBOMP_HAVE_FALIGN_STACK_FLAG)
@@ -81,10 +81,10 @@ endfunction()
 function(libomp_get_asmflags asmflags)
   set(asmflags_local)
   # Architectural assembler flags
+  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    libomp_append(asmflags_local -m32 LIBOMP_HAVE_M32_FLAG)
+  endif()
   if(${IA32})
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      libomp_append(asmflags_local -m32 LIBOMP_HAVE_M32_FLAG)
-    endif()
     libomp_append(asmflags_local /safeseh LIBOMP_HAVE_SAFESEH_MASM_FLAG)
     libomp_append(asmflags_local /coff LIBOMP_HAVE_COFF_MASM_FLAG)
   elseif(${MIC})
@@ -112,10 +112,10 @@ function(libomp_get_ldflags ldflags)
   libomp_append(ldflags_local -static-intel LIBOMP_HAVE_STATIC_INTEL_FLAG)
   libomp_append(ldflags_local /SAFESEH LIBOMP_HAVE_SAFESEH_FLAG)
   # Architectural linker flags
+  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    libomp_append(ldflags_local -m32 LIBOMP_HAVE_M32_FLAG)
+  endif()
   if(${IA32})
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      libomp_append(ldflags_local -m32 LIBOMP_HAVE_M32_FLAG)
-    endif()
     libomp_append(ldflags_local -msse2 LIBOMP_HAVE_MSSE2_FLAG)
   elseif(${MIC})
     libomp_append(ldflags_local -mmic LIBOMP_HAVE_MMIC_FLAG)
@@ -159,7 +159,7 @@ endfunction()
 # Fortran flags
 function(libomp_get_fflags fflags)
   set(fflags_local)
-  if(${IA32})
+  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
     libomp_append(fflags_local -m32 LIBOMP_HAVE_M32_FORTRAN_FLAG)
   endif()
   set(fflags_local ${fflags_local} ${LIBOMP_FFLAGS})