Added patches from upstream to fix build failures in some archs

parent 50503350
# HG changeset patch
# User oleh-derevenko
# Date 1547341015 -7200
# Node ID 96154dbbff9437c721130272f6f20584b5ec96d8
# Parent 7755c9d58f8bb0eaf2592a49c209d4d9817e3f8e
Fixed: String formatting arguments/types fixed to match in the libccd tests
diff --git a/libccd/src/testsuites/bench.c b/libccd/src/testsuites/bench.c
--- a/libccd/src/testsuites/bench.c
+++ b/libccd/src/testsuites/bench.c
@@ -246,7 +246,7 @@
cycles = atol(argv[1]);
}
- fprintf(stdout, "Cycles: %u\n", cycles);
+ fprintf(stdout, "Cycles: %zu\n", cycles);
fprintf(stdout, "\n");
boxbox();
diff --git a/libccd/src/testsuites/bench2.c b/libccd/src/testsuites/bench2.c
--- a/libccd/src/testsuites/bench2.c
+++ b/libccd/src/testsuites/bench2.c
@@ -252,7 +252,7 @@
cycles = atol(argv[1]);
}
- fprintf(stdout, "Cycles: %u\n", cycles);
+ fprintf(stdout, "Cycles: %zu\n", cycles);
fprintf(stdout, "\n");
boxbox();
diff --git a/libccd/src/testsuites/common.c b/libccd/src/testsuites/common.c
--- a/libccd/src/testsuites/common.c
+++ b/libccd/src/testsuites/common.c
@@ -9,7 +9,7 @@
ccd_quat_t rot;
ccd_vec3_t axis, vpos, vpos2;
ccd_real_t angle, x, y;
- size_t i;
+ unsigned int i;
ccdVec3Set(&axis, 0., 0., 1.);
ccdVec3Set(&vpos, 0., c->radius, 0.);
diff --git a/libccd/src/testsuites/polytope.c b/libccd/src/testsuites/polytope.c
--- a/libccd/src/testsuites/polytope.c
+++ b/libccd/src/testsuites/polytope.c
@@ -101,7 +101,7 @@
ccd_pt_face_t *f[4];
ccd_vec3_t u;
int res;
- size_t i;
+ unsigned int i;
DBG2("------");
# HG changeset patch
# User oleh-derevenko
# Date 1547341082 -7200
# Node ID 3262016ef92b4925253411592270c10899e9c652
# Parent 96154dbbff9437c721130272f6f20584b5ec96d8
Fixed: atomicord32 type signedness fixed for mutex-aided atomics implementation
diff --git a/ou/include/ou/atomic.h b/ou/include/ou/atomic.h
--- a/ou/include/ou/atomic.h
+++ b/ou/include/ou/atomic.h
@@ -1630,7 +1630,7 @@
BEGIN_NAMESPACE_OU();
-typedef int32_t atomicord32;
+typedef uint32_t atomicord32;
typedef void *atomicptr;
# HG changeset patch
# User oleh-derevenko
# Date 1547341122 -7200
# Node ID ea98ff157e843bdee7c7c4eee773bdf04d274bae
# Parent 3262016ef92b4925253411592270c10899e9c652
Fixed: Some more architectures support added for Debian builds
diff --git a/include/ode/odeconfig.h b/include/ode/odeconfig.h
--- a/include/ode/odeconfig.h
+++ b/include/ode/odeconfig.h
@@ -80,8 +80,10 @@
#endif // #if !defined(__GNUC__)
-/* Well-defined common data types...need to define for 64 bit systems */
-#if defined(__aarch64__)
+/* Well-defined common data types...need to be defined for 64 bit systems */
+#if defined(__aarch64__) || defined(__alpha__) || defined(__ppc64__) \
+ || defined(__s390__) || defined(__s390x__) || defined(__zarch__) \
+ || defined(__mips__) || defined(__powerpc64__) || defined(__riscv) || defined(__sparc64__)
#include <stdint.h>
typedef int64_t dint64;
typedef uint64_t duint64;
@@ -97,13 +99,13 @@
typedef ptrdiff_t ddiffint;
typedef size_t dsizeint;
-#elif defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)
+#elif (defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)) && !defined(__ILP32__) && !defined(_ILP32)
#define X86_64_SYSTEM 1
#if defined(_MSC_VER)
typedef __int64 dint64;
typedef unsigned __int64 duint64;
#else
-#if defined(_LP64)
+#if defined(_LP64) || defined(__LP64__)
typedef long dint64;
typedef unsigned long duint64;
#else
patch1-96154db.patch
patch2-3262016.patch
patch3-ea98ff1.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment