Fix Debian sparc build failure

Fix build failure with Debian sparc compiler: membar is only supported
under V9 ISA.

Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/ChangeLog b/ChangeLog
index ee28f4d393fef12238242f9481f42b9c379fef28..4bb410b205c6f4a35a73c6e8c4c787dfdecd5eca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-01  Roland Dreier  <rdreier@cisco.com>
+
+       * include/infiniband/arch.h: Only SPARC V9 ISA supports membar.
+       So just use generic memory barrier for older sparc archs.
+
 2006-04-11  Roland Dreier  <rdreier@cisco.com>
 
        * src/sysfs.c (ibv_read_sysfs_file): Fix memory leak if open fails.

diff --git a/debian/changelog b/debian/changelog
index 4d9fa1c173b929c0ef9d2653c8450204f963ca33..29b26393edb06011d3a2e9d7c53ce06a4611f1e7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
 libibverbs (1.0.3-1) unstable; urgency=low
 
-  * New upstream release.
   * Change priority to extra, since libibverbs depends on libsysfs2, which
     has priority extra.  (Debian policy section 2.5 states that a package
     may not depend on another package of lower priority)
+  * New upstream release:
+    - For sparc, only generate membar instruction if compiling for V9
+      instruction set.  (Closes: #365559)
+    - Reduce (but not yet eliminate) dependency on libsysfs.
+    - Deprecate some ib_XXX symbol names and introduce ibv_XXX
+      replacements for internal consistency.
+    - Other minor fixes.
 
- -- Roland Dreier <rdreier@cisco.com>  Sun,  9 Apr 2006 12:10:17 -0700
+ -- Roland Dreier <rdreier@cisco.com>  Mon,  1 May 2006 15:54:07 -0700
 
 libibverbs (1.0.2-1) unstable; urgency=low
 

diff --git a/include/infiniband/arch.h b/include/infiniband/arch.h
index 147c3d081bca20264f43ff0d8a4ef1e9ff9a480e..7c7cf10b803e3de115ed51c314b51b2ad3dc7c55 100644 (file)
--- a/include/infiniband/arch.h
+++ b/include/infiniband/arch.h
@@ -76,10 +76,14 @@ static inline uint64_t ntohll(uint64_t x) { return x; }
 
 #define mb()   asm volatile("sync" ::: "memory")
 
-#elif defined(__sparc__)
+#elif defined(__sparc_v9__)
 
 #define mb()   asm volatile("membar #LoadLoad | #LoadStore | #StoreStore | #StoreLoad" ::: "memory")
 
+#elif defined(__sparc__)
+
+#define mb()   asm volatile("sync" ::: "memory")
+
 #else
 
 #warning No architecture specific defines found.  Using generic implementation.