From 294f07a13dedcc56e1269c2f1cebba5118a2b92c Mon Sep 17 00:00:00 2001
From: Ethan Mallove <ethan.mallove@oracle.com>
Date: Fri, 18 Jul 2008 19:19:22 +0000
Subject: [PATCH] Fixes trac:1401 (`-xvector*` needs to be counted as an
 optimzation flag for `orterun` to compile)

This commit was SVN r18947.

The following Trac tickets were found above:
  Ticket 1401 --> https://svn.open-mpi.org/trac/ompi/ticket/1401
---
 config/ompi_check_optflags.m4      |  7 +++++++
 config/ompi_make_stripped_flags.m4 |  7 +++++++
 config/ompi_setup_cc.m4            | 10 ++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/config/ompi_check_optflags.m4 b/config/ompi_check_optflags.m4
index 0985566ce4..4c599a09ee 100644
--- a/config/ompi_check_optflags.m4
+++ b/config/ompi_check_optflags.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
 dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
+dnl Copyright (c) 2007-2008 Sun Microsystems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -41,6 +42,12 @@ for co_word in $co_arg; do
     -xO)       co_found=1 ;;
     -xO[0-9])  co_found=1 ;;
     -fast) co_found=1 ;;
+
+    # The below Sun Studio flags require or
+    # trigger -xO optimization
+    -xvector*)     co_found=1 ;;
+    -xdepend=yes)  co_found=1 ;;
+
     esac
 done
 
diff --git a/config/ompi_make_stripped_flags.m4 b/config/ompi_make_stripped_flags.m4
index 3fdb130b88..18900a60a4 100644
--- a/config/ompi_make_stripped_flags.m4
+++ b/config/ompi_make_stripped_flags.m4
@@ -11,6 +11,7 @@ dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -57,6 +58,12 @@ for s_word in $s_arg; do
     -xO8)  ;;
     -xO9)  ;;
     -fast) ;;
+
+    # The below Sun Studio flags require or
+    # trigger -xO optimization
+    -xvector*)     ;;
+    -xdepend=yes)  ;;
+
     *)     s_result="$s_result $s_word"
     esac
 done
diff --git a/config/ompi_setup_cc.m4 b/config/ompi_setup_cc.m4
index 695e2bb9ec..5ff2e60e82 100644
--- a/config/ompi_setup_cc.m4
+++ b/config/ompi_setup_cc.m4
@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
 dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2006 The Regents of the University of California.
 dnl                         All rights reserved.
-dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2007-2008 Sun Microsystems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -281,7 +281,13 @@ AC_DEFUN([OMPI_SETUP_CC],[
         -O[0-9])   co_found=1 ;;
         -xO)       co_found=1 ;;
         -xO[0-9])  co_found=1 ;;
-        -fast) co_found=1 ;;
+        -fast)     co_found=1 ;;
+
+        # The below Sun Studio flags require or
+        # trigger -xO optimization
+        -xvector*)     co_found=1 ;;
+        -xdepend=yes)  co_found=1 ;;
+
       esac
       if test "$co_found" = "0" ; then
         CFLAGS_WITHOUT_OPTFLAGS="$CFLAGS_WITHOUT_OPTFLAGS $co_word"