From 74c616618c60cfa8a6bcc60ab5ddc81aa88bfd55 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 28 Feb 2008 13:11:21 +0000 Subject: [PATCH] psblas2-dev Make/Make.inc.g95 Make/Make.inc.gnu42-serialmpi Make/Make.inc.gnu42 Make/Make.inc.gnu43 Make/Make.inc.ifort9 Make/Make.inc.sp5 Make/Make.inc.sun-6.2 base/internals/srcht.c configure.ac configure Fix name of 64 bits option. --- Make/Make.inc.g95 | 2 +- Make/Make.inc.gnu42 | 2 +- Make/Make.inc.gnu42-serialmpi | 2 +- Make/Make.inc.gnu43 | 2 +- Make/Make.inc.ifort9 | 2 +- Make/Make.inc.sp5 | 4 ++-- Make/Make.inc.sun-6.2 | 2 +- base/internals/srcht.c | 4 ++-- configure | 2 +- configure.ac | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Make/Make.inc.g95 b/Make/Make.inc.g95 index 80eceaf3..07cdc97f 100644 --- a/Make/Make.inc.g95 +++ b/Make/Make.inc.g95 @@ -52,7 +52,7 @@ BLACS=-lmpiblacsg95 -L$(HOME)/LIB #METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) -# Add -DLargeFptr for 64-bit addresses +# Add -DPtr64Bits if needed PSBCDEFINES=-DLowerUnderscore # PSBFDEFINES=-DHAVE_KSENDID $(MPI_FINC) -DHAVE_MOVE_ALLOC diff --git a/Make/Make.inc.gnu42 b/Make/Make.inc.gnu42 index b11180c9..2afc9ac5 100644 --- a/Make/Make.inc.gnu42 +++ b/Make/Make.inc.gnu42 @@ -56,7 +56,7 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB #METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) -# Add -DLargeFptr for 64-bit addresses +# Add -DPtr64Bits if needed PSBCDEFINES=-DLowerUnderscore # PSBFDEFINES=-DHAVE_KSENDID $(MPI_FINC) -DHAVE_MOVE_ALLOC diff --git a/Make/Make.inc.gnu42-serialmpi b/Make/Make.inc.gnu42-serialmpi index 92589dff..6ace507c 100644 --- a/Make/Make.inc.gnu42-serialmpi +++ b/Make/Make.inc.gnu42-serialmpi @@ -55,7 +55,7 @@ EXTRA_COBJS=fakempi.o #METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) -# Add -DLargeFptr for 64-bit addresses +# Add -DPtr64Bits if needed PSBCDEFINES=-DLowerUnderscore # PSBFDEFINES=-DHAVE_MOVE_ALLOC -DSERIAL_MPI $(MPI_FINC) diff --git a/Make/Make.inc.gnu43 b/Make/Make.inc.gnu43 index 45de38ce..1c1d221f 100644 --- a/Make/Make.inc.gnu43 +++ b/Make/Make.inc.gnu43 @@ -56,7 +56,7 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB #METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) -# Add -DLargeFptr for 64-bit addresses +# Add -DPtr64Bits if needed PSBCDEFINES=-DLowerUnderscore # PSBFDEFINES=-DHAVE_KSENDID $(MPI_FINC) -DHAVE_MOVE_ALLOC diff --git a/Make/Make.inc.ifort9 b/Make/Make.inc.ifort9 index f7b09bce..14d761d7 100644 --- a/Make/Make.inc.ifort9 +++ b/Make/Make.inc.ifort9 @@ -57,7 +57,7 @@ BLACS=-lmpiblacs-ifort91 -L$(HOME)/LIB #METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) -# Add -DLargeFptr for 64-bit addresses +# Add -DPtr64Bits if needed PSBCDEFINES=-DLowerUnderscore # # Note: MOVE_ALLOC is only on Intel Fortran 9.1, NOT on 9.0 diff --git a/Make/Make.inc.sp5 b/Make/Make.inc.sp5 index 0f95cdbf..6f8b0234 100644 --- a/Make/Make.inc.sp5 +++ b/Make/Make.inc.sp5 @@ -54,8 +54,8 @@ BLACS=-lblacssmp #METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) -# Add -DLargeFptr for 64-bit addresses -PSBCDEFINES=-DLowerCase -DLargeFptr +# Add -DPtr64Bits if needed +PSBCDEFINES=-DLowerCase -DPtr64Bits # PSBFDEFINES=-WF,-DHAVE_ESSL_BLACS $(MPI_FINC) # There's no MOVE_ALLOC yet in XLF 10.1. diff --git a/Make/Make.inc.sun-6.2 b/Make/Make.inc.sun-6.2 index 9a53123e..678bb00b 100644 --- a/Make/Make.inc.sun-6.2 +++ b/Make/Make.inc.sun-6.2 @@ -54,7 +54,7 @@ BLACS=$(HOME)/LIB/libblacs_MPI-SUN4SOL2-0.a $(HOME)/LIB/libblacsCinit_MPI-SUN4SO #METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) -# Add -DLargeFptr for 64-bit addresses +# Add -DPtr64Bits if needed PSBCDEFINES=-DLowerUnderscore # SUN compiler does not have MOVE_ALLOC. PSBFDEFINES=-DHAVE_KSENDID $(MPI_FINC) diff --git a/base/internals/srcht.c b/base/internals/srcht.c index 6a24bf26..1e6bd694 100644 --- a/base/internals/srcht.c +++ b/base/internals/srcht.c @@ -164,8 +164,8 @@ typedef struct pairtree { AVLTreePtr tree; } PairTree; -#ifdef LargeFptr -typedef long long fptr; /* 32-bit by default */ +#ifdef Ptr64Bits +typedef long long fptr; #else typedef int fptr; /* 32-bit by default */ #endif diff --git a/configure b/configure index 69e1184c..a34d78c2 100755 --- a/configure +++ b/configure @@ -6479,7 +6479,7 @@ _ACEOF # Define for platforms with 64 bit (void * ) pointers if test X"$ac_cv_sizeof_void_p" == X"8" ; then - CDEFINES="-DLargeFptr $CDEFINES" + CDEFINES="-DPtr64Bits $CDEFINES" fi ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' diff --git a/configure.ac b/configure.ac index 6945d174..a8421a73 100755 --- a/configure.ac +++ b/configure.ac @@ -239,7 +239,7 @@ AC_LANG([C]) AC_CHECK_SIZEOF(void *) # Define for platforms with 64 bit (void * ) pointers if test X"$ac_cv_sizeof_void_p" == X"8" ; then - CDEFINES="-DLargeFptr $CDEFINES" + CDEFINES="-DPtr64Bits $CDEFINES" fi AC_LANG([Fortran]) __AC_FC_NAME_MANGLING