summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2007-02-13 21:15:44 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2007-02-13 21:15:44 (GMT)
commit463b0b401bc9efa6e1a877a51d32b13d4fda9135 (patch)
tree07b6d75a11a2eb3da23f8ca550c4f511f77eea59
parent105cd8ad8f33ccf7dd4cf9664c1214a99e3a0554 (diff)
downloadhdf5-463b0b401bc9efa6e1a877a51d32b13d4fda9135.zip
hdf5-463b0b401bc9efa6e1a877a51d32b13d4fda9135.tar.gz
hdf5-463b0b401bc9efa6e1a877a51d32b13d4fda9135.tar.bz2
[svn-r13289] Added support for g95 for MAC Intel Darwin 8.8.2
Platforms tested: my laptop (pahra) and kagiso (too minor for h5commit)
-rw-r--r--MANIFEST2
-rw-r--r--config/i686-darwin8.8.230
-rw-r--r--fortran/config/i686-darwin8.8.277
-rw-r--r--fortran/src/H5f90i.h6
-rw-r--r--release_docs/RELEASE.txt3
5 files changed, 115 insertions, 3 deletions
diff --git a/MANIFEST b/MANIFEST
index c22c67c..b1820af 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -79,6 +79,7 @@
./config/hpux11.23
./config/hpux9.03
./config/i386-pc-cygwin32
+./config/i686-darwin8.8.2
./config/i686-pc-cygwin
./config/ia64-linux-gnu
./config/intel-flags
@@ -839,6 +840,7 @@
./fortran/config/hpux11.23
./fortran/config/hpux9.03
./fortran/config/i386-pc-cygwin32
+./fortran/config/i686-darwin8.8.2
./fortran/config/ia64-linux-gnu
./fortran/config/intel-fflags
./fortran/config/intel-flags
diff --git a/config/i686-darwin8.8.2 b/config/i686-darwin8.8.2
new file mode 100644
index 0000000..9dc6f70
--- /dev/null
+++ b/config/i686-darwin8.8.2
@@ -0,0 +1,30 @@
+# -*- shell-script -*-
+#
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5. The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html. COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page. It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+
+# 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.
+
+# The default compiler is `gcc'
+if test "X-" = "X-$CC"; then
+ CC=gcc
+ CC_BASENAME=gcc
+fi
+
+# Figure out compiler flags
+. $srcdir/config/gnu-flags
+
diff --git a/fortran/config/i686-darwin8.8.2 b/fortran/config/i686-darwin8.8.2
new file mode 100644
index 0000000..13c8d22
--- /dev/null
+++ b/fortran/config/i686-darwin8.8.2
@@ -0,0 +1,77 @@
+# -*- shell-script -*-
+#
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5. The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html. COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page. It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+
+
+# 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.
+
+# The default compiler is `gcc'
+if test "X-" = "X-$CC"; then
+ CC=gcc
+ CC_BASENAME=gcc
+fi
+
+. $srcdir/config/gnu-flags
+
+
+# The default Fortran 90 compiler
+if test "X-" = "X-$F9X"; then
+ F9X=g95
+ F9X_BASENAME=g95
+fi
+# Figure out the F9X_BASENAME
+ tmpfile=/tmp/cmpver.$$
+ ( $F9X -v; $F9X -V) >$tmpfile 2>&1
+ if grep 'g95' $tmpfile > /dev/null; then
+ F9X_BASENAME=g95
+ CFLAGS="$CFLAGS -DH5_G95"
+ fi
+rm -f $tmpfile
+
+#
+# HDF5 integers
+#
+# R_LARGE is the number of digits for the bigest integer supported.
+# R_INTEGER is the number of digits in INTEGER
+#
+# (for the AIX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HADDR_T='SELECTED_INT_KIND(R_LARGE)'
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+case $F9X_BASENAME in
+ g95)
+ F9XSUFFIXFLAG=""
+ FFLAGS="$FFLAGS "
+ FSEARCH_DIRS="-I./ -I../src"
+ DEBUG_FFLAGS="-g"
+ PROD_FFLAGS="-O"
+ PROFILE_FFLAGS="-g -pg"
+ f9x_flags_set=yes
+ here
+ ;;
+
+
+esac
+
+
diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h
index 0286168..7ba47a3 100644
--- a/fortran/src/H5f90i.h
+++ b/fortran/src/H5f90i.h
@@ -62,7 +62,9 @@ typedef int size_t_f;
typedef int int_f;
typedef int hid_t_f;
typedef float real_f;
-#define FNAME(x) x
+#if defined H5_G95
+#define FNAME_POST2_UNDERSCORE
+#endif
#if defined H5_ABSOFT
#define DF_CAPFNAMES
#endif /*H5_ABSOFT*/
@@ -240,7 +242,7 @@ typedef float real_f;
#if !defined(FNAME_PRE_UNDERSCORE) && defined(FNAME_POST_UNDERSCORE)
# define FNAME(x) x##_
#endif
-#if !defined(FNAME_PRE_UNDERSCORE) && !defined(FNAME_POST_UNDERSCORE)
+#if !defined(FNAME_PRE_UNDERSCORE) && !defined(FNAME_POST_UNDERSCORE) && !defined(FNAME_POST2_UNDERSCORE)
# define FNAME(x) x
#endif
#if !defined(FNAME_PRE_UNDERSCORE) && defined(FNAME_POST2_UNDERSCORE)
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 03e6207..3921512 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -63,7 +63,8 @@ New Features
Support for New Platforms, Languages and Compilers
==================================================
-
+ - Added support for MAC Intel (Darwin 8.8.2) (gcc 4.0.1 and g95 0.91)
+ EIP - 2007/02/13
Configuration
-------------