Browse Source
Merge pull request #4245 from RajalakshmiSR/xlf_fix
powerpc: Fix build errors with xlftags/v0.3.25^2
Martin Kroeker
GitHub
2 years ago
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Unified View
Diff Options
-
+4 -0Makefile.power
-
+1 -1Makefile.system
-
+3 -0f_check
+ 4
- 0
Makefile.power
View File
| @@ -70,8 +70,12 @@ else | |||||
| FCOMMON_OPT += -O1 -frecursive -mcpu=power8 -mtune=power8 -fno-fast-math | FCOMMON_OPT += -O1 -frecursive -mcpu=power8 -mtune=power8 -fno-fast-math | ||||
| endif | endif | ||||
| else | else | ||||
| ifeq ($(F_COMPILER), IBM) | |||||
| FCOMMON_OPT += -O2 -qrecur -qnosave | |||||
| else | |||||
| FCOMMON_OPT += -O2 -frecursive -mcpu=power8 -mtune=power8 -fno-fast-math | FCOMMON_OPT += -O2 -frecursive -mcpu=power8 -mtune=power8 -fno-fast-math | ||||
| endif | endif | ||||
| endif | |||||
| else | else | ||||
| FCOMMON_OPT += -O2 -Mrecursive | FCOMMON_OPT += -O2 -Mrecursive | ||||
| endif | endif | ||||
+ 1
- 1
Makefile.system
View File
| @@ -1168,7 +1168,7 @@ endif | |||||
| ifeq ($(F_COMPILER), IBM) | ifeq ($(F_COMPILER), IBM) | ||||
| CCOMMON_OPT += -DF_INTERFACE_IBM | CCOMMON_OPT += -DF_INTERFACE_IBM | ||||
| FEXTRALIB += -lxlf90 | FEXTRALIB += -lxlf90 | ||||
| ifeq ($(C_COMPILER), GCC) | |||||
| ifeq ($(C_COMPILER), $(filter $(C_COMPILER),GCC CLANG)) | |||||
| FCOMMON_OPT += -qextname | FCOMMON_OPT += -qextname | ||||
| endif | endif | ||||
| # FCOMMON_OPT += -qarch=440 | # FCOMMON_OPT += -qarch=440 | ||||
+ 3
- 0
f_check
View File
| @@ -117,6 +117,9 @@ else | |||||
| vendor=PGI | vendor=PGI | ||||
| openmp='-mp' | openmp='-mp' | ||||
| ;; | ;; | ||||
| *xlf*) | |||||
| vendor=IBM | |||||
| ;; | |||||
| *) | *) | ||||
| vendor=G77 | vendor=G77 | ||||
| openmp='' | openmp='' | ||||