From bf9c37e0714ba36809c11c9f1ee2313ee2f0c30a Mon Sep 17 00:00:00 2001
From: Albert Cheng <acheng@hdfgroup.org>
Date: Sat, 18 Dec 2004 15:34:25 -0500
Subject: [svn-r9691] Description: mpich 1.2.6 does not like the tweaking of
 using -O2 flag. Comment out the Tweaking since it caused problems to
 mpich1.2.6. Need to investigate the reasons and effects to tweak.

Platforms tested:
Tested in heping using mpich 1.2.6 and in eirene uisng mpich 1.2.6.
---
 config/intel-flags |  6 +++---
 config/pgi-fflags  | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/config/intel-flags b/config/intel-flags
index 9477281..2a89b3b 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -57,8 +57,8 @@ if test "X-icc" = "X-$cc_vendor"; then
     CFLAGS="${CFLAGS:--std=c99 $arch}"
 
     # Production
-    # -s to remove all symbols for smaller file
-    PROD_CFLAGS="-O3 -s"
+    # -Wl,-s to remove all symbols for smaller file
+    PROD_CFLAGS="-O3 -Wl,-s"
     PROD_CPPFLAGS=
 
     # Debug
@@ -82,7 +82,7 @@ fi
 case "$cc_vendor-$cc_version" in
     icc-8.0*)
 	# v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2.
-	PROD_CFLAGS="-O2 -s"
+	PROD_CFLAGS="-O2 -Wl,-s"
 	;;
 esac
 
diff --git a/config/pgi-fflags b/config/pgi-fflags
index c9b50f3..a5e7431 100644
--- a/config/pgi-fflags
+++ b/config/pgi-fflags
@@ -61,11 +61,14 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
 
     # Production
     # Check for MPI wrapper being used and tweak down compiler options
-    if test "X-" == "X-$is_mpi"; then
-        PROD_FFLAGS="-fast -s -Mnoframe"
-    else
-        PROD_FFLAGS="-O2 -s"
-    fi
+    # Comment out the Tweaking since it caused problems to mpich1.2.6.
+    # Need to investigate the reasons to tweak.
+    #if test "X-" == "X-$is_mpi"; then
+    #    PROD_FFLAGS="-fast -s -Mnoframe"
+    #else
+    #    PROD_FFLAGS="-O2 -s"
+    #fi
+    PROD_FFLAGS="-fast -s -Mnoframe"
 
     # Debug
     DEBUG_FFLAGS="-g -Mbounds -Mchkfpstk -Mchkptr"
-- 
cgit v0.12