Use right flags for optimization for icc10.

git-svn-id: https://svn.dealii.org/trunk@14835 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 37ad5c9d44dc4e80fb6a004bc364197199648104..c4ae8cf6a7737107217ba3c6b665e8c47b32fc04 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -672,14 +672,24 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
           fi fi
        
          dnl If we are on an x86 platform, add -tpp6 to optimization
-         dnl flags
+         dnl flags (for version <10), or the equivalent for later
+         dnl processors
          case "$target" in
             *x86_64*)
                LDFLAGS="$LDFLAGS -lpthread"
                ;;
 
            *86*)
-               CXXFLAGSO="$CXXFLAGSO -tpp6"
+               case "$GXX_VERSION" in
+                 intel_icc5)
+                    ;;
+                 intel_icc[6789])
+                    CXXFLAGSO="$CXXFLAGSO -tpp6"
+                    ;;
+                 *)
+                    CXXFLAGSO="$CXXFLAGSO -mcpu=pentium4"
+                   ;;
+                esac
                ;;
          esac
           ;;

diff --git a/deal.II/configure b/deal.II/configure
index f933bad88b89431f2336c144ba35823e1b1473d8..d2de86cf046ba1c567a4df988355f667be427f45 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -4301,13 +4301,22 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
             CXXFLAGSO="$CXXFLAGSO -ansi_alias -vec_report0"
           fi fi
 
-                         case "$target" in
+                                 case "$target" in
             *x86_64*)
                LDFLAGS="$LDFLAGS -lpthread"
                ;;
 
            *86*)
-               CXXFLAGSO="$CXXFLAGSO -tpp6"
+               case "$GXX_VERSION" in
+                 intel_icc5)
+                    ;;
+                 intel_icc6789)
+                    CXXFLAGSO="$CXXFLAGSO -tpp6"
+                    ;;
+                 *)
+                    CXXFLAGSO="$CXXFLAGSO -mcpu=pentium4"
+                   ;;
+                esac
                ;;
          esac
           ;;