x32.patch

   1 diff -ur qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/build/config/compiler/BUILD.gn qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/build/config/compiler/BUILD.gn
   2 --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/build/config/compiler/BUILD.gn      2018-06-15 09:47:20.000000000 +0200
   3 +++ qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/build/config/compiler/BUILD.gn  2018-08-13 01:44:53.799249439 +0200
   4 @@ -661,14 +661,7 @@
   5    if (is_posix && !(is_mac || is_ios)) {
   6      # CPU architecture. We may or may not be doing a cross compile now, so for
   7      # simplicity we always explicitly set the architecture.
   8 -    if (current_cpu == "x64") {
   9 -      cflags += [
  10 -        "-m64",
  11 -      ]
  12 -      ldflags += [ "-m64" ]
  13 -    } else if (current_cpu == "x86") {
  14 -      cflags += [ "-m32" ]
  15 -      ldflags += [ "-m32" ]
  16 +    if (current_cpu == "x86") {
  17        if (!is_nacl) {
  18          cflags += [
  19            "-msse2",
  20 diff -ur qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/urandom.c qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/urandom.c
  21 --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/urandom.c  2018-06-15 09:47:20.000000000 +0200
  22 +++ qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/urandom.c      2018-08-13 01:55:47.227682313 +0200
  23 @@ -47,7 +47,11 @@
  24  #if defined(OPENSSL_LINUX)
  25
  26  #if defined(OPENSSL_X86_64)
  27 +#if defined(__ILP32__)
  28 +#define EXPECTED_NR_getrandom (__X32_SYSCALL_BIT + 318)
  29 +#else
  30  #define EXPECTED_NR_getrandom 318
  31 +#endif
  32  #elif defined(OPENSSL_X86)
  33  #define EXPECTED_NR_getrandom 355
  34  #elif defined(OPENSSL_AARCH64)
  35 diff -ur qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/gypfiles/toolchain.gypi qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/gypfiles/toolchain.gypi
  36 --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/gypfiles/toolchain.gypi  2018-06-15 09:47:20.000000000 +0200
  37 +++ qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/gypfiles/toolchain.gypi      2018-08-13 01:44:03.828604732 +0200
  38 @@ -1042,28 +1042,6 @@
  39            }],
  40          ],
  41        }],
  42 -      ['(OS=="linux" or OS=="android") and \
  43 -        (v8_target_arch=="x64" or v8_target_arch=="arm64" or \
  44 -         v8_target_arch=="ppc64" or v8_target_arch=="s390x")', {
  45 -        'target_conditions': [
  46 -          ['_toolset=="host"', {
  47 -            'conditions': [
  48 -              ['host_cxx_is_biarch==1', {
  49 -                'cflags': [ '-m64' ],
  50 -                'ldflags': [ '-m64' ]
  51 -              }],
  52 -             ],
  53 -           }],
  54 -           ['_toolset=="target"', {
  55 -             'conditions': [
  56 -               ['target_cxx_is_biarch==1', {
  57 -                 'cflags': [ '-m64' ],
  58 -                 'ldflags': [ '-m64' ],
  59 -               }],
  60 -             ]
  61 -           }],
  62 -         ],
  63 -      }],
  64        ['OS=="android" and v8_android_log_stdout==1', {
  65          'defines': [
  66            'V8_ANDROID_LOG_STDOUT',
  67 diff -ur qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/src/objects/bigint.cc qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/src/objects/bigint.cc
  68 --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/src/objects/bigint.cc    2018-06-15 09:47:20.000000000 +0200
  69 +++ qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/src/objects/bigint.cc        2018-08-13 02:15:32.443103386 +0200
  70 @@ -2162,7 +2162,7 @@
  71  BigInt::digit_t MutableBigInt::digit_div(digit_t high, digit_t low,
  72                                           digit_t divisor, digit_t* remainder) {
  73    DCHECK(high < divisor);
  74 -#if V8_TARGET_ARCH_X64 && (__GNUC__ || __clang__)
  75 +#if V8_TARGET_ARCH_X64 && (__GNUC__ || __clang__) && !defined(__ILP32__)
  76    digit_t quotient;
  77    digit_t rem;
  78    __asm__("divq  %[divisor]"
  79 --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/src/compiler/instruction-selector.cc.orig        2018-06-15 09:47:20.000000000 +0200
  80 +++ qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/src/compiler/instruction-selector.cc     2018-08-14 09:18:33.177100945 +0200
  81 @@ -1927,7 +1927,7 @@
  82  }
  83
  84  // 32 bit targets do not implement the following instructions.
  85 -#if V8_TARGET_ARCH_32_BIT
  86 +#if V8_TARGET_ARCH_32_BIT && !V8_TARGET_ARCH_X64
  87
  88  void InstructionSelector::VisitWord64And(Node* node) { UNIMPLEMENTED(); }
  89
  90 @@ -2081,7 +2081,7 @@
  91  #endif  // V8_TARGET_ARCH_32_BIT
  92
  93  // 64 bit targets do not implement the following instructions.
  94 -#if V8_TARGET_ARCH_64_BIT
  95 +#if V8_TARGET_ARCH_64_BIT || V8_TARGET_ARCH_X64
  96  void InstructionSelector::VisitInt32PairAdd(Node* node) { UNIMPLEMENTED(); }
  97
  98  void InstructionSelector::VisitInt32PairSub(Node* node) { UNIMPLEMENTED(); }
  99 --- qtwebengine-everywhere-src-5.11.1.clean/src/3rdparty/chromium/build/build_config.h~ 2018-06-15 09:47:20.000000000 +0200
 100 +++ qtwebengine-everywhere-src-5.11.1.clean/src/3rdparty/chromium/build/build_config.h  2018-08-14 09:23:40.756276384 +0200
 101 @@ -106,7 +106,11 @@
 102  #if defined(_M_X64) || defined(__x86_64__)
 103  #define ARCH_CPU_X86_FAMILY 1
 104  #define ARCH_CPU_X86_64 1
 105 +#ifdef __ILP32__
 106 +#define ARCH_CPU_32_BITS 1
 107 +#else
 108  #define ARCH_CPU_64_BITS 1
 109 +#endif
 110  #define ARCH_CPU_LITTLE_ENDIAN 1
 111  #elif defined(_M_IX86) || defined(__i386__)
 112  #define ARCH_CPU_X86_FAMILY 1
 113 --- qtwebengine-everywhere-src-5.11.1.clean/src/3rdparty/chromium/third_party/pdfium/third_party/build/build_config.h~  2018-06-15 09:47:20.000000000 +0200
 114 +++ qtwebengine-everywhere-src-5.11.1.clean/src/3rdparty/chromium/third_party/pdfium/third_party/build/build_config.h   2018-08-14 09:24:56.127049857 +0200
 115 @@ -104,7 +104,11 @@
 116  #if defined(_M_X64) || defined(__x86_64__)
 117  #define ARCH_CPU_X86_FAMILY 1
 118  #define ARCH_CPU_X86_64 1
 119 +#ifdef __ILP32__
 120 +#define ARCH_CPU_32_BITS 1
 121 +#else
 122  #define ARCH_CPU_64_BITS 1
 123 +#endif
 124  #define ARCH_CPU_LITTLE_ENDIAN 1
 125  #elif defined(_M_IX86) || defined(__i386__)
 126  #define ARCH_CPU_X86_FAMILY 1
 127 --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.cc~  2018-06-15 09:47:20.000000000 +0200
 128 +++ qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.cc   2018-08-14 09:27:44.678865071 +0200
 129 @@ -77,7 +77,7 @@
 130  void* GetRandomPageBase() {
 131    uintptr_t random = static_cast<uintptr_t>(ranval(s_ranctx.Pointer()));
 132
 133 -#if defined(ARCH_CPU_64_BITS)
 134 +#if defined(ARCH_CPU_64_BITS) && !defined(__ILP32__)
 135    random <<= 32ULL;
 136    random |= static_cast<uintptr_t>(ranval(s_ranctx.Pointer()));
 137
 138 --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/base/debug/stack_trace_posix.cc~    2018-06-15 09:47:20.000000000 +0200
 139 +++ qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/base/debug/stack_trace_posix.cc     2018-08-14 09:46:02.035829506 +0200
 140 @@ -340,7 +340,7 @@
 141      const char* label;
 142      greg_t value;
 143    } registers[] = {
 144 -#if ARCH_CPU_32_BITS
 145 +#if ARCH_CPU_32_BITS && !defined(__ILP32__)
 146      { "  gs: ", context->uc_mcontext.gregs[REG_GS] },
 147      { "  fs: ", context->uc_mcontext.gregs[REG_FS] },
 148      { "  es: ", context->uc_mcontext.gregs[REG_ES] },
 149 @@ -360,7 +360,7 @@
 150      { " efl: ", context->uc_mcontext.gregs[REG_EFL] },
 151      { " usp: ", context->uc_mcontext.gregs[REG_UESP] },
 152      { "  ss: ", context->uc_mcontext.gregs[REG_SS] },
 153 -#elif ARCH_CPU_64_BITS
 154 +#elif ARCH_CPU_64_BITS || defined(__ILP32__)
 155      { "  r8: ", context->uc_mcontext.gregs[REG_R8] },
 156      { "  r9: ", context->uc_mcontext.gregs[REG_R9] },
 157      { " r10: ", context->uc_mcontext.gregs[REG_R10] },
 158 @@ -387,9 +387,9 @@
 159  #endif  // ARCH_CPU_32_BITS
 160    };
 161
 162 -#if ARCH_CPU_32_BITS
 163 +#if ARCH_CPU_32_BITS && !defined(__ILP32__)
 164    const int kRegisterPadding = 8;
 165 -#elif ARCH_CPU_64_BITS
 166 +#elif ARCH_CPU_64_BITS || defined(__ILP32__)
 167    const int kRegisterPadding = 16;
 168  #endif
 169