Post-merge fixes

Author: Meinersbur

flang/lib/Common/CMakeLists.txt

@@ -5,7 +5,6 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
 #===------------------------------------------------------------------------===#
-  ../Support/OpenMP-utils.cpp
 
 add_flang_library(FortranCommon
   binary-to-decimal.cpp

flang/lib/Support/CMakeLists.txt

@@ -49,6 +49,7 @@ add_flang_library(FortranSupport
   default-kinds.cpp
   idioms.cpp
   LangOptions.cpp
+  OpenMP-utils.cpp
   Version.cpp
   ${version_inc}