Merge remote branch 'origin/develop' into haswell

diff --combined Makefile.system
index ccf6461,7da074a..1176928
--- 1/Makefile.system
--- 2/Makefile.system
+++ b/Makefile.system
@@@ -229,6 -229,11 +229,11 @@@ endi
  endif
  endif
  
+ # ifeq logical or
+ ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT Interix))
+ OS_WINDOWS=1
+ endif
+ 
  ifdef QUAD_PRECISION
  CCOMMON_OPT   += -DQUAD_PRECISION
  NO_EXPRECISION = 1
@@@ -331,14 -336,14 +336,14 @@@ ifeq ($(ARCH), x86
  DYNAMIC_CORE = KATMAI COPPERMINE NORTHWOOD PRESCOTT BANIAS \
               CORE2 PENRYN DUNNINGTON NEHALEM ATHLON OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO
  ifneq ($(NO_AVX), 1)
 -DYNAMIC_CORE += SANDYBRIDGE BULLDOZER PILEDRIVER
 +DYNAMIC_CORE += SANDYBRIDGE BULLDOZER PILEDRIVER HASWELL
  endif
  endif
  
  ifeq ($(ARCH), x86_64)
  DYNAMIC_CORE = PRESCOTT CORE2 PENRYN DUNNINGTON NEHALEM OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO
  ifneq ($(NO_AVX), 1)
 -DYNAMIC_CORE += SANDYBRIDGE BULLDOZER PILEDRIVER
 +DYNAMIC_CORE += SANDYBRIDGE BULLDOZER PILEDRIVER HASWELL
  endif
  endif
  
@@@ -470,10 -475,8 +475,8 @@@ CCOMMON_OPT += -DF_INTERFACE_GFOR
  FCOMMON_OPT += -Wall
  #Don't include -lgfortran, when NO_LAPACK=1 or lsbcc
  ifneq ($(NO_LAPACK), 1)
- ifneq ($(C_COMPILER), LSB)
  EXTRALIB += -lgfortran 
  endif
- endif
  ifdef NO_BINARY_MODE
  ifeq ($(ARCH), mips64)
  ifdef BINARY64
@@@ -842,11 -845,18 +845,18 @@@ override FFLAGS     += $(COMMON_OPT) $(
  override FPFLAGS    += $(COMMON_OPT) $(FCOMMON_OPT) $(COMMON_PROF)
  #MAKEOVERRIDES =
  
+ #For LAPACK Fortran codes.
+ LAPACK_FFLAGS := $(filter-out -fopenmp -mp -openmp -xopenmp=parallel,$(FFLAGS))
+ LAPACK_FPFLAGS := $(filter-out -fopenmp -mp -openmp -xopenmp=parallel,$(FPFLAGS))
+ 
  LAPACK_CFLAGS = $(CFLAGS)
  LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H 
  ifdef INTERFACE64
  LAPACK_CFLAGS +=  -DLAPACK_ILP64
  endif
+ ifdef OS_WINDOWS
+ LAPACK_CFLAGS +=  -DOPENBLAS_OS_WINDOWS
+ endif
  ifeq ($(C_COMPILER), LSB)
  LAPACK_CFLAGS +=  -DLAPACK_COMPLEX_STRUCTURE
  endif