diff -x '*.pro' -x '*.pri' -ur qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.cpp /var/tmp/portage/dev-util/qt-creator-2.6.1-r1/work/qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.cpp
--- qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.cpp	2012-12-17 16:18:37.000000000 +0000
+++ /var/tmp/portage/dev-util/qt-creator-2.6.1-r1/work/qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.cpp	2013-01-25 23:05:59.405466553 +0000
@@ -1103,7 +1103,7 @@
    #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32
 #endif
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
 namespace Botan {
 
 extern "C" {
@@ -1689,7 +1689,7 @@
 
 }
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
 #if (BOTAN_MP_WORD_BITS == 8)
   typedef Botan::u16bit dword;
 #elif (BOTAN_MP_WORD_BITS == 16)
@@ -2315,7 +2315,7 @@
 
 extern "C" {
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
 /*
 * Helper Macros for x86 Assembly
 */
diff -x '*.pro' -x '*.pri' -ur qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.h /var/tmp/portage/dev-util/qt-creator-2.6.1-r1/work/qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.h
--- qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.h	2012-12-17 16:18:37.000000000 +0000
+++ /var/tmp/portage/dev-util/qt-creator-2.6.1-r1/work/qt-creator-2.6.1-src/src/libs/3rdparty/botan/botan.h	2013-01-25 23:09:01.625466639 +0000
@@ -66,7 +66,7 @@
 #endif
 
 #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
-#define BOTAN_TARGET_CPU_IS_X86_FAMILY
+//#define BOTAN_TARGET_CPU_IS_X86_FAMILY
 #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1
 
 #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \