diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2004-12-29 14:32:06 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-12-29 14:32:06 (GMT) |
commit | 37232bd4f0f8199f956c823cdff72ece2ca9aa16 (patch) | |
tree | 38e37f7208355500b7f223e90bf014424c63300b /config | |
parent | 20146575aaeead9e05af73977dee863de63bf50f (diff) | |
download | hdf5-37232bd4f0f8199f956c823cdff72ece2ca9aa16.zip hdf5-37232bd4f0f8199f956c823cdff72ece2ca9aa16.tar.gz hdf5-37232bd4f0f8199f956c823cdff72ece2ca9aa16.tar.bz2 |
[svn-r9729] Purpose:
Bug Fix/Code Cleanup/Doc Cleanup/Optimization/Branch Sync :-)
Description:
Generally speaking, this is the "signed->unsigned" change to selections.
However, in the process of merging code back, things got stickier and stickier
until I ended up doing a big "sync the two branches up" operation. So... I
brought back all the "infrastructure" fixes from the development branch to the
release branch (which I think were actually making some improvement in
performance) as well as fixed several bugs which had been fixed in one branch,
but not the other.
I've also tagged the repository before making this checkin with the label
"before_signed_unsigned_changes".
Platforms tested:
FreeBSD 4.10 (sleipnir) w/parallel & fphdf5
FreeBSD 4.10 (sleipnir) w/threadsafe
FreeBSD 4.10 (sleipnir) w/backward compatibility
Solaris 2.7 (arabica) w/"purify options"
Solaris 2.8 (sol) w/FORTRAN & C++
AIX 5.x (copper) w/parallel & FORTRAN
IRIX64 6.5 (modi4) w/FORTRAN
Linux 2.4 (heping) w/FORTRAN & C++
Misc. update:
Diffstat (limited to 'config')
-rw-r--r-- | config/commence.in | 1 | ||||
-rw-r--r-- | config/conclude.in | 34 | ||||
-rw-r--r-- | config/dec-flags | 2 | ||||
-rw-r--r-- | config/depend1.in | 16 | ||||
-rw-r--r-- | config/freebsd | 4 | ||||
-rw-r--r-- | config/gnu-flags | 1 | ||||
-rw-r--r-- | config/hpux10.20 | 40 | ||||
-rw-r--r-- | config/hpux11.00 | 40 | ||||
-rw-r--r-- | config/hpux9.03 | 42 | ||||
-rw-r--r-- | config/i386-pc-cygwin32 | 6 | ||||
-rw-r--r-- | config/ia64-linux-gnu | 10 | ||||
-rw-r--r-- | config/irix5.x | 60 | ||||
-rw-r--r-- | config/irix6.x | 110 | ||||
-rw-r--r-- | config/powerpc-ibm-aix5.x | 53 | ||||
-rw-r--r-- | config/solaris2.x | 29 | ||||
-rw-r--r-- | config/sv1-cray | 63 | ||||
-rw-r--r-- | config/unicos | 59 | ||||
-rw-r--r-- | config/unicos10.0.X | 60 | ||||
-rw-r--r-- | config/unicosmk | 58 | ||||
-rw-r--r-- | config/unicosmk2.0.5.X | 58 | ||||
-rw-r--r-- | config/unicosmk2.0.6.X | 62 | ||||
-rw-r--r-- | config/unicosmk2.0.X | 56 |
22 files changed, 428 insertions, 436 deletions
diff --git a/config/commence.in b/config/commence.in index 16f13ca..7328296 100644 --- a/config/commence.in +++ b/config/commence.in @@ -70,6 +70,7 @@ PUB_DOCS= PUB_SUBDOCS= PROGS= TEST_PROGS= +PRIV_PROGS= TEST_PROGS_PARA= TEST_FLAGS= TEST_SCRIPTS= diff --git a/config/conclude.in b/config/conclude.in index 5a19a48..587a48e 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -108,19 +108,19 @@ check-vfd: ## Make installation directories directories if they don't exist. ## $(libdir): - $(top_srcdir)/bin/mkdirs $@ + -$(top_srcdir)/bin/mkdirs $@ $(includedir): - $(top_srcdir)/bin/mkdirs $@ + -$(top_srcdir)/bin/mkdirs $@ $(bindir): - $(top_srcdir)/bin/mkdirs $@ + -$(top_srcdir)/bin/mkdirs $@ $(DOCDIR): - $(top_srcdir)/bin/mkdirs $@ + -$(top_srcdir)/bin/mkdirs $@ $(EXAMPLEDIR): - $(top_srcdir)/bin/mkdirs $@ + -$(top_srcdir)/bin/mkdirs $@ ## Install the library, the public header files, and public programs. ## @@ -223,10 +223,10 @@ install-doc: $(PUB_DOCS) $(DOCDIR) ## uninstall: @for f in libhdf5.settings $(LIB); do \ - $(LT_UNINSTALL) $(libdir)/$$f; \ + $(LT_UNINSTALL) $(libdir)/$$f; \ done @if test -n "$(PUB_HDR)"; then \ - set -x; cd $(includedir) && $(RM) $(PUB_HDR); \ + set -x; cd $(includedir) && $(RM) $(PUB_HDR); \ fi @for f in X $(PUB_PROGS); do \ if test $$f != X; then \ @@ -238,15 +238,15 @@ uninstall: ## uninstall-doc: @for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ + if test $$d != X; then \ + (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done @if test -n "$(PUB_DOCS)"; then \ - set -x; cd $(DOCDIR) && $(RM) $(PUB_DOCS); \ + set -x; cd $(DOCDIR) && $(RM) $(PUB_DOCS); \ fi - @if test -n "$(PUB_SUBDOCS)"; then \ - set -x; cd $(DOCDIR) && $(RM) $(PUB_SUBDOCS); \ + @if test -n "$(PUB_SUBDOCS)"; then \ + set -x; cd $(DOCDIR) && $(RM) $(PUB_SUBDOCS); \ fi ## Removes temporary files without removing the final target files. That is, @@ -290,10 +290,10 @@ clean: mostlyclean ## distclean: clean -$(RM) .depend TAGS *~ core *.core *.bak *.old *.new $(DISTCLEAN) - @for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (set -x; cd $$d; $(MAKE) $@) || exit 1; \ - fi; \ + @for d in X $(SUBDIRS); do \ + if test $$d != X; then \ + (set -x; cd $$d; $(MAKE) $@) || exit 1; \ + fi; \ done @if test -f $(srcdir)/Makefile.in; then \ (set -x; $(RM) Makefile); \ diff --git a/config/dec-flags b/config/dec-flags index 6368ee7..32922bb 100644 --- a/config/dec-flags +++ b/config/dec-flags @@ -49,7 +49,7 @@ esac case "$cc_vendor-$cc_version" in DEC-V5.*) # Production - PROD_CFLAGS="-std -verbose -warnprotos -ieee -misalign -O4 -ansi_args -fp_reorder -readonly_strings -inline speed" + PROD_CFLAGS="-std -verbose -warnprotos -ieee -misalign -O4 -ansi_args -fp_reorder -readonly_strings -inline speed" PROD_CPPFLAGS="-D_INTRINSICS -D_INLINE_INTRINSICS" # Debug diff --git a/config/depend1.in b/config/depend1.in index eaa7488..fc2545d 100644 --- a/config/depend1.in +++ b/config/depend1.in @@ -21,14 +21,14 @@ ## tilde to the file name. ## $(srcdir)/Dependencies: .depend - @if test "$(srcdir)" != "."; then \ - echo '## This file is machine generated on GNU systems.' >$@; \ - echo '## Only temporary changes may be made here.' >>$@; \ - echo >>$@; \ - $(PERL) -p $(top_srcdir)/bin/distdep .depend >>$@; \ - else \ - echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ - fi + @if test "$(srcdir)" != "."; then \ + echo '## This file is machine generated on GNU systems.' >$@; \ + echo '## Only temporary changes may be made here.' >>$@; \ + echo >>$@; \ + $(PERL) -p $(top_srcdir)/bin/distdep .depend >>$@; \ + else \ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi .depend: $(LIB_SRC) $(TEST_SRC) $(PROG_SRC) @touch .depend diff --git a/config/freebsd b/config/freebsd index 8bdad05..4619beb 100644 --- a/config/freebsd +++ b/config/freebsd @@ -7,8 +7,8 @@ # The default compiler is `gcc' if test "X-" = "X-$CC"; then - CC=gcc - CC_BASENAME=gcc + CC=gcc + CC_BASENAME=gcc fi # Add "_POSIX_C_SOURCE" define to cpp flags, to quiet warnings diff --git a/config/gnu-flags b/config/gnu-flags index ae40c33..354c7ab 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -92,7 +92,6 @@ fi # Common GCC flags for various situations case "$cc_vendor-$cc_version" in gcc*|egcs*|pgcc*) - # Architecture-specific flags arch= case "$host_os-$host_cpu" in diff --git a/config/hpux10.20 b/config/hpux10.20 index 0b39f3c..472dbe7 100644 --- a/config/hpux10.20 +++ b/config/hpux10.20 @@ -8,29 +8,29 @@ # Default compiler is `cc' if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # Flags case "X-$CC" in - X-gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O3" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + X-gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O3" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - *) - CFLAGS="$CFLAGS -Ae" - DEBUG_CFLAGS=-g - DEBUG_CPPFLAGS="-Ae" - PROD_CFLAGS=-O - PROD_CPPFLAGS="-Ae" - PROFILE_CFLAGS= - PROFILE_CPPFLAGS="-Ae" - ;; + *) + CFLAGS="$CFLAGS -Ae" + DEBUG_CFLAGS=-g + DEBUG_CPPFLAGS="-Ae" + PROD_CFLAGS=-O + PROD_CPPFLAGS="-Ae" + PROFILE_CFLAGS= + PROFILE_CPPFLAGS="-Ae" + ;; esac diff --git a/config/hpux11.00 b/config/hpux11.00 index 0b39f3c..472dbe7 100644 --- a/config/hpux11.00 +++ b/config/hpux11.00 @@ -8,29 +8,29 @@ # Default compiler is `cc' if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # Flags case "X-$CC" in - X-gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O3" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + X-gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O3" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - *) - CFLAGS="$CFLAGS -Ae" - DEBUG_CFLAGS=-g - DEBUG_CPPFLAGS="-Ae" - PROD_CFLAGS=-O - PROD_CPPFLAGS="-Ae" - PROFILE_CFLAGS= - PROFILE_CPPFLAGS="-Ae" - ;; + *) + CFLAGS="$CFLAGS -Ae" + DEBUG_CFLAGS=-g + DEBUG_CPPFLAGS="-Ae" + PROD_CFLAGS=-O + PROD_CPPFLAGS="-Ae" + PROFILE_CFLAGS= + PROFILE_CPPFLAGS="-Ae" + ;; esac diff --git a/config/hpux9.03 b/config/hpux9.03 index abed0b3..6603aab 100644 --- a/config/hpux9.03 +++ b/config/hpux9.03 @@ -7,30 +7,30 @@ # See BlankForm in this directory for details # Default compiler is `cc' -if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc +if test "X$CC" = "X"; then + CC=cc + CC_BASENAME=cc fi # Flags case "X-$CC" in - X-gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O3" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + X-gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O3" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - *) - CFLAGS="$CFLAGS -Ae" - DEBUG_CFLAGS=-g - DEBUG_CPPFLAGS= - PROD_CFLAGS= - PROD_CPPFLAGS= - PROFILE_CFLAGS= - PROFILE_CPPFLAGS= - ;; + *) + CFLAGS="$CFLAGS -Ae" + DEBUG_CFLAGS=-g + DEBUG_CPPFLAGS= + PROD_CFLAGS= + PROD_CPPFLAGS= + PROFILE_CFLAGS= + PROFILE_CPPFLAGS= + ;; esac diff --git a/config/i386-pc-cygwin32 b/config/i386-pc-cygwin32 index 474903b..0d63288 100644 --- a/config/i386-pc-cygwin32 +++ b/config/i386-pc-cygwin32 @@ -8,9 +8,9 @@ # The default compiler is `gcc'. if test "X-" = "X-$CC"; then - CC=gcc - CC_BASENAME=gcc - LD=ld + CC=gcc + CC_BASENAME=gcc + LD=ld fi # Figure out compiler flags diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu index b212670..76f669f3 100644 --- a/config/ia64-linux-gnu +++ b/config/ia64-linux-gnu @@ -6,18 +6,14 @@ # Use Intel C compiler by default (if it's available). if test "X$CC" = "X" && which icc > /dev/null; then - CC=icc - CC_BASENAME=icc + CC=icc + CC_BASENAME=icc fi #---------------------------------------------------------------------------- # Compiler flags. The CPPFLAGS values should not include package debug # flags like `-DH5G_DEBUG' since these are added with the -# `--enable-debug' switch of configure. After titan's ecc was updated to 7.1, -# int64_t couldn't be found because of overlapping definitions in stdint.h -# and sys/types.h. So added -D__GNUC__ to CFLAGS. (This problem is no longer -# there since the C library has been updated. So -D__GNUC__ has been taken -# out.) +# `--enable-debug' switch of configure. case $CC_BASENAME in ecc|icc) diff --git a/config/irix5.x b/config/irix5.x index bd757e1..3624e7f 100644 --- a/config/irix5.x +++ b/config/irix5.x @@ -7,44 +7,44 @@ # See BlankForm in this directory for details # The default compiler is `cc' and there is no ranlib. -if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc +if test "X-" = "X-$CC"; then + CC=cc + CC_BASENAME=cc fi RANLIB=: case "X-$CC_BASENAME" in - X-gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O3" + X-gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O3" PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - *) - # Do *not* use -ansi because it prevents hdf5 from being able - # to read modification dates from the file. On some systems it - # can also result in compile errors in system header files - # since hdf5 includes a couple non-ANSI header files. - #CFLAGS="$CFLAGS -ansi" + *) + # Do *not* use -ansi because it prevents hdf5 from being able + # to read modification dates from the file. On some systems it + # can also result in compile errors in system header files + # since hdf5 includes a couple non-ANSI header files. + #CFLAGS="$CFLAGS -ansi" - # Always turn off these compiler warnings: - CFLAGS="$CFLAGS -woff 799" + # Always turn off these compiler warnings: + CFLAGS="$CFLAGS -woff 799" - # Extra debugging flags - DEBUG_CFLAGS=-g - DEBUG_CPPFLAGS= + # Extra debugging flags + DEBUG_CFLAGS=-g + DEBUG_CPPFLAGS= - # Extra production flags - # Note: higher optimizations relax alignment requirements needed. - PROD_CFLAGS="-O -s" - PROD_CPPFLAGS= + # Extra production flags + # Note: higher optimizations relax alignment requirements needed. + PROD_CFLAGS="-O -s" + PROD_CPPFLAGS= - # Extra profiling flags - PROFILE_CFLAGS=-pg - PROFILE_CPPFLAGS= - ;; + # Extra profiling flags + PROFILE_CFLAGS=-pg + PROFILE_CPPFLAGS= + ;; esac diff --git a/config/irix6.x b/config/irix6.x index e9bb680..c8918a1 100644 --- a/config/irix6.x +++ b/config/irix6.x @@ -7,78 +7,76 @@ # See BlankForm in this directory for details. # Use SGI supplied C compiler by default. There is no ranlib -if test "X-" = "X-$CC"; then +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' + CC='c99' fi fi RANLIB=: # Compiler flags case "X-$CC_BASENAME" in - X-gcc) - . $srcdir/config/gnu-flags - ;; + 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. + *) + 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 + # 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 -# CFLAGS="$CFLAGS -woff 1174,1429,1209,1196,1685,3201" - CFLAGS="$CFLAGS -woff 1209,3201" + # 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 + #CFLAGS="$CFLAGS -woff 1174,1429,1209,1196,1685,3201" + CFLAGS="$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) -# CFLAGS="$CFLAGS -woff 799,803,835" + # 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) + #CFLAGS="$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) - CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134" - fi + # 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) + CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134" + fi - # Extra debugging flags - DEBUG_CFLAGS="-g -fullwarn" - DEBUG_CPPFLAGS= + # Extra debugging flags + DEBUG_CFLAGS="-g -fullwarn" + DEBUG_CPPFLAGS= - # Extra production flags - PROD_CFLAGS="-O -OPT:Olimit=0 -s" - PROD_CPPFLAGS= + # Extra production flags + PROD_CFLAGS="-O -OPT:Olimit=0 -s" + PROD_CPPFLAGS= - # Extra profiling flags - PROFILE_CFLAGS= - PROFILE_CPPFLAGS= - ;; + # Extra profiling flags + PROFILE_CFLAGS= + PROFILE_CPPFLAGS= + ;; esac diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x index e9b9446..485ef6c 100644 --- a/config/powerpc-ibm-aix5.x +++ b/config/powerpc-ibm-aix5.x @@ -5,6 +5,7 @@ # the various compile modes. # 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 @@ -17,7 +18,7 @@ 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"} + RUNPARALLEL=${RUNPARALLEL="MP_PROCS=\$\${NPROCS:=3} MP_TASKS_PER_NODE=\$\${NPROCS:=3} poe"} fi @@ -27,33 +28,33 @@ fi # `--enable-debug' switch of configure. case $CC_BASENAME in - xlc|mpcc_r) - # Turn off shared lib option. It causes some test suite to fail. - enable_shared="${enable_shared:-no}" - # Use -D_LARGE_FILES by default to support large file size. - CFLAGS="-qlanglvl=ansi -D_LARGE_FILES $CFLAGS" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - # -O causes test/dtypes to fail badly. Turn it off for now. - PROD_CFLAGS="" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + xlc|mpcc_r) + # Turn off shared lib option. It causes some test suite to fail. + enable_shared="${enable_shared:-no}" + # Use -D_LARGE_FILES by default to support large file size. + CFLAGS="-qlanglvl=ansi -D_LARGE_FILES -DSTDC $CFLAGS" + DEBUG_CFLAGS="-g -qfullpath" + DEBUG_CPPFLAGS= + # -O causes test/dtypes to fail badly. Turn it off for now. + PROD_CFLAGS="" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-g -qfullpath -pg" + PROFILE_CPPFLAGS= + ;; - gcc) - . $srcdir/config/gnu-flags - ;; + gcc) + . $srcdir/config/gnu-flags + ;; - *) - CFLAGS="$CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + *) + CFLAGS="$CFLAGS -ansi" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; esac #---------------------------------------------------------------------------- diff --git a/config/solaris2.x b/config/solaris2.x index 5c904f6..775becb 100644 --- a/config/solaris2.x +++ b/config/solaris2.x @@ -8,8 +8,8 @@ # The default compiler is `sunpro cc' if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # Try gcc compiler flags @@ -17,18 +17,19 @@ fi # Try solaris native compiler flags if test "X-" = "X-$cc_flags_set"; then - CFLAGS="$CFLAGS -erroff=%none -DBSD_COMP" - DEBUG_CFLAGS="-g -xildoff" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O -s" - PROD_CPPFLAGS= - PROFILE_CFLAGS=-xpg - PROFILE_CPPFLAGS= - cc_flags_set=yes - # Turn off optimization flag for SUNpro compiler versions 4.x which - # have an optimization bug. Version 5.0 works. - ($CC -V 2>&1) | grep -s 'cc: .* C 4\.' >/dev/null 2>&1 \ - && PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O//'`" + CFLAGS="$CFLAGS -erroff=%none -DBSD_COMP" + DEBUG_CFLAGS="-g -xildoff" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O -s" + PROD_CPPFLAGS= + PROFILE_CFLAGS=-xpg + PROFILE_CPPFLAGS= + cc_flags_set=yes + + # Turn off optimization flag for SUNpro compiler versions 4.x which + # have an optimization bug. Version 5.0 works. + ($CC -V 2>&1) | grep -s 'cc: .* C 4\.' >/dev/null 2>&1 \ + && PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O//'`" fi # Add socket lib for the Stream Virtual File Driver diff --git a/config/sv1-cray b/config/sv1-cray index 3eb53ef..168e78a 100644 --- a/config/sv1-cray +++ b/config/sv1-cray @@ -28,8 +28,8 @@ # used within this file. if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # no need to use RANLIB RANLIB=: @@ -88,39 +88,38 @@ RANLIB=: # above). case $CC_BASENAME in - gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O3 -fomit-frame-pointer" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; - - cc) - CFLAGS="$CFLAGS" - DEBUG_CFLAGS="-g -h zero" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O2 -h scalar0 -h vector0 -h task1" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; - - *) - CFLAGS="$CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O3 -fomit-frame-pointer" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; + + cc) + CFLAGS="$CFLAGS" + DEBUG_CFLAGS="-g -h zero" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O2 -h scalar0 -h vector0 -h task1" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; + + *) + CFLAGS="$CFLAGS -ansi" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; esac - # Overriding Configure Tests # -------------------------- # diff --git a/config/unicos b/config/unicos index 43c1bd9..cc0f478 100644 --- a/config/unicos +++ b/config/unicos @@ -28,13 +28,12 @@ # used within this file. if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # no need to use RANLIB RANLIB=: - # C Compiler and Preprocessor Flags # --------------------------------- # @@ -88,39 +87,37 @@ RANLIB=: # above). case $CC_BASENAME in - gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" - PROD_CFLAGS="-O3 -fomit-frame-pointer" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" + PROD_CFLAGS="-O3 -fomit-frame-pointer" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - cc) - CFLAGS="$CFLAGS" - DEBUG_CFLAGS="-g -h zero -h scalar0" - DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" + cc) + CFLAGS="$CFLAGS" + DEBUG_CFLAGS="-g -h zero -h scalar0" + DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" PROD_CFLAGS="-O2 -h scalar0" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - *) - CFLAGS="$CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + *) + CFLAGS="$CFLAGS -ansi" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" + PROD_CFLAGS="-O" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; esac - - # Overriding Configure Tests # -------------------------- # diff --git a/config/unicos10.0.X b/config/unicos10.0.X index 2a7a944..b9aa87d 100644 --- a/config/unicos10.0.X +++ b/config/unicos10.0.X @@ -28,8 +28,8 @@ # used within this file. if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # no need to use RANLIB RANLIB=: @@ -88,35 +88,35 @@ RANLIB=: # above). case $CC_BASENAME in - gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" - PROD_CFLAGS="-O3 -fomit-frame-pointer" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; - - cc) - CFLAGS="$CFLAGS" - DEBUG_CFLAGS="-g -h zero -h scalar0" - DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" + gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" + PROD_CFLAGS="-O3 -fomit-frame-pointer" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; + + cc) + CFLAGS="$CFLAGS" + DEBUG_CFLAGS="-g -h zero -h scalar0" + DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" PROD_CFLAGS="-O2 -h scalar0" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; - - *) - CFLAGS="$CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; + + *) + CFLAGS="$CFLAGS -ansi" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2" + PROD_CFLAGS="-O" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; esac diff --git a/config/unicosmk b/config/unicosmk index 66f7c4c..57c04fb 100644 --- a/config/unicosmk +++ b/config/unicosmk @@ -28,8 +28,8 @@ # used within this file. if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # no need to use RANLIB RANLIB=: @@ -88,35 +88,35 @@ RANLIB=: # above). case $CC_BASENAME in - gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O3 -fomit-frame-pointer" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O3 -fomit-frame-pointer" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - cc) - CFLAGS="$CFLAGS" - DEBUG_CFLAGS="-g -h zero" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O2 -h scalar0" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + cc) + CFLAGS="$CFLAGS" + DEBUG_CFLAGS="-g -h zero" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O2 -h scalar0" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - *) - CFLAGS="$CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + *) + CFLAGS="$CFLAGS -ansi" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; esac diff --git a/config/unicosmk2.0.5.X b/config/unicosmk2.0.5.X index 66f7c4c..57c04fb 100644 --- a/config/unicosmk2.0.5.X +++ b/config/unicosmk2.0.5.X @@ -28,8 +28,8 @@ # used within this file. if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # no need to use RANLIB RANLIB=: @@ -88,35 +88,35 @@ RANLIB=: # above). case $CC_BASENAME in - gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O3 -fomit-frame-pointer" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O3 -fomit-frame-pointer" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - cc) - CFLAGS="$CFLAGS" - DEBUG_CFLAGS="-g -h zero" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O2 -h scalar0" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + cc) + CFLAGS="$CFLAGS" + DEBUG_CFLAGS="-g -h zero" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O2 -h scalar0" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - *) - CFLAGS="$CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + *) + CFLAGS="$CFLAGS -ansi" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; esac diff --git a/config/unicosmk2.0.6.X b/config/unicosmk2.0.6.X index 171c95b..638c740 100644 --- a/config/unicosmk2.0.6.X +++ b/config/unicosmk2.0.6.X @@ -28,8 +28,8 @@ # used within this file. if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # no need to use RANLIB RANLIB=: @@ -88,35 +88,35 @@ RANLIB=: # above). case $CC_BASENAME in - gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O3 -fomit-frame-pointer" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; - - cc) - CFLAGS="$CFLAGS" - DEBUG_CFLAGS="-g -h zero" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O2 -h scalar0" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; - - *) - CFLAGS="$CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O3 -fomit-frame-pointer" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; + + cc) + CFLAGS="$CFLAGS" + DEBUG_CFLAGS="-g -h zero" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O2 -h scalar0" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; + + *) + CFLAGS="$CFLAGS -ansi" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; esac diff --git a/config/unicosmk2.0.X b/config/unicosmk2.0.X index 66f7c4c..319390d 100644 --- a/config/unicosmk2.0.X +++ b/config/unicosmk2.0.X @@ -28,8 +28,8 @@ # used within this file. if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc + CC=cc + CC_BASENAME=cc fi # no need to use RANLIB RANLIB=: @@ -88,35 +88,35 @@ RANLIB=: # above). case $CC_BASENAME in - gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= + gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= PROD_CFLAGS="-O3 -fomit-frame-pointer" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - cc) - CFLAGS="$CFLAGS" - DEBUG_CFLAGS="-g -h zero" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O2 -h scalar0" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + cc) + CFLAGS="$CFLAGS" + DEBUG_CFLAGS="-g -h zero" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O2 -h scalar0" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; - *) - CFLAGS="$CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; + *) + CFLAGS="$CFLAGS -ansi" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; esac |