- update some svn ignores

- don't fail to configure if threads aren't found, since
  we don't have thread support on windows
- rather than setting the asm file name to none in asm-data,
  special case windows w/ CL in the ompi_config_asm macros.
  Otherwise, there were some warnings during make dist and
  configure that didn't need to be there.

This commit was SVN r8502.

config/ompi_config_asm.m4

@@ -27,14 +27,20 @@ dnl #################################################################
 AC_DEFUN([OMPI_CHECK_ASM_TEXT],[
     AC_MSG_CHECKING([directive for setting text section])
     ompi_cv_asm_text=""
-    case $host in
+    if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
-        *-aix*)
+        # text section will be brought in with the rest of
-            ompi_cv_asm_text=[".csect .text[PR]"]
+        # header for MS - leave blank for now
-        ;;
+        ompi_cv_asm_text=""
-        *)
+    else
-            ompi_cv_asm_text=".text"
+        case $host in
-        ;;
+            *-aix*)
-    esac
+                ompi_cv_asm_text=[".csect .text[PR]"]
+            ;;
+            *)
+                ompi_cv_asm_text=".text"
+            ;;
+        esac
+    fi
     AC_MSG_RESULT([$ompi_cv_asm_text])
     AC_DEFINE_UNQUOTED([OMPI_ASM_TEXT], ["$ompi_cv_asm_text"],
                        [Assembly directive for setting text section])
@@ -56,11 +62,15 @@ dnl #################################################################
 AC_DEFUN([OMPI_CHECK_ASM_GLOBAL],[
     AC_MSG_CHECKING([directive for exporting symbols])
     ompi_cv_asm_global=""
-    case $host in
+    if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
-        *)
+        ompi_cv_asm_global="PUBLIC"
+    else
+        case $host in
+            *)
                 ompi_cv_asm_global=".globl"
-        ;;
+            ;;
-    esac
+        esac
+    fi
     AC_MSG_RESULT([$ompi_cv_asm_global])
     AC_DEFINE_UNQUOTED([OMPI_ASM_GLOBAL], ["$ompi_cv_asm_global"],
                        [Assembly directive for exporting symbols])
@@ -761,13 +771,18 @@ case "${host}" in
     ;;
 
     i?86-*|x86_64*)
-        if test "$ac_cv_sizeof_long" = "4" ; then
+        if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
-                ompi_cv_asm_arch="IA32"
+            ompi_cv_asm_arch="WINDOWS"
+            OMPI_GCC_INLINE_ASSIGN='"MOVL [$]0, %0" : "=&r"(ret)'
         else
+            if test "$ac_cv_sizeof_long" = "4" ; then
+                ompi_cv_asm_arch="IA32"
+            else
                 ompi_cv_asm_arch="AMD64"
+            fi
+            OMPI_ASM_SUPPORT_64BIT=1
+            OMPI_GCC_INLINE_ASSIGN='"movl [$]0, %0" : "=&r"(ret)'
         fi
-        OMPI_ASM_SUPPORT_64BIT=1
-        OMPI_GCC_INLINE_ASSIGN='"movl [$]0, %0" : "=&r"(ret)'
     ;;
 
     ia64-*)
@@ -917,6 +932,8 @@ dnl
 dnl #################################################################
 AC_DEFUN([OMPI_ASM_FIND_FILE], [
     AC_REQUIRE([AC_PROG_FGREP])
+
+if test "$ompi_cv_asm_arch" != "WINDOWS" ; then
     AC_CHECK_PROG([PERL], [perl], [perl])
 
     # see if we have a pre-built one already
@@ -964,6 +981,10 @@ AC_DEFUN([OMPI_ASM_FIND_FILE], [
         fi
     fi
     rm -f conftest.*
+else
+    # On windows with VC++, atomics are done with compiler primitives
+    ompi_cv_asm_file=""
+fi
 
     AC_MSG_CHECKING([for atomic assembly filename])
     if test "$ompi_cv_asm_file" = "" ; then

config/ompi_config_threads.m4

@@ -141,7 +141,7 @@ elif test "$THREAD_TYPE" = "posix"; then
     THREAD_LIBS="$PTHREAD_LIBS"
 
     OMPI_CHECK_PTHREAD_PIDS
-elif test "$THREAD_TYPE" = "none"; then
+else
     AC_DEFINE(OMPI_HAVE_SOLARIS_THREADS, 0)
     AC_DEFINE(OMPI_HAVE_POSIX_THREADS, 0)
     AC_DEFINE(OMPI_THREADS_HAVE_DIFFERENT_PIDS, 0)
@@ -153,8 +153,8 @@ elif test "$THREAD_TYPE" = "none"; then
     THREAD_CXXCPPFLAGS=
     THREAD_LDFLAGS=
     THREAD_LIBS=
-else
+    if test "$THREAD_TYPE" != "none" ; then
-    cat <<EOF
+        cat <<EOF
 
 ************************************************************************
 
@@ -165,13 +165,10 @@ we are not aware of any users that do not have thread support - so we
 need you to e-mail us at ompi@ompi-mpi.org and let us know about this
 problem.
 
-To build this version of Open MPI without thread support, re-run
-configure with the '--without-threads' option.
-
 ************************************************************************
 
 EOF
-    AC_MSG_ERROR(["*** Can not continue."])
+    fi
 fi
 
 AM_CONDITIONAL(OMPI_HAVE_POSIX_THREADS, test "$thread_type" = "posix")

configure.ac

@@ -421,14 +421,13 @@ OMPI_SETUP_CXX
 
 # check for type sizes
 
-AC_LANG_SAVE
+AC_LANG_PUSH(C++)
-AC_LANG_CPLUSPLUS
 AC_CHECK_SIZEOF(bool)
 
 # check for type alignments
 
 OMPI_C_GET_ALIGNMENT(bool, OMPI_ALIGNMENT_CXX_BOOL)
-AC_LANG_RESTORE
+AC_LANG_POP(C++)
 
 # check if we want C++ support                                                  
 

opal/asm/asm-data.txt

@@ -112,12 +112,3 @@ SPARCV9_64	default-.text-.globl-:--.L-#-1-0-1-1	sparcv9-64-solaris
 # means that we can use the same code either way.  Woo hoo!
 
 MIPS	default-.text-.globl-:--L--1-1-1-1	mips-irix
-
-######################################################################
-#
-# On windows we don't need assembly as they provide all the 
-# atomic functions we need as intrinsics in windows.h
-#
-######################################################################
-
-WINDOWS	default-.code _TEXT-PUBLIC-:--L--0-0-1-0	none