[svn-r18639] Description:

	Bring r18619:18638 from trunk to revise_chunks branch.

Tested on:
	FreeBSD/32 6.3 (duty) w/debug
	(h5committest not required on this branch)

2 files changed, 14 insertions, 23 deletions

diff --git a/config/gnu-flags b/config/gnu-flags
index 427b839..96db51d 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -147,23 +147,11 @@ case "$cc_vendor-$cc_version" in
       gcc-2.95.[34])
         PROD_CFLAGS="-O3"
         ;;
-      gcc-4.[345]*)
-        # The optimization level is reduced for gcc 4.[345] due to problems
-        # with code generation for src/H5Tconv.c with the -O (same -O1)
-        # optimization levels (which shows up as failures for long double
-        # types -> signed char conversion in the test/dt_arith test).
-        # There's either a bug in gcc or our code. Need further investigation.
-	# Turn off all optimizations to allow the tests to pass for now.
-        # - AKC - 2009/04/19
-        PROD_CFLAGS="-O0"
+      gcc-3.*)
+        PROD_CFLAGS="-O3"
         ;;
-      gcc-3.[0-4]*|gcc-4.[012]*)
-        # The optimization level is reduced for gcc 3.* and 4.* due to problems
-        # with code generation for src/H5Tconv.c with the -O2 & -O3 
-        # optimization levels (which shows up as failures for various integer
-        # types -> long long conversions in the test/dtypes test).  Perhaps
-        # later versions of gcc will fix this bug... - QAK - 2003/10/20
-        PROD_CFLAGS="-O"
+      gcc-4.*)
+        PROD_CFLAGS="-O3"
         ;;
       *)
         PROD_CFLAGS="-O"
diff --git a/config/pgi-flags b/config/pgi-flags
index 2b03f3d..664b37b 100644
--- a/config/pgi-flags
+++ b/config/pgi-flags
@@ -68,15 +68,18 @@ if test "X-pgcc" = "X-$cc_vendor"; then
     #esac
 
     # General
-    H5_CFLAGS="$H5_CFLAGS $arch -Minform,warn"
+    H5_CFLAGS="$H5_CFLAGS $arch -c99 -Minform=inform"
 
     # Production
-    # Check for MPI wrapper being used and tweak down compiler options
-    if test "X-" == "X-$is_mpi"; then
-        PROD_CFLAGS="-fast -s -Mnoframe"
-    else
-        PROD_CFLAGS="-O2 -s"
-    fi
+    case "$cc_vendor-$cc_version" in
+      # Tweak down compiler optimizations for v9.x
+      pgcc-9.*)
+        PROD_CFLAGS="-O1 -s"
+        ;;
+      *)
+        PROD_CFLAGS="-fast -s"
+        ;;
+    esac
     PROD_CPPFLAGS=
 
     # Debug