[colobot] 73/74: Patch hippomocks to broaden its architecture support

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit b2652c87c6e06bd7cc081d1273d3a1639921ede8
Author: Didier Raboud <odyx at debian.org>
Date:   Mon Nov 7 08:36:45 2016 +0100

    Patch hippomocks to broaden its architecture support
    
    This should fix the mips* and arm64 FTBFS'es.
    
    Thanks-to: Philippe Coval <philippe.coval at osg.samsung.com>
---
 debian/patches/hippomocks_architectures.patch | 66 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 67 insertions(+)

diff --git a/debian/patches/hippomocks_architectures.patch b/debian/patches/hippomocks_architectures.patch
new file mode 100644
index 0000000..23a2c08
--- /dev/null
+++ b/debian/patches/hippomocks_architectures.patch
@@ -0,0 +1,66 @@
+Description: Extend hippomocks architecture coverage:
+ - https://github.com/TizenTeam/hippomocks/commit/f11f2acec35bee86f88f69615bf078a1217e4f0e
+   supports also arm64
+   Change-Id: I7c44aba40f71fa1b972b53c1244c48b41a6f1603
+   Signed-off-by: Philippe Coval <philippe.coval at osg.samsung.com>
+ - https://github.com/TizenTeam/hippomocks/commit/7b9a9eea0381af98b180aebce4855bef7a7a9725
+   supports MIPS arch as non x86 architecture (arm, aarch64...)
+   Change-Id: I2b895337ef25b6719fa7121470fac44278339e30
+   Credits-to: Kishen Maloor <kishen.maloor at intel.com>
+   Origin: http://git.yoctoproject.org/cgit/cgit.cgi/meta-oic/commit/recipes-core/iotivity/files/hippomocks_mips_patch?id=39e8fc783a0bd1c0449b159a55ff34c56f89f8f1
+   Signed-off-by: Philippe Coval <philippe.coval at osg.samsung.com>
+Author: Philippe Coval <philippe.coval at osg.samsung.com>
+Signed-off-by: Didier Raboud <odyx at debian.org>
+Last-Update: 2016-11-07
+
+--- a/lib/hippomocks/hippomocks.h
++++ b/lib/hippomocks/hippomocks.h
+@@ -87,8 +87,10 @@
+ 
+ #if defined(_M_IX86) || defined(__i386__) || defined(i386) || defined(_X86_) || defined(__THW_INTEL) ||  defined(__x86_64__) || defined(_M_X64)
+ #define SOME_X86
+-#elif defined(arm) || defined(__arm__) || defined(ARM) || defined(_ARM_)
+-#define SOME_ARM
++#elif defined(arm) || defined(__arm__) || defined(ARM) || defined(_ARM_) || defined(__aarch64__)
++#define NOT_SOME_X86
++#elif defined(mips) || defined(__mips__)
++#define NOT_SOME_X86
+ #endif
+ 
+ #if defined(__x86_64__) || defined(_M_X64)
+@@ -103,7 +105,7 @@
+ #elif defined(__APPLE__)
+ #define _HIPPOMOCKS__ENABLE_CFUNC_MOCKING_SUPPORT
+ #endif
+-#elif defined(SOME_ARM) && defined(__GNUC__)
++#elif defined(NOT_SOME_X86) && defined(__GNUC__)
+ #define _HIPPOMOCKS__ENABLE_CFUNC_MOCKING_SUPPORT
+ 
+ // This clear-cache is *required*. The tests will fail if you remove it.
+@@ -293,7 +295,7 @@
+       *(long long*)(horrible_cast<intptr_t>(origFunc) + 6) = (long long)(horrible_cast<intptr_t>(replacement));
+     }
+ #endif
+-#elif defined(SOME_ARM)
++#elif defined(NOT_SOME_x86)
+     unsigned int *rawptr = (unsigned int *)((intptr_t)(origFunc) & (~3));
+     if ((intptr_t)origFunc & 1) {
+       rawptr[0] = 0x6800A001;
+@@ -311,7 +313,7 @@
+   {
+     Unprotect _allow_write(origFunc, sizeof(backupData));
+     memcpy(origFunc, backupData, sizeof(backupData)); 
+-#ifdef SOME_ARM
++#ifdef NOT_SOME_x86
+     unsigned int *rawptr = (unsigned int *)((intptr_t)(origFunc) & (~3));
+     __clear_cache((char *)rawptr, (char *)rawptr+16);
+ #endif
+@@ -1205,7 +1207,7 @@
+ 		} u;
+ 	} conv;
+ 	conv.t = t;
+-#if defined(SOME_ARM)
++#if defined(NOT_SOME_x86)
+ 	// ARM ABI says the bit is in bsaeoffs instead, and that the value is shiffted left 1.
+ 	// This because valid ARM pointers may have the LSB set, so the "is virtual" bit had to be moved.
+ 	if (conv.u.baseoffs & 1)
diff --git a/debian/patches/series b/debian/patches/series
index ac164ec..7073044 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 find-music-in-root-for-multi-source.patch
 oggenc-reproducibly.patch
 doxygen-reproducibly.patch
+hippomocks_architectures.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git