sort hugetlb and shm alloc options
This commit is contained in:
parent
faf7b3d1bb
commit
9c4e10fbd1
|
@ -356,6 +356,9 @@ OBJCONV = $(CROSS_SUFFIX)objconv
|
||||||
ifeq ($(NOFORTRAN), 1)
|
ifeq ($(NOFORTRAN), 1)
|
||||||
C_LAPACK = 1
|
C_LAPACK = 1
|
||||||
override FEXTRALIB =
|
override FEXTRALIB =
|
||||||
|
ifeq ($(C_COMPILER), GCC)
|
||||||
|
CCOMMON_OPT += -Wno-error=incompatible-pointer-types
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(C_COMPILER), GCC)
|
ifeq ($(C_COMPILER), GCC)
|
||||||
|
@ -959,18 +962,12 @@ endif
|
||||||
|
|
||||||
ifeq ($(ARCH), loongarch64)
|
ifeq ($(ARCH), loongarch64)
|
||||||
LA64_ABI=$(shell $(CC) -mabi=lp64d -c $(TOPDIR)/cpuid_loongarch64.c -o /dev/null > /dev/null 2> /dev/null && echo lp64d)
|
LA64_ABI=$(shell $(CC) -mabi=lp64d -c $(TOPDIR)/cpuid_loongarch64.c -o /dev/null > /dev/null 2> /dev/null && echo lp64d)
|
||||||
LA64_ARCH=$(shell $(CC) -march=loongarch64 -c $(TOPDIR)/cpuid_loongarch64.c -o /dev/null > /dev/null 2> /dev/null && echo loongarch64)
|
|
||||||
ifneq ($(LA64_ABI), lp64d)
|
ifneq ($(LA64_ABI), lp64d)
|
||||||
LA64_ABI=lp64
|
LA64_ABI=lp64
|
||||||
endif
|
endif
|
||||||
ifneq ($(LA64_ARCH), loongarch64)
|
|
||||||
CCOMMON_OPT += -mabi=$(LA64_ABI)
|
|
||||||
FCOMMON_OPT += -mabi=$(LA64_ABI)
|
|
||||||
else
|
|
||||||
CCOMMON_OPT += -march=loongarch64 -mabi=$(LA64_ABI)
|
CCOMMON_OPT += -march=loongarch64 -mabi=$(LA64_ABI)
|
||||||
FCOMMON_OPT += -march=loongarch64 -mabi=$(LA64_ABI)
|
FCOMMON_OPT += -march=loongarch64 -mabi=$(LA64_ABI)
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -1589,13 +1586,23 @@ ifdef FUNCTION_PROFILE
|
||||||
CCOMMON_OPT += -DFUNCTION_PROFILE
|
CCOMMON_OPT += -DFUNCTION_PROFILE
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef SHMEM_ALLOCATION
|
||||||
|
ifneq ($(SHMEM_ALLOCATION), 0)
|
||||||
|
CCOMMON_OPT += -DALLOC_SHM
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef HUGETLB_ALLOCATION
|
ifdef HUGETLB_ALLOCATION
|
||||||
|
ifneq ($(HUGETLB_ALLOCATION), 0)
|
||||||
CCOMMON_OPT += -DALLOC_HUGETLB
|
CCOMMON_OPT += -DALLOC_HUGETLB
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef HUGETLBFILE_ALLOCATION
|
ifdef HUGETLBFILE_ALLOCATION
|
||||||
|
ifneq ($(HUGETLBFILE_ALLOCATION), 0)
|
||||||
CCOMMON_OPT += -DALLOC_HUGETLBFILE -DHUGETLB_FILE_NAME=$(HUGETLBFILE_ALLOCATION)
|
CCOMMON_OPT += -DALLOC_HUGETLBFILE -DHUGETLB_FILE_NAME=$(HUGETLBFILE_ALLOCATION)
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef STATIC_ALLOCATION
|
ifdef STATIC_ALLOCATION
|
||||||
CCOMMON_OPT += -DALLOC_STATIC
|
CCOMMON_OPT += -DALLOC_STATIC
|
||||||
|
|
Loading…
Reference in New Issue