diff options
| author | carlkl <cmkleffner@gmail.com> | 2015-09-24 23:46:23 +0200 |
|---|---|---|
| committer | carlkl <cmkleffner@gmail.com> | 2015-09-24 23:46:23 +0200 |
| commit | b354c005ccfe961e793ec4567e9cf6bbdca1b5f2 (patch) | |
| tree | 50a456686e70f13601b30e1f9769bd88836b9d3a /numpy/distutils/fcompiler | |
| parent | 941a4e037d394dada43e3c2beef1e650d5505742 (diff) | |
| download | numpy-b354c005ccfe961e793ec4567e9cf6bbdca1b5f2.tar.gz | |
BLD: mingwpy fixes
Diffstat (limited to 'numpy/distutils/fcompiler')
| -rw-r--r-- | numpy/distutils/fcompiler/gnu.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py index a7fd3a77f..9acbe537d 100644 --- a/numpy/distutils/fcompiler/gnu.py +++ b/numpy/distutils/fcompiler/gnu.py @@ -24,7 +24,6 @@ def is_win32(): return sys.platform == "win32" and platform.architecture()[0] == "32bit" if is_win64(): - #_EXTRAFLAGS = ["-fno-leading-underscore"] _EXTRAFLAGS = [] else: _EXTRAFLAGS = [] @@ -215,10 +214,12 @@ class GnuFCompiler(FCompiler): # 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 ' - '-mincoming-stack-boundary=2'] + opt = ['-O2 -march=pentium4 -mtune=generic -mfpmath=sse -msse2' + ' -mlong-double-64 -mincoming-stack-boundary=2' + ' -ffpe-summary=invalid,zero'] else: - opt = ['-O2 -march=x86-64 -DMS_WIN64 -mtune=generic -msse2'] + opt = ['-O2 -march=x86-64 -DMS_WIN64 -mtune=generic -msse2' + ' -mlong-double-64 -ffpe-summary=invalid,zero'] else: opt = ['-O2'] @@ -270,11 +271,11 @@ class Gnu95FCompiler(GnuFCompiler): 'version_cmd' : ["<F90>", "-dumpversion"], 'compiler_f77' : [None, "-Wall", "-g", "-ffixed-form", "-fno-second-underscore"] + _EXTRAFLAGS, - 'compiler_f90' : [None, "-Wall", "-g", + 'compiler_f90' : [None, "-Wall", "-fno-second-underscore"] + _EXTRAFLAGS, 'compiler_fix' : [None, "-Wall", "-g","-ffixed-form", "-fno-second-underscore"] + _EXTRAFLAGS, - 'linker_so' : ["<F90>", "-Wall", "-g"], + 'linker_so' : ["<F90>", "-Wall"], 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"], 'linker_exe' : [None, "-Wall"] |