summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Soumagne <jsoumagne@hdfgroup.org>2015-03-25 17:56:55 (GMT)
committerJerome Soumagne <jsoumagne@hdfgroup.org>2015-03-25 17:56:55 (GMT)
commit15efd662a3e9f94ea74ef2fbc3d04c9f3934da80 (patch)
treeff4d773146e402315edbdcc85bc9552b93e1ce6f
parent98a65dc3a4730c2fa0e6afba9d2ec18d8587bfc1 (diff)
downloadhdf5-15efd662a3e9f94ea74ef2fbc3d04c9f3934da80.zip
hdf5-15efd662a3e9f94ea74ef2fbc3d04c9f3934da80.tar.gz
hdf5-15efd662a3e9f94ea74ef2fbc3d04c9f3934da80.tar.bz2
[svn-r26578] Merge r26505 from trunk
Remove DEFAULT_LIBS from configure.ac and irix6.x config file which was using it. Remove references to IRIX/irix* platform.
-rw-r--r--MANIFEST1
-rwxr-xr-xbin/buildhdf513
-rwxr-xr-xbin/locate_sw57
-rw-r--r--c++/src/h5c++.in2
-rw-r--r--config/cmake/ConfigureChecks.cmake7
-rw-r--r--config/irix6.x178
-rw-r--r--configure.ac26
-rw-r--r--tools/misc/h5cc.in2
8 files changed, 7 insertions, 279 deletions
diff --git a/MANIFEST b/MANIFEST
index 92e7793..2bc4187 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -108,7 +108,6 @@
./config/ibm-flags
./config/intel-fflags
./config/intel-flags
-./config/irix6.x
./config/linux-gnu
./config/linux-gnuaout
./config/linux-gnulibc1
diff --git a/bin/buildhdf5 b/bin/buildhdf5
index 8ed4696..3a4b0d3 100755
--- a/bin/buildhdf5
+++ b/bin/buildhdf5
@@ -159,19 +159,6 @@ LOCATE_SZLIB()
HP-UX)
szlibpaths="/afs/ncsa/projects/hdf/packages/szip_new/HPUX-11.00"
;;
- IRIX)
- szlibpaths="/afs/ncsa/projects/hdf/packages/szip_new/IRIX64-6.5-32bit"
- ;;
- IRIX64)
- case "$CC" in
- *-n32)
- szlibpaths="/afs/ncsa/projects/hdf/packages/szip_new/IRIX64-6.5-32bit"
- ;;
- *)
- szlibpaths="/afs/ncsa/projects/hdf/packages/szip_new/IRIX64-6.5"
- ;;
- esac
- ;;
Linux)
case `uname -m` in
i686)
diff --git a/bin/locate_sw b/bin/locate_sw
index 2f2b544..c9a7924 100755
--- a/bin/locate_sw
+++ b/bin/locate_sw
@@ -67,33 +67,6 @@ case "$OSname" in
;;
esac
;;
- IRIX)
- swpaths="/afs/ncsa/packages/hdf/IRIX_6.5"
- ;;
- IRIX64)
- case "$CC" in
- cc|"") #default cc
- abi=`cc -show_defaults 2>&1 | grep 'default abi'`
- case $abi in
- *-n32)
- swpaths="/afs/ncsa/packages/hdf/IRIX64-n32_6.5"
- ;;
- *-64)
- swpaths="/afs/ncsa/packages/hdf/IRIX64_6.5"
- ;;
- *)
- swpaths="/afs/ncsa/packages/hdf/IRIX64_6.5"
- ;;
- esac # $abi
- ;;
- *-n32)
- swpaths="/afs/ncsa/packages/hdf/IRIX64-n32_6.5"
- ;;
- *)
- swpaths="/afs/ncsa/packages/hdf/IRIX64_6.5"
- ;;
- esac
- ;;
Linux)
swpaths="/afs/ncsa/packages/hdf/Linux"
;;
@@ -150,36 +123,6 @@ case "$OSname" in
;;
esac
;;
- IRIX)
- swpaths="/afs/ncsa/packages/hdf5/IRIX_6.5"
- ;;
- IRIX64)
- case "$CC" in
- cc|"") #default cc
- abi=`cc -show_defaults 2>&1 | grep 'default abi'`
- case $abi in
- *-n32)
- swpaths="/afs/ncsa/packages/hdf5/IRIX64-n32_6.5"
- ;;
- *-64)
- #swpaths="/afs/ncsa/packages/hdf5/IRIX64_6.5"
- swpaths="/afs/ncsa/packages/hdf5/5-1.4.3-irix64"
- ;;
- *)
- #swpaths="/afs/ncsa/packages/hdf5/IRIX64_6.5"
- swpaths="/afs/ncsa/packages/hdf5/5-1.4.3-irix64"
- ;;
- esac # $abi
- ;;
- *-n32)
- swpaths="/afs/ncsa/packages/hdf5/IRIX64-n32_6.5"
- ;;
- *)
- #swpaths="/afs/ncsa/packages/hdf5/IRIX64_6.5"
- swpaths="/afs/ncsa/packages/hdf5/5-1.4.3-irix64"
- ;;
- esac
- ;;
Linux)
swpaths="/afs/ncsa/packages/hdf5/Linux"
;;
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index a4aaf52..069842a 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -333,7 +333,7 @@ if test "x$do_link" = "xyes"; then
hpux*) flag="-Wl,+b -Wl," ;;
freebsd*|solaris*) flag="-R" ;;
rs6000*|aix*) flag="-L" ;;
- irix*|sgi) flag="-rpath " ;;
+ sgi) flag="-rpath " ;;
*) flag="" ;;
esac
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 939ee57..8b0d803 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -270,9 +270,7 @@ H5ConversionTests (H5_LDOUBLE_TO_INTEGER_WORKS "Checking IF converting from long
# -----------------------------------------------------------------------
# Set flag to indicate that the machine can handle conversion from
# integers to long double. (This flag should be set "yes" for all
-# machines except all SGIs, where some conversions are
-# incorrect and its cache value is set "no" in its config/irix6.x and
-# irix5.x)
+# machines except all SGIs, where some conversions are incorrect)
#
H5MiscConversionTest (H5_SIZEOF_LONG_DOUBLE H5_INTEGER_TO_LDOUBLE_ACCURATE "checking IF accurately converting from integers to long double")
# ----------------------------------------------------------------------
@@ -287,8 +285,7 @@ H5ConversionTests (H5_ULONG_TO_FLOAT_ACCURATE "Checking IF accurately converting
# ----------------------------------------------------------------------
# Set the flag to indicate that the machine can accurately convert
# 'unsigned (long) long' values to 'float' and 'double' values.
-# (This flag should be set for all machines, except for the SGIs, where
-# the cache value is set in the config/irix6.x config file) and Solaris
+# (This flag should be set for all machines, except for the SGIs) and Solaris
# 64-bit machines, where the short program below tests if round-up is
# correctly handled.
#
diff --git a/config/irix6.x b/config/irix6.x
deleted file mode 100644
index 8907a66..0000000
--- a/config/irix6.x
+++ /dev/null
@@ -1,178 +0,0 @@
-# -*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# 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://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# 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.
-
-# Disable dependency tracking on IRIX unless the user specifically asks for
-# it.
-# IRIX's pmake confuses automake (as of version 1.9) if dependency tracking
-# is enabled and it is not an in-place build. Simply disabling dependency
-# tracking on IRIX is simpler to implement than detecting pmake, detecting
-# when a build is not in-place, and then disabling dependency tracking.
-if test -z "${enable_dependency_tracking}"; then
- enable_dependency_tracking="no"
-fi
-
-# Use SGI supplied C compiler by default. There is no ranlib
-if test "X-" = "X-$CC"; then
- CC='cc'
- CC_BASENAME=cc
- # use c99 compiler if available.
- if `c99 -version >/dev/null 2>&1` ; then
- CC='c99'
- fi
-fi
-RANLIB=:
-
-# Compiler flags
-case "X-$CC_BASENAME" in
- X-gcc)
- . $srcdir/config/gnu-flags
- ;;
-
- *)
- if [ "$CC_BASENAME" = "cc" ] || ($CC -version 2>&1 | grep -s "MIPSpro Compilers") 2>&1 > /dev/null; then
- # use these flags if this is the SGI cc compiler or some compiler
- # command that eventually uses the SGI cc compiler.
-
- # Check for old versions of the compiler that don't work right.
- case "`$CC -version 2>&1 |head -1`" in
- "Mongoose Compilers: Version 7.00")
- echo " +---------------------------------------------------+"
- echo " | You have an old version of cc (Mongoose Compilers |"
- echo " | version 7.00). Please upgrade to MIPSpro version |"
- echo " | 7.2.1.2m (patches are available from the SGI web |"
- echo " | site). The 7.00 version may generate incorrect |"
- echo " | code, especially when optimizations are enabled. |"
- echo " +---------------------------------------------------+"
- sleep 5
- ;;
- esac
-
- # Always turn off these compiler warnings for the -64 compiler:
- # 1174: function declared but not used
- # 1196: __vfork() (this is an SGI config problem)
- # 1209: constant expressions
- # 1429: the `long long' type is not standard
- # 1685: turn off warnings about turning off invalid warnings
- # 3201: remark - parameter not referenced
- #H5_CFLAGS="$H5_CFLAGS -woff 1174,1429,1209,1196,1685,3201"
- H5_CFLAGS="$H5_CFLAGS -woff 1209,3201"
-
- # Always turn off these compiler warnings for the old compiler:
- # 799: the `long long' type is not standard
- # 803: turn off warnings about turning off invalid warnings
- # 835: __vfork() (this is an SGI config problem)
- #H5_CFLAGS="$H5_CFLAGS -woff 799,803,835"
-
- # Always turn off these loader warnings:
- # (notice the peculiar syntax)
- # 47: branch instructions that degrade performance on R4000
- # 84: a library is not used
- # 85: duplicate definition preemption (from -lnsl)
- # 134: duplicate weak definition preemption (from -lnsl)
- H5_CFLAGS="$H5_CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
- fi
-
- # Extra debugging flags
- DEBUG_CFLAGS="-g -fullwarn"
- DEBUG_CPPFLAGS=
-
- # Extra production flags
- PROD_CFLAGS="-O -OPT:Olimit=0 -s"
- PROD_CPPFLAGS=
-
- # Extra profiling flags
- PROFILE_CFLAGS=
- PROFILE_CPPFLAGS=
- ;;
-esac
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
- FC="f90"
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
- F9XSUFFIXFLAG=""
- FSEARCH_DIRS=""
- H5_FCFLAGS="$H5_FCFLAGS -mips4 -O -s"
- DEBUG_FCFLAGS="-mips4 -O -s"
- PROD_FCFLAGS="-mips4 -O -s"
- PROFILE_FCFLAGS="-mips4 -O -s"
- f9x_flags_set=yes
-fi
-
-# The default C++ compiler
-
-# The default compiler is `MIPSpro CC'
-if test -z "$CXX"; then
- CXX=CC
- CXX_BASENAME=CC
-fi
-
-# Try native compiler flags
-if test -z "$cxx_flags_set"; then
- # -LANG:std required for std use; -ptused causes templates used to be
- # instantiated
- AM_CPPFLAGS="$AM_CPPFLAGS -LANG:std"
- H5_CPPFLAGS="$H5_CPPFLAGS -ptused"
-
- # libCio is a default library, since libtool before 1.5 doesn't fully
- # support C++ yet, default libraries must be explicitly specified.
- # A new macro is used for this temporary and specific task so it
- # won't polute the existing configuration
- DEFAULT_LIBS="-lCio"
-
- DEBUG_CXXFLAGS=-g
- DEBUG_CPPFLAGS=
- PROD_CXXFLAGS="-O -s"
- PROD_CPPFLAGS=
- PROFILE_CXXFLAGS=-xpg
- PROFILE_CPPFLAGS=
- cxx_flags_set=yes
-fi
-
-# Hard set flag to indicate that the 'unsigned long long' to floating-point
-# value conversion are broken by the compilers (as of 4/27/04 - QAK)
-hdf5_cv_ulong_to_fp_bottom_bit_accurate=${hdf5_cv_ulong_to_fp_bottom_bit_accurate='no'}
-
-# Set flags to avoid conversion between 'long double' and integers because of
-# SGI's compiler problems. For both IRIX64 6.5 and IRIX 6.5, the compilers
-# have the following problems,
-# long double -> signed char : incorrect rounding
-# long double -> unsigned char : incorrect rounding
-# long double -> short : incorrect rounding
-# long double -> unsigned short : incorrect rounding
-# long double -> long or long long: incorrect value
-# long double -> unsigned long or long long : incorrect value
-#
-# long or long long -> long double : correct value but incorrect bit pattern
-# unsigned long or long long -> long double : correct value but incorrect bit pattern
-# (1/5/05 - SLU)
-hdf5_cv_ldouble_to_integer_accurate=${hdf5_cv_ldouble_to_integer_accurate='no'}
-hdf5_cv_integer_to_ldouble_accurate=${hdf5_cv_integer_to_ldouble_accurate='no'}
-
-# Set flag to generate alternate code for H5VM_log2_gen, to avoid
-# problems with the MIPSpro compiler 7.30 and IRIX64 6.5 (ie. other
-# combinations might work, but haven't been tested)
-# (9/15/06 - QAK)
-hdf5_cv_bad_log2_code_generated=${hdf5_cv_bad_log2_code_generated='yes'}
diff --git a/configure.ac b/configure.ac
index f7171b5..16adf57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,12 +131,6 @@ saved_user_FCFLAGS="$FCFLAGS"
saved_user_LDFLAGS="$LDFLAGS"
saved_user_CPPFLAGS="$CPPFLAGS"
-## Different compilers may need default libraries. They are specified in
-## the config/* files, so we put this statement here so that it'll be
-## set by the code which follows...
-##
-DEFAULT_LIBS=""
-
## Support F9X variable to define Fortran compiler if FC variable is
## not used. This should be deprecated in the future.
if test "x" = "x$FC"; then
@@ -255,12 +249,6 @@ case $host_os in
freebsd*)
host_os_novers=freebsd
;;
- irix5.*)
- host_os_novers=irix5.x
- ;;
- irix6.*)
- host_os_novers=irix6.x
- ;;
osf4.*)
host_os_novers=osf4.x
;;
@@ -1035,7 +1023,7 @@ case "$host" in
## many problems with including them.
AC_CHECK_HEADERS([sys/sysinfo.h sys/proc.h])
;;
- mips*-sgi*-irix*)
+ mips*-sgi*)
## The <sys/fpu.h> is needed on the SGI machines to turn off
## denormalized floating-point values going to zero. We do *not*
## attempt to locate these files on other systems because there
@@ -2619,9 +2607,7 @@ fi
## -----------------------------------------------------------------------
## Set flag to indicate that the machine can handle conversion from
## integers to long double. (This flag should be set "yes" for all
-## machines except all SGIs, where some conversions are
-## incorrect and its cache value is set "no" in its config/irix6.x and
-## irix5.x)
+## machines except all SGIs, where some conversions are incorrect)
##
AC_MSG_CHECKING([if accurately converting from integers to long double])
@@ -2692,8 +2678,7 @@ fi
## ----------------------------------------------------------------------
## Set the flag to indicate that the machine can accurately convert
## 'unsigned (long) long' values to 'float' and 'double' values.
-## (This flag should be set for all machines, except for the SGIs, where
-## the cache value is set in the config/irix6.x config file) and Solaris
+## (This flag should be set for all machines, except for the SGIs) and Solaris
## 64-bit machines, where the short program below tests if round-up is
## correctly handled.
##
@@ -3475,11 +3460,6 @@ fi
AC_SUBST([ROOT]) ROOT="`$pwd`"
## ----------------------------------------------------------------------
-## Move any compiler-specific libraries into the main LIBS varaible.
-##
-LIBS="$DEFAULT_LIBS $LIBS"
-
-## ----------------------------------------------------------------------
## Determine the runtime libraries we may need to include in the
## libtools command so that executables will find the correct dynamic
## libraries.
diff --git a/tools/misc/h5cc.in b/tools/misc/h5cc.in
index da1a26d..cabd83f 100644
--- a/tools/misc/h5cc.in
+++ b/tools/misc/h5cc.in
@@ -347,7 +347,7 @@ if test "x$do_link" = "xyes"; then
hpux*) flag="-Wl,+b -Wl," ;;
freebsd*|solaris*) flag="-R" ;;
rs6000*|aix*) flag="-L" ;;
- irix*|sgi) flag="-rpath " ;;
+ sgi) flag="-rpath " ;;
*) flag="" ;;
esac