diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2003-06-26 22:04:59 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2003-06-26 22:04:59 (GMT) |
| commit | 64e6514b68783d50268e5ff7639af9bb0fad52ac (patch) | |
| tree | b074ac5fd712a784fc8acfd771014d27bbd587f0 /fortran | |
| parent | 8369a1a908febdd4e89bb6773248fd209e631886 (diff) | |
| download | hdf5-64e6514b68783d50268e5ff7639af9bb0fad52ac.zip hdf5-64e6514b68783d50268e5ff7639af9bb0fad52ac.tar.gz hdf5-64e6514b68783d50268e5ff7639af9bb0fad52ac.tar.bz2 | |
[svn-r7113]
Purpose: Small bug fix
Description: On SP when 64 bit mode is used, RUNPARALLEL environment
variable is not set up correctly for Fortran.
Solution: Copy Albert's fix for C library to Fortran
Platforms tested: copper with 64-bit parallle C and Fortran
Misc. update:
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/config/powerpc-ibm-aix5.x | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/fortran/config/powerpc-ibm-aix5.x b/fortran/config/powerpc-ibm-aix5.x index b561cd4..9b9a4d1 100644 --- a/fortran/config/powerpc-ibm-aix5.x +++ b/fortran/config/powerpc-ibm-aix5.x @@ -3,22 +3,25 @@ # This file is part of the HDF5 build script. It is processed shortly # after configure starts and defines, among other things, flags for # the various compile modes. -# -# See BlankForm in this directory for details. # Use AIX supplied C compiler by default, xlc for serial, mpcc_r for parallel. # Use -D_LARGE_FILES by default to support large file size. if test "X-" = "X-$CC"; then if test "X-$enable_parallel" = "X-yes"; then - CC='mpcc_r -D_LARGE_FILES' + CC='mpcc_r -qlanglvl=ansi -D_LARGE_FILES' CC_BASENAME=mpcc_r - RUNPARALLEL=${RUNPARALLEL="MP_PROCS=3 MP_TASKS_PER_NODE=3 poe"} else - CC='xlc -D_LARGE_FILES' + CC='xlc -qlanglvl=ansi -D_LARGE_FILES' CC_BASENAME=xlc fi fi +# Define RUNPARALLEL if parallel mode is enabled or a parallel compiler used. +if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpcc_r; then + RUNPARALLEL=${RUNPARALLEL="MP_PROCS=\$\${NPROCS:=3} MP_TASKS_PER_NODE=\$\${NPROCS:=3} poe"} +fi + + #---------------------------------------------------------------------------- # Compiler flags. The CPPFLAGS values should not include package debug # flags like `-DH5G_DEBUG' since these are added with the @@ -54,20 +57,6 @@ case $CC_BASENAME in ;; esac -# Cross compiling defaults -ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'} -ac_cv_header_stdc=${ac_cv_header_stdc='yes'} -ac_cv_sizeof_short=${ac_cv_sizeof_short=2} -ac_cv_sizeof_int=${ac_cv_sizeof_int=4} -ac_cv_sizeof_long=${ac_cv_sizeof_long=4} -ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} -ac_cv_sizeof_float=${ac_cv_sizeof_float=4} -ac_cv_sizeof_double=${ac_cv_sizeof_double=8} -ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} -ac_cv_sizeof_int=${ac_cv_sizeof_int=4} -# Don't cache size_t and off_t because they depend on if -D_LARGE_FILES is used -#ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} -#ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8} # The default Fortran 90 compiler |