x32.patch

   1 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
   2 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
   3 @@ -213,8 +213,12 @@
   4  /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
   5  #if   defined(__x86_64__) \
   6      || defined(_M_X64)
   7 +#ifdef __ILP32__
   8 +#define WTF_CPU_X86_64_32 1
   9 +#else
  10  #define WTF_CPU_X86_64 1
  11  #endif
  12 +#endif
  13
  14  /* 64-bit mode on AIX */
  15  #ifdef __64BIT__
  16 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
  17 +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
  18 @@ -213,8 +213,12 @@
  19  /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
  20  #if   defined(__x86_64__) \
  21      || defined(_M_X64)
  22 +#ifdef __ILP32__
  23 +#define WTF_CPU_X86_64_32 1
  24 +#else
  25  #define WTF_CPU_X86_64 1
  26  #endif
  27 +#endif
  28
  29  /* CPU(ARM) - ARM, any version*/
  30  #if   defined(arm) \
  31 --- a/configure
  32 +++ b/configure
  33 @@ -3329,6 +3329,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
  34              ;;
  35          esac
  36          ;;
  37 +    *:*:x32)
  38 +        if [ "$OPT_VERBOSE" = "yes" ]; then
  39 +            echo "    32-bit AMD 80x86 (x32)"
  40 +        fi
  41 +        CFG_HOST_ARCH=x32
  42 +        ;;
  43      *:*:*)
  44          if [ "$OPT_VERBOSE" = "yes" ]; then
  45              echo "    Trying '$UNAME_MACHINE'..."
  46 --- a/src/corelib/arch/qatomic_arch.h
  47 +++ b/src/corelib/arch/qatomic_arch.h
  48 @@ -92,6 +92,8 @@ QT_BEGIN_HEADER
  49  #  include "QtCore/qatomic_sh.h"
  50  #elif defined(QT_ARCH_SH4A)
  51  #  include "QtCore/qatomic_sh4a.h"
  52 +#elif defined(QT_ARCH_X32)
  53 +#  include "QtCore/qatomic_i386.h"
  54  #elif defined(QT_ARCH_NACL)
  55  #  include "QtCore/qatomic_generic.h"
  56  #else
  57 --- /dev/null
  58 +++ b/src/corelib/arch/x32/arch.pri
  59 @@ -0,0 +1,4 @@
  60 +#
  61 +# X32 architecture
  62 +#
  63 +# nothing special needed here