[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-265-g23cbd29

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  23cbd296968427e4359d9ebd72fd273968fc431d (commit)
      from  5ce7102445fe0f6fbcf3fac0e49b092bf3069778 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/23cbd296968427e4359d9ebd72fd273968fc431d

commit 23cbd296968427e4359d9ebd72fd273968fc431d
Author: Pavan Balaji <balaji at anl.gov>
Date:   Tue Jul 21 16:20:14 2015 -0500

    Fix for hwloc's failure with PGI 32-bit compilers.
    
    Signed-off-by: Kazutomo Yoshii <kazutomo at mcs.anl.gov>

diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/cpuid-x86.h b/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/cpuid-x86.h
index 8a8c48e..ca5cb97 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/cpuid-x86.h
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/cpuid-x86.h
@@ -72,14 +72,12 @@ static __hwloc_inline void hwloc_x86_cpuid(unsigned *eax, unsigned *ebx, unsigne
   : "+a" (*eax), "=m" (*ebx), "=&r"(sav_rbx),
     "+c" (*ecx), "=&d" (*edx));
 #elif defined(HWLOC_X86_32_ARCH)
-  unsigned long sav_ebx;
   __asm__(
-  "mov %%ebx,%2\n\t"
+  "xchg %%ebx,%1\n\t"
   "cpuid\n\t"
-  "xchg %2,%%ebx\n\t"
-  "movl %k2,%1\n\t"
-  : "+a" (*eax), "=m" (*ebx), "=&r"(sav_ebx),
-    "+c" (*ecx), "=&d" (*edx));
+  "xchg %%ebx,%1\n\t"
+  : "=a" (*eax), "=r" (*ebx), "=c"(*ecx), "=d" (*edx)
+  : "0" (*eax), "2" (*ecx));
 #else
 #error unknown architecture
 #endif

-----------------------------------------------------------------------

Summary of changes:
 .../topo/hwloc/hwloc/include/private/cpuid-x86.h   |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
MPICH primary repository