From 96029c791f86ed43d456622a6313ab0fab670bd7 Mon Sep 17 00:00:00 2001
From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 5 Sep 2007 16:16:25 +0000
Subject: [PATCH] Suppress vectorization notices on machines that don't support
 vectorization with icc.

git-svn-id: https://svn.dealii.org/trunk@15125 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/aclocal.m4 | 12 +++++++++++-
 deal.II/configure  | 13 ++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 352630c490..55346957e7 100644
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -640,6 +640,9 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
           dnl autovectorizer (to make things simpler, one of the two options
           dnl wants a space between option and level, whereas the other does
           dnl not)
+	  dnl
+	  dnl Since only the x86 and x86_64 compilers can vectorize, this
+	  dnl flag needs to be suppressed on ia64 (itanium)
     	  case "$GXX_VERSION" in
 	    intel_icc5)
               ;;
@@ -647,7 +650,14 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
               CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin"
               ;;
 	    *)
-              CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0"
+	      case "$target" in
+		*ia64*)
+              	    CXXFLAGSO="$CXXFLAGSO -opt-report 0"
+		    ;;
+		*)
+              	    CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0"
+		    ;;
+	      esac
 	      ;;
           esac
 
diff --git a/deal.II/configure b/deal.II/configure
index 0b1b82887e..f7f08d8df6 100755
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 15114 .
+# From configure.in Revision: 15116 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for deal.II 6.0.pre.
 #
@@ -3542,14 +3542,21 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
                     	  	                                                                                            	  	  	  	  	            CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858"
           CXXFLAGSO="$CXXFLAGSO -w0 -wd424 -wd11"
 
-                    	                                    	  case "$GXX_VERSION" in
+                    	                                	  	  	      	  case "$GXX_VERSION" in
 	    intel_icc5)
               ;;
 	    intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9)
               CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin"
               ;;
 	    *)
-              CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0"
+	      case "$target" in
+		*ia64*)
+              	    CXXFLAGSO="$CXXFLAGSO -opt-report 0"
+		    ;;
+		*)
+              	    CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0"
+		    ;;
+	      esac
 	      ;;
           esac
 
-- 
2.39.5