[ofa-general] [PATCH 1/1] dapl (v2.0): ia64 build problem on SuSE 11, atomic.h no longer exists.

[Arlin Davis]

Add autotools check for SuSE 11 and include intrinsics.h

Signed-off-by: Arlin Davis <ardavis at ichips.intel.com>
---
 Makefile.am                 |    4 ++++
 configure.in                |   10 ++++++++++
 dapl/udapl/linux/dapl_osd.h |    7 ++++++-
 3 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 08a8cce..721996f 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,10 @@ if OS_RHEL5
 OSFLAGS += -DREDHAT_EL5
 endif
 
+if OS_SUSE11
+OSFLAGS += -DSUSE_11
+endif
+
 if EXT_TYPE_IB
 XFLAGS = -DDAT_EXTENSIONS
 XPROGRAMS_CMA = dapl/openib_cma/dapl_ib_extensions.c
diff --git a/configure.in b/configure.in
index 8401d29..8220893 100644
--- a/configure.in
+++ b/configure.in
@@ -86,6 +86,16 @@ AC_CACHE_CHECK(Check for RHEL5 system, ac_cv_rhel5,
     fi)
 AM_CONDITIONAL(OS_RHEL5, test "$ac_cv_rhel5" = "yes")
 
+dnl Check for SuSE release 11
+AC_CACHE_CHECK(Check for SUSE_11 system, ac_cv_suse11,
+    if test -f /etc/SuSE-release &&
+       test -n "`grep -e "VERSION = 11" /etc/SuSE-release`"; then
+        ac_cv_suse11=yes
+    else
+        ac_cv_suse11=no
+    fi)
+AM_CONDITIONAL(OS_SUSE11, test "$ac_cv_suse11" = "yes")
+
 AC_CONFIG_FILES([Makefile test/dtest/Makefile test/dapltest/Makefile dapl.spec])
 
 AC_OUTPUT
diff --git a/dapl/udapl/linux/dapl_osd.h b/dapl/udapl/linux/dapl_osd.h
index 974a0f0..1c098c5 100644
--- a/dapl/udapl/linux/dapl_osd.h
+++ b/dapl/udapl/linux/dapl_osd.h
@@ -92,10 +92,15 @@
 #include <sys/utsname.h>
 #include <fcntl.h>
 
-#if !defined(REDHAT_EL5) && (defined(__ia64__))
+#if !defined(SUSE_11) && !defined(REDHAT_EL5) && defined(__ia64__)
 #include <asm/atomic.h>
 #endif
 
+#if defined(SUSE_11) && defined(__ia64__)
+#include <asm/types.h>
+#include <asm/intrinsics.h>
+#endif
+
 /* Useful debug definitions */
 #ifndef STATIC
 #define STATIC static
-- 
1.5.2.5