Windows: fixes

.appveyor.yml

@@ -0,0 +1,53 @@
+branches:
+  only:
+    - master
+    - windows
+    - windows-rebased
+
+environment:
+  global:
+    CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
+    APPVEYOR_SAVE_CACHE_ON_FAILURE: true
+
+cache:
+  - '%CONDA_INSTALL_LOCN%\pkgs'
+
+os: Visual Studio 2017
+
+platform:
+  - x64
+
+install:
+  # Add path, activate `conda` and update conda.
+  - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
+  # Add our channels.
+  - cmd: conda config --add channels defaults
+  - cmd: conda config --add channels conda-forge
+  - cmd: conda install --yes llvmdev clangdev flang-meta cmake
+  - cmd: conda install --yes -c isuruf kitware-ninja
+
+
+build_script:
+  - ps: mkdir build
+
+  - cd build
+  - set "PATH=%cd%\bin;%PATH%"
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+  - cmake -G "Ninja" -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX% -DFLANG_INCLUDE_TESTS=ON -DFLANG_TEST_VERBOSE_MODE=ON -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DLLVM_INCLUDE_TESTS=ON -DLLVM_MAIN_SRC_DIR=C:\llvm_src ..
+  - ps: |
+      Push-AppveyorArtifact .\CMakeFiles\CMakeOutput.log
+      Push-AppveyorArtifact .\CMakeFiles\CMakeError.log
+
+  - ps: |
+      cmake --build . 2>&1 | Out-File build_output.txt
+      if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode )  }
+      Push-AppveyorArtifact .\build_output.txt
+      Get-Content .\build_output.txt -Tail 500
+
+  - ps: Compress-Archive -Path C:\projects\flang\build\bin -DestinationPath C:\Projects\flang\bin.zip
+  - ps: Push-AppveyorArtifact C:\Projects\flang\bin.zip
+  - ps: Compress-Archive -Path C:\projects\flang\build\lib -DestinationPath C:\Projects\flang\lib.zip
+  - ps: Push-AppveyorArtifact C:\Projects\flang\lib.zip
+
+test_script:
+  - cmd: cmake --build . --target install

.travis.yml

@@ -0,0 +1,44 @@
+language: c
+
+cache:
+  directories:
+    - $HOME/.conda/pkgs
+    - $HOME/miniconda/pkgs
+
+branches:
+  only:
+  - master
+  - windows
+
+install:
+  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+  - bash miniconda.sh -u -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda config --add channels conda-forge --force
+  - conda update -q conda
+
+  - conda create -q -n test-environment
+        flang-meta 
+        llvmdev
+        clangdev
+        openmp
+        cmake
+
+  - source activate test-environment
+  - conda info -a
+
+  # For testing
+  #- pip install lit
+
+script:
+  - mkdir -p build
+  - cd build
+  - cmake -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DFLANG_INCLUDE_TESTS=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_Fortran_COMPILER=flang ..
+  - make -j4
+  - make install -j4  
+  #- make check-flang
+
+notifications:
+    email: false

CMakeLists.txt

@@ -21,16 +21,20 @@ cmake_minimum_required(VERSION 2.8)
 # In order to bootstrap the runtime library we need to skip
 # CMake's Fortran tests
 SET(CMAKE_Fortran_COMPILER_WORKS 1)
+SET(CMAKE_Fortran_ABI_COMPILED 0)
+SET(CMAKE_Fortran_COMPILER_SUPPORTS_F90 1)
+SET(CMAKE_Fortran_PREPROCESS_SOURCE
+    "<CMAKE_Fortran_COMPILER> -cpp <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> -o <PREPROCESSED_SOURCE>")
+SET(CMAKE_Fortran_MODDIR_FLAG "-module ")
 
-if( NOT DEFINED TARGET_ARCHITECTURE )
-  execute_process(COMMAND uname -m OUTPUT_STRIP_TRAILING_WHITESPACE
-                  OUTPUT_VARIABLE 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 )
+  project(Flang)
 endif()
 
-if( NOT DEFINED TARGET_OS )
-  execute_process(COMMAND uname -s OUTPUT_STRIP_TRAILING_WHITESPACE
-                  OUTPUT_VARIABLE TARGET_OS)
-endif()
+set(TARGET_OS ${CMAKE_HOST_SYSTEM_NAME} CACHE STRING "Target OS")
+set(TARGET_ARCHITECTURE ${CMAKE_HOST_SYSTEM_PROCESSOR} CACHE STRING "Target Architecture")
 
 if( ${TARGET_OS} STREQUAL "Linux" )
   set(OS "LINUX")
@@ -51,16 +55,26 @@ if( ${TARGET_OS} STREQUAL "Linux" )
     message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
     return()
   endif()
+elseif(${TARGET_OS} STREQUAL "Windows" )
+  set(OS "WINDOWS")
+  set(OSNAME "Windows")
+  add_definitions(-DWIN32 -DHOST_WIN -DWINNT -DTARGET_WIN -DTARGET_WIN_X86)
+  if( ${TARGET_ARCHITECTURE} STREQUAL "AMD64" )
+    add_definitions(-DWIN64 -DTARGET_WIN_X8664)
+    set(TARGET_ARCHITECTURE "x86_64")
+    set(ARCHNAME x86-64)
+    set(ARCH X86)
+    set(WRDSZ 64)
+  else()
+    add_definitions(-DTARGET_WIN_X8632)
+    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 )
@@ -326,7 +340,7 @@ macro(add_flang_library name)
   endif( LLVM_COMMON_DEPENDS )
 
   llvm_config( ${name} ${LLVM_LINK_COMPONENTS} )
-  target_link_libraries( ${name} ${LLVM_COMMON_LIBS} )
+  target_link_libraries( ${name} ${LLVM_COMMON_LIBS})
 #  link_system_libs( ${name} )  # getd of cmake warning messages
 
   install(TARGETS ${name}

LICENSE.txt

@@ -12,3 +12,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+

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

@@ -34,6 +34,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef _WIN32
+#include <mmintrin.h>
+#endif
 
 /*
  *  Build-time sanity checks
@@ -82,15 +85,27 @@ configure_denormals(bool denorms_are_zeros, bool flush_to_zero)
   if (fegetenv(&fenv) != 0)
     fprintf(stderr, "fegetenv() failed: %s\n", strerror(errno));
 #ifdef __x86_64__
-  fenv.__mxcsr &= ~0x0040;
+#ifdef _WIN32
+  unsigned int mxcsr = _mm_getcsr();
+#else
+  unsigned int mxcsr = fenv.__mxcsr;
+#endif
+  mxcsr &= ~0x0040;
   if (denorms_are_zeros)
-    fenv.__mxcsr |= 0x0040;
-  fenv.__mxcsr &= ~0x8000;
+    mxcsr |= 0x0040;
+  mxcsr &= ~0x8000;
   if (flush_to_zero)
-    fenv.__mxcsr |= 0x8000;
+    mxcsr |= 0x8000;
+#ifdef _WIN32
+  _mm_setcsr( mxcsr );
+#else
+  fenv.__mxcsr = mxcsr;
 #endif
+#endif
+#ifndef _WIN32
   if (fesetenv(&fenv) != 0)
     fprintf(stderr, "fesetenv() failed: %s\n", strerror(errno));
+#endif
 }
 
 /*

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

@@ -32,6 +32,7 @@
 #if defined(HOST_WIN)
 #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
  */

runtime/CMakeLists.txt

@@ -20,15 +20,21 @@ add_definitions(
  -DMAXCPUS=256 
  -DMAXCPUSL=8 
  -DMAXCPUSR=8 
- -DTARGET_LINUX 
  -DTARGET_LLVM 
- -DLINUX 
- -DPGF90 
+ -DPGF90
  -DPGFLANG
  -DNATIVE_FPCVT
  -DPGI_LITTLE_ENDIAN
 )
 
+if( ${TARGET_OS} STREQUAL "Linux" )
+  add_definitions(
+    -DTARGET_LINUX
+    -DLINUX
+  )
+endif()
+
+
 if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )
   add_definitions(
    -DTARGET_X8664