Windows: fixes

CMakeLists.txt

@@ -22,16 +22,19 @@ cmake_minimum_required(VERSION 2.8)
 # CMake's Fortran tests
 SET(CMAKE_Fortran_COMPILER_WORKS 1)
 
-if( NOT DEFINED TARGET_ARCHITECTURE )
-  execute_process(COMMAND uname -m OUTPUT_STRIP_TRAILING_WHITESPACE
-                  OUTPUT_VARIABLE TARGET_ARCHITECTURE)
-endif()
 
-if( NOT DEFINED TARGET_OS )
-  execute_process(COMMAND uname -s OUTPUT_STRIP_TRAILING_WHITESPACE
-                  OUTPUT_VARIABLE TARGET_OS)
+set(CMAKE_Fortran_PREPROCESS_SOURCE
+    "<CMAKE_Fortran_COMPILER> -cpp <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> -o <PREPROCESSED_SOURCE>")
+
+# If we are not building as a part of LLVM, build Flang as an
+# standalone project, using LLVM as an external library:
+if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
+  project(Flang)
 endif()
 
+set(TARGET_OS ${CMAKE_HOST_SYSTEM_NAME})
+set(TARGET_ARCHITECTURE ${CMAKE_HOST_SYSTEM_PROCESSOR})
+
 if( ${TARGET_OS} STREQUAL "Linux" )
   set(OS "LINUX")
   set(OSNAME "Linux")
@@ -51,16 +54,23 @@ if( ${TARGET_OS} STREQUAL "Linux" )
     message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
     return()
   endif()
+elseif(${TARGET_OS} STREQUAL "Windows" )
+  set(OS "WINDOWS")
+  set(OSNAME "Windows")
+  if( ${TARGET_ARCHITECTURE} STREQUAL "AMD64" )
+    set(TARGET_ARCHITECTURE "x86_64")
+    set(ARCHNAME x86-64)
+    set(ARCH X86)
+    set(WRDSZ 64)
+  else()
+    message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
+    return()
+  endif()
 else()
   message("Unsupported OS: ${TARGET_OS}" )
   return()
 endif()
 
-# The cmake documentation states that these are set.  They are not so we 
-# set them here
-set(CMAKE_HOST_SYSTEM_NAME ${TARGET_OS})
-set(CMAKE_HOST_SYSTEM_PROCESSOR ${TARGET_ARCHITECTURE})
-
 # If we are not building as a part of LLVM, build Flang as an
 # standalone project, using LLVM as an external library:
 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )

include/legacy-util-api.h

@@ -41,7 +41,9 @@ extern "C" {
 #include <stdlib.h>
 #include <string.h>
 #include <time.h> /* time() */
+#ifndef _WIN32
 #include <unistd.h> /* getcwd() */
+#endif
 
 /* See tmpfile(3). */
 FILE *tmpf(char *ignored);

lib/scutil/cpu-stopwatch.c

@@ -21,6 +21,8 @@
  *  since the most recent call.  Very much not thread-safe.
  */
 
+#ifndef _WIN32
+
 #include <sys/times.h>
 #include <unistd.h>
 #include "scutil.h"
@@ -51,3 +53,33 @@ getcpu(void)
   last = now;
   return elapsed;
 }
+
+#else
+
+#include <Windows.h>
+//#include "scutil.h"
+
+unsigned long
+getcpu(void)
+{
+  LARGE_INTEGER ticks_per_second = {-1};
+  LARGE_INTEGER ticks;
+
+  unsigned long last = 0;
+  unsigned long now, elapsed;
+
+  /* Initialize ticks_per_second. */
+  if (ticks_per_second.QuadPart <= 0)
+      QueryPerformanceFrequency(&ticks_per_second.QuadPart);
+
+  QueryPerformanceCounter(&ticks);
+  now = ticks.QuadPart;
+  now *= 1000; /* milliseconds */
+  now /= ticks_per_second.QuadPart;
+
+  elapsed = now - last;
+  last = now;
+  return elapsed;
+}
+
+#endif

lib/scutil/host-fp-folding.c

@@ -81,7 +81,7 @@ configure_denormals(bool denorms_are_zeros, bool flush_to_zero)
   fenv_t fenv;
   if (fegetenv(&fenv) != 0)
     fprintf(stderr, "fegetenv() failed: %s\n", strerror(errno));
-#ifdef __x86_64__
+#if defined(__x86_64__) && !defined(_WIN32)
   fenv.__mxcsr &= ~0x0040;
   if (denorms_are_zeros)
     fenv.__mxcsr |= 0x0040;

lib/scutil/lockfile.c

@@ -43,7 +43,12 @@
  *	Clean up by deleting the uniquely named file we had created earlier.
  */
 
-#include <unistd.h>
+#ifndef _WIN32
+  #include <unistd.h>
+#else
+  #include <Winsock2.h>
+  #include <process.h>
+#endif
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -64,6 +69,9 @@ static char *udir = NULL;
  */
 static long uwaiting;
 
+#ifdef _WIN32
+#define pid_t int
+#endif
 int
 __pg_make_lock_file(char *dir)
 {

lib/scutil/path-utils.c

@@ -23,7 +23,9 @@
 #include "legacy-util-api.h"
 #include <stddef.h>
 #include <string.h>
+#ifndef _WIN32
 #include <unistd.h> /* access() */
+#endif
 
 void
 basenam(const char *orig_path, const char *optional_suffix, char *basename)

lib/scutil/pgnewfil.c

@@ -29,9 +29,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#if defined(HOST_WIN)
+#if defined(_WIN32)
 #include <direct.h>
 #include <io.h>
+#include <sys/stat.h>
 extern unsigned long getpid(void);
 #else
 #include <unistd.h>
@@ -42,6 +43,10 @@ int pgnewfil_debug = 0;
 #endif
 extern size_t strlen();
 
+#ifndef S_ISDIR 
+#define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR) 
+#endif 
+
 /*
  * copy chars from q to p, terminate string, return end of string
  */
@@ -307,7 +312,7 @@ pg_makenewfile(char *pfx, char *sfx, int make)
       if (!make) {
         break;
       } else {
-#if defined(HOST_WIN)
+#if defined(_WIN32)
         fd = _open(filename, _O_CREAT | _O_BINARY | _O_EXCL | _O_RDWR, _S_IWRITE);
 #else
         fd = open(filename, O_CREAT | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR);
@@ -353,7 +358,7 @@ pg_makenewdir(char *pfx, char *sfx, int make)
     if (r == -1 && errno == ENOENT) {
       if (make) {
         int err;
-#if defined(HOST_WIN) || defined(WINNT) || defined(WIN64)
+#if defined(_WIN32) || defined(WINNT) || defined(WIN64)
         err = _mkdir(filename);
 #else
         err = mkdir(filename, S_IRWXG | S_IRWXO | S_IXUSR | S_IWUSR | S_IRUSR);

runtime/flang/CMakeLists.txt

@@ -480,7 +480,12 @@ add_flang_library(flang_static
   ${FTN_SUPPORT}
   ${SHARED_SOURCES}
   )
+
+if (MSVC)
+set_property(TARGET flang_static PROPERTY OUTPUT_NAME flang_static)
+else()
 set_property(TARGET flang_static PROPERTY OUTPUT_NAME flang)
+endif()
 
 set(SHARED_LIBRARY TRUE)
 add_flang_library(flang_shared
@@ -489,9 +494,12 @@ add_flang_library(flang_shared
   ${SHARED_SOURCES}
   )
 set_property(TARGET flang_shared PROPERTY OUTPUT_NAME flang)
-target_link_libraries(flang_shared ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/libflangrti.so)
+target_link_libraries(flang_shared flangrti_shared)
 # Resolve symbols against libm and librt
-target_link_libraries(flang_shared m rt)
+target_link_libraries(flang_shared rt)
+if (NOT MSVC)
+target_link_libraries(flang_shared  m)
+endif()
 
 set(SHARED_LIBRARY FALSE)
 
@@ -538,7 +546,6 @@ set_source_files_properties(
   OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/iso_c_binding.mod
   )
 
-
 set_target_properties(flang_static flang_shared
   PROPERTIES
   ARCHIVE_OUTPUT_DIRECTORY ${FLANG_RTE_LIB_DIR}
@@ -568,9 +575,10 @@ add_dependencies(flang_shared
   flang2
   )
 
-target_compile_options(flang_static PRIVATE -fPIC)
-
-target_compile_options(flang_shared PRIVATE -fPIC)
+if (NOT MSVC)
+  target_compile_options(flang_static PRIVATE -fPIC)
+  target_compile_options(flang_shared PRIVATE -fPIC)
+endif()
 
 target_compile_options(flang_static PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:-Mreentrant>)
 

runtime/flang/access3f.c

@@ -20,7 +20,9 @@
 /*	access3f.c - Implements LIB3F access subroutine.  */
 
 /* must include ent3f.h AFTER io3f.h */
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 
 #include "io3f.h"
 #include "ent3f.h"

runtime/flang/alarm3f.c

@@ -19,7 +19,7 @@
 
 /*	alarm3f.c - Implements LIB3F alarm subprogram.  */
 
-#ifndef WINNT
+#ifndef _WIN32
 #include <signal.h>
 #include "ent3f.h"
 

runtime/flang/allo.c

@@ -247,7 +247,7 @@ I8(__fort_alloc)(__INT_T nelem, dtype kind, size_t len, __STAT_T *stat,
   char msg[80];
   char *p_env;
 
-#if (defined(WIN64) || defined(WIN32))
+#if (defined(_WIN32))
 #define ALN_LARGE
 #else
 #undef ALN_LARGE
@@ -396,7 +396,7 @@ I8(__alloc04)(__NELEM_T nelem, dtype kind, size_t len,
   if (!ISPRESENT(errmsg))
     errmsg = NULL;
 
-#if (defined(WIN64) || defined(WIN32))
+#if (defined(_WIN32))
 #define ALN_LARGE
 #else
 #undef ALN_LARGE

runtime/flang/amod.c

@@ -17,16 +17,8 @@
 
 #include "mthdecls.h"
 
-#if defined(WIN64)
-float __fmth_i_amod(float f, float g);
-#endif
-
 float
 __mth_i_amod(float f, float g)
 {
-#if defined(WIN64)
-  return __fmth_i_amod(f, g);
-#else
   return FMODF(f, g);
-#endif
 }

runtime/flang/assign.c

@@ -210,8 +210,8 @@ __fortio_assign(char *item,      /* where to store */
     case __INT8:
       if (__ftn_32in64_)
         I64_MSH(valp->val.i8) = 0;
-      PP_INT4(item) = valp->val.i8[0];
-      PP_INT4(item + 4) = valp->val.i8[1];
+      PP_INT4(item) = I64_LSH(valp->val.i8);
+      PP_INT4(item + 4) = I64_MSH(valp->val.i8);
       break;
     case __REAL4:
       PP_REAL4(item) = (float)I64_LSH(valp->val.i8);