Merge pull request #6169 from rgommers/intel-build

charris · charris · commit 653a3655a302 · 2015-08-21T10:01:55.000-04:00
BLD: fix various issues for Intel Fortran and GFortran
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py
@@ -215,7 +215,7 @@ def get_flags_opt(self):
                 # use -mincoming-stack-boundary=2
                 # due to the change to 16 byte stack alignment since GCC 4.6
                 # but 32 bit Windows ABI defines 4 bytes stack alignment
-                opt = ['-O2 -march=core2 -mtune=generic -mfpmath=sse -msse2'
+                opt = ['-O2 -march=core2 -mtune=generic -mfpmath=sse -msse2 '
                        '-mincoming-stack-boundary=2']
             else:
                 opt = ['-O2 -march=x86-64 -DMS_WIN64 -mtune=generic -msse2']
diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py
@@ -173,7 +173,7 @@ def get_flags_opt(self):
         return ['/O1']  # Scipy test failures with /O2
 
     def get_flags_arch(self):
-        return ["/arch:IA-32", "/QaxSSE3"]
+        return ["/arch:IA32", "/QaxSSE3"]
 
     def runtime_library_dir_option(self, dir):
         raise NotImplementedError
