13f0286428
- Rename dapl-utils tests to avoid conflicts with other packages (dateutils) * dapltest => dapl-test * dtest => dapl-utest * dtestcm => dapl-testcm * dtestsrq => dapl-testsrq * dtestx => dapl-testx - Remove librdmacm and libibverbs version dependencies - Restore description of libdapl. Fix some grammar errors. - Disable dapl on armv7hl - Make dependencies on libs now coming from rdma-core versioned. - Remove unused patch dapl-rename_dtest.patch - Update to 2.1.8 git version (bsc#970668). List of changes is too long so please see the included ChangeLog. - Patches removed because the fixes are included upstream: dapl-fix_type_punning.patch dapl-autotools.patch dapl-add-s390x-platform-support.patch dapl-add-aarch64-platform-support.patch dapl-add-s390x-platform-support.patch - Add dapl-s390.patch so that the defines are also valid for s390 - Add conflicts between dapl and dapl-debug packages for devel and utils OBS-URL: https://build.opensuse.org/request/show/502397 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dapl?expand=0&rev=5
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
---
|
|
dapl/udapl/linux/dapl_osd.h | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
Index: dapl/udapl/linux/dapl_osd.h
|
|
===================================================================
|
|
--- dapl/udapl/linux/dapl_osd.h.orig 2016-03-10 14:56:57.000000000 +0100
|
|
+++ dapl/udapl/linux/dapl_osd.h 2016-03-10 18:28:46.909424533 +0100
|
|
@@ -51,7 +51,7 @@
|
|
|
|
#if !defined (__i386__) && !defined (__ia64__) && !defined(__x86_64__) && \
|
|
!defined(__PPC__) && !defined(__PPC64__) && !defined(__s390x__) && \
|
|
- !defined(__aarch64__)
|
|
+ !defined(__aarch64__) && !defined(__s390__)
|
|
#error UNDEFINED ARCH
|
|
#endif
|
|
|
|
@@ -160,7 +160,7 @@ int dapl_os_get_env_val (
|
|
|
|
/* atomic functions */
|
|
|
|
-#ifdef __s390x__
|
|
+#if defined(__s390x__) || defined(__s390__)
|
|
#define DAPL_CS_ADD(ptr, op_val) ({ \
|
|
int old_val, new_val; \
|
|
__asm__ __volatile__( \
|
|
@@ -199,7 +199,7 @@ dapl_os_atomic_inc (
|
|
#else
|
|
IA64_FETCHADD(old_value,v,1,4);
|
|
#endif
|
|
-#elif defined(__s390x__)
|
|
+#elif defined(__s390x__) || defined(__s390__)
|
|
DAT_COUNT tmp;
|
|
DAT_COUNT delta = 1;
|
|
|
|
@@ -245,7 +245,7 @@ dapl_os_atomic_dec (
|
|
#else
|
|
IA64_FETCHADD(old_value,v,-1,4);
|
|
#endif
|
|
-#elif defined(__s390x__)
|
|
+#elif defined(__s390x__) || defined(__s390__)
|
|
DAT_COUNT tmp;
|
|
DAT_COUNT delta = -1;
|
|
|
|
@@ -307,7 +307,7 @@ dapl_os_atomic_assign (
|
|
#else
|
|
current_value = ia64_cmpxchg(acq,v,match_value,new_value,4);
|
|
#endif /* __ia64__ */
|
|
-#elif defined(__s390x__)
|
|
+#elif defined(__s390x__) || defined(__s390__)
|
|
__asm__ __volatile__(
|
|
" cs %0,%2,%1\n"
|
|
: "+d" (match_value), "=Q" (*v)
|