per conversation with George, don't try to figure out all the assembly

information on Windows with the CL compiler.  We don't use it, and we
were running into trouble with the compiler on some tests

This commit was SVN r8558.

config/ompi_config_asm.m4

@@ -132,7 +132,6 @@ ${sym}mytestlabel$ompi_cv_asm_label_suffix],
 # OMPI_CHECK_ASM_LSYM()
 # ---------------------
 AC_DEFUN([OMPI_CHECK_ASM_LSYM],[
-    AC_REQUIRE([OMPI_CHECK_ASM_LABEL_SUFFIX])
     AC_REQUIRE([AC_PROG_NM])
 
     AC_CACHE_CHECK([prefix for lsym labels],
@@ -170,10 +169,6 @@ AC_DEFUN([OMPI_CHECK_ASM_GSYM],[
 ])
 
 AC_DEFUN([_OMPI_CHECK_ASM_GSYM],[
-    AC_REQUIRE([OMPI_CHECK_ASM_TEXT])
-    AC_REQUIRE([OMPI_CHECK_ASM_GLOBAL])
-    AC_REQUIRE([OMPI_CHECK_ASM_LABEL_SUFFIX])
-
     ompi_cv_asm_gsym="none"
 
     for sym in "_" "" "." ; do
@@ -267,9 +262,6 @@ dnl logarithmically, 0 otherwise
 dnl
 dnl #################################################################
 AC_DEFUN([OMPI_CHECK_ASM_ALIGN_LOG],[
-    AC_REQUIRE([OMPI_CHECK_ASM_TEXT])
-    AC_REQUIRE([OMPI_CHECK_ASM_GLOBAL])
-    AC_REQUIRE([OMPI_CHECK_ASM_LABEL_SUFFIX])
     AC_REQUIRE([AC_PROG_NM])
 
     AC_CACHE_CHECK([if .align directive takes logarithmic value],
@@ -397,7 +389,6 @@ dnl or rX (OS X)
 dnl
 dnl #################################################################
 AC_DEFUN([OMPI_CHECK_POWERPC_REG],[
-    AC_REQUIRE([OMPI_CHECK_ASM_TEXT])
     AC_MSG_CHECKING([if PowerPC registers have r prefix])
     OMPI_TRY_ASSEMBLE([$ompi_cv_asm_text
         addi 1,1,0],
@@ -429,8 +420,6 @@ dnl operations (on a long long).
 dnl
 dnl #################################################################
 AC_DEFUN([OMPI_CHECK_POWERPC_64BIT],[
-    AC_REQUIRE([OMPI_CHECK_ASM_TEXT])
-
     AC_MSG_CHECKING([for 64-bit PowerPC assembly support])
     ppc64_result=0
     if test "$ompi_cv_asm_powerpc_r_reg" = "1" ; then
@@ -460,8 +449,6 @@ dnl OMPI_CHECK_SPARCV8PLUS
 dnl
 dnl #################################################################
 AC_DEFUN([OMPI_CHECK_SPARCV8PLUS],[
-    AC_REQUIRE([OMPI_CHECK_ASM_TEXT])
-
     AC_MSG_CHECKING([if have Sparc v8+/v9 support])
     sparc_result=0
     OMPI_TRY_ASSEMBLE([$ompi_cv_asm_text
@@ -730,19 +717,12 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
     AC_REQUIRE([OMPI_SETUP_CC])
     AC_REQUIRE([OMPI_SETUP_CXX])
     AC_REQUIRE([AM_PROG_AS])
-    AC_REQUIRE([OMPI_CHECK_ASM_TEXT])
-    AC_REQUIRE([OMPI_CHECK_ASM_GLOBAL])
-    AC_REQUIRE([OMPI_CHECK_ASM_GSYM])
-    AC_REQUIRE([OMPI_CHECK_ASM_LSYM])
-    AC_REQUIRE([OMPI_CHECK_ASM_TYPE])
-    AC_REQUIRE([OMPI_CHECK_ASM_SIZE])
-    AC_REQUIRE([OMPI_CHECK_ASM_LABEL_SUFFIX])
-    AC_REQUIRE([OMPI_CHECK_ASM_ALIGN_LOG])
+
 
     AC_MSG_CHECKING([whether to enable smp locks])
-AC_ARG_ENABLE(smp-locks, 
-    AC_HELP_STRING([--enable-smp-locks],
-                   [disable smp locks in atomic ops (default: enabled)]))
+    AC_ARG_ENABLE([smp-locks], 
+        [AC_HELP_STRING([--enable-smp-locks],
+            [disable smp locks in atomic ops (default: enabled)])])
     if test "$enable_smp_locks" != "no"; then
         AC_MSG_RESULT([yes])
         want_smp_locks=1
@@ -753,21 +733,24 @@ fi
     AC_DEFINE_UNQUOTED([OMPI_WANT_SMP_LOCKS], [$want_smp_locks],
                        [whether we want to have smp locks in atomic ops or not])
 
+    if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
+        ompi_cv_asm_arch="WINDOWS"
+    else
+        OMPI_CHECK_ASM_TEXT
+        OMPI_CHECK_ASM_GLOBAL
+        OMPI_CHECK_ASM_LABEL_SUFFIX
+        OMPI_CHECK_ASM_GSYM
+        OMPI_CHECK_ASM_LSYM
+        OMPI_CHECK_ASM_TYPE
+        OMPI_CHECK_ASM_SIZE
+        OMPI_CHECK_ASM_ALIGN_LOG
 
         # find our architecture for purposes of assembly stuff
         ompi_cv_asm_arch="UNSUPPORTED"
         OMPI_GCC_INLINE_ASSIGN=""
         OMPI_ASM_SUPPORT_64BIT=0
         case "${host}" in
-    *-winnt*)
-        ompi_cv_asm_arch="WINDOWS"
-    ;;
-
         i?86-*|x86_64*)
-        if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
-            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
@@ -775,7 +758,6 @@ case "${host}" in
             fi
             OMPI_ASM_SUPPORT_64BIT=1
             OMPI_GCC_INLINE_ASSIGN='"movl [$]0, %0" : "=&r"(ret)'
-        fi
             ;;
 
         ia64-*)
@@ -870,7 +852,6 @@ case $host_os in
             ;;
          esac
 
-
          # now that we know our architecture, try to inline assemble
          OMPI_CHECK_INLINE_C_GCC([$OMPI_GCC_INLINE_ASSIGN])
          OMPI_CHECK_INLINE_C_DEC
@@ -900,6 +881,7 @@ AC_MSG_RESULT([$OMPI_ASSEMBLY_FORMAT])
         AC_DEFINE_UNQUOTED([OMPI_ASSEMBLY_FORMAT], ["$OMPI_ASSEMBLY_FORMAT"],
                            [Format of assembly file])
         AC_SUBST([OMPI_ASSEMBLY_FORMAT])
+    fi # if cv_c_compiler_vendor = microsoft
 
     result="OMPI_$ompi_cv_asm_arch"
     OMPI_ASSEMBLY_ARCH="$ompi_cv_asm_arch"