Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-10-07 13:59:51 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-10-07 13:59:51 +0300
commit2cb5078ce2639b66360e6c5bba356d83af7760df (patch)
tree6452cd9f6d2088da822273427565029c81896927
parentcc1614123e325235c2ad6d2348ead6c0d4d00c92 (diff)
Update NUMA API library to latest version
Brings support of PPC and S390 platforms, which are required to have Blender compiled on all ports of Debian.
-rw-r--r--intern/numaapi/README.blender2
-rw-r--r--intern/numaapi/source/build_config.h27
m---------release/scripts/addons0
3 files changed, 28 insertions, 1 deletions
diff --git a/intern/numaapi/README.blender b/intern/numaapi/README.blender
index 6f71d5f8807..0151be80e10 100644
--- a/intern/numaapi/README.blender
+++ b/intern/numaapi/README.blender
@@ -1,5 +1,5 @@
Project: LibNumaAPI
URL: https://github.com/Nazg-Gul/libNumaAPI
License: MIT
-Upstream version: 4e7206befce
+Upstream version: 1afdd28a08d
Local modifications: None
diff --git a/intern/numaapi/source/build_config.h b/intern/numaapi/source/build_config.h
index 444adcc0c71..b8af51a5dd7 100644
--- a/intern/numaapi/source/build_config.h
+++ b/intern/numaapi/source/build_config.h
@@ -307,6 +307,27 @@
# define ARCH_CPU_32_BITS 1
# define ARCH_CPU_BIG_ENDIAN 1
# endif
+#elif defined(__powerpc64__)
+# define ARCH_CPU_PPC_FAMILY 1
+# define ARCH_CPU_PPC 1
+# define ARCH_CPU_64_BITS 1
+# if defined(__BIG_ENDIAN__)
+# define ARCH_CPU_BIG_ENDIAN 1
+# elif defined(__LITTLE_ENDIAN)
+# define ARCH_CPU_LITTLE_ENDIAN 1
+# else
+# error Please define your endianness
+# endif
+#elif defined(__s390x__)
+# define ARCH_CPU_S390_FAMILY 1
+# define ARCH_CPU_S390X 1
+# define ARCH_CPU_64_BITS 1
+# define ARCH_CPU_BIG_ENDIAN 1
+#elif defined(__s390__)
+# define ARCH_CPU_S390_FAMILY 1
+# define ARCH_CPU_S390 1
+# define ARCH_CPU_31_BITS 1
+# define ARCH_CPU_BIG_ENDIAN 1
#else
# error Please add support for your architecture in build_config.h
#endif
@@ -337,6 +358,12 @@
#if !defined(ARCH_CPU_MIPS64_FAMILY)
# define ARCH_CPU_MIPS64_FAMILY 0
#endif
+#if !defined(ARCH_CPU_PPC_FAMILY)
+# define ARCH_CPU_PPC_FAMILY 0
+#endif
+#if !defined(ARCH_CPU_S390_FAMILY)
+# define ARCH_CPU_S390_FAMILY 0
+#endif
////////////////////////////////////////////////////////////////////////////////
// Sizes of platform-dependent types.
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject d39c2b61470059dd31cf688441c817a875b928c
+Subproject 7850524e6d7864196538781148026f282e69ce2