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/src/objects/bigint.cc qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/src/objects/bigint.cc
  36 --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/src/objects/bigint.cc    2018-06-15 09:47:20.000000000 +0200
  37 +++ qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/src/objects/bigint.cc        2018-08-13 02:15:32.443103386 +0200
  38 @@ -2162,7 +2162,7 @@
  39  BigInt::digit_t MutableBigInt::digit_div(digit_t high, digit_t low,
  40                                           digit_t divisor, digit_t* remainder) {
  41    DCHECK(high < divisor);
  42 -#if V8_TARGET_ARCH_X64 && (__GNUC__ || __clang__)
  43 +#if V8_TARGET_ARCH_X64 && (__GNUC__ || __clang__) && !defined(__ILP32__)
  44    digit_t quotient;
  45    digit_t rem;
  46    __asm__("divq  %[divisor]"
  47 --- qtwebengine-everywhere-src-5.11.1.clean/src/3rdparty/chromium/build/build_config.h~ 2018-06-15 09:47:20.000000000 +0200
  48 +++ qtwebengine-everywhere-src-5.11.1.clean/src/3rdparty/chromium/build/build_config.h  2018-08-14 09:23:40.756276384 +0200
  49 @@ -106,7 +106,11 @@
  50  #if defined(_M_X64) || defined(__x86_64__)
  51  #define ARCH_CPU_X86_FAMILY 1
  52  #define ARCH_CPU_X86_64 1
  53 +#ifdef __ILP32__
  54 +#define ARCH_CPU_32_BITS 1
  55 +#else
  56  #define ARCH_CPU_64_BITS 1
  57 +#endif
  58  #define ARCH_CPU_LITTLE_ENDIAN 1
  59  #elif defined(_M_IX86) || defined(__i386__)
  60  #define ARCH_CPU_X86_FAMILY 1
  61 --- 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
  62 +++ 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
  63 @@ -77,7 +77,7 @@
  64  void* GetRandomPageBase() {
  65    uintptr_t random = static_cast<uintptr_t>(ranval(s_ranctx.Pointer()));
  66
  67 -#if defined(ARCH_CPU_64_BITS)
  68 +#if defined(ARCH_CPU_64_BITS) && !defined(__ILP32__)
  69    random <<= 32ULL;
  70    random |= static_cast<uintptr_t>(ranval(s_ranctx.Pointer()));
  71
  72 --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/base/debug/stack_trace_posix.cc~    2018-06-15 09:47:20.000000000 +0200
  73 +++ qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/base/debug/stack_trace_posix.cc     2018-08-14 09:46:02.035829506 +0200
  74 @@ -340,7 +340,7 @@
  75      const char* label;
  76      greg_t value;
  77    } registers[] = {
  78 -#if ARCH_CPU_32_BITS
  79 +#if ARCH_CPU_32_BITS && !defined(__ILP32__)
  80      { "  gs: ", context->uc_mcontext.gregs[REG_GS] },
  81      { "  fs: ", context->uc_mcontext.gregs[REG_FS] },
  82      { "  es: ", context->uc_mcontext.gregs[REG_ES] },
  83 @@ -360,7 +360,7 @@
  84      { " efl: ", context->uc_mcontext.gregs[REG_EFL] },
  85      { " usp: ", context->uc_mcontext.gregs[REG_UESP] },
  86      { "  ss: ", context->uc_mcontext.gregs[REG_SS] },
  87 -#elif ARCH_CPU_64_BITS
  88 +#elif ARCH_CPU_64_BITS || defined(__ILP32__)
  89      { "  r8: ", context->uc_mcontext.gregs[REG_R8] },
  90      { "  r9: ", context->uc_mcontext.gregs[REG_R9] },
  91      { " r10: ", context->uc_mcontext.gregs[REG_R10] },
  92 @@ -387,9 +387,9 @@
  93  #endif  // ARCH_CPU_32_BITS
  94    };
  95
  96 -#if ARCH_CPU_32_BITS
  97 +#if ARCH_CPU_32_BITS && !defined(__ILP32__)
  98    const int kRegisterPadding = 8;
  99 -#elif ARCH_CPU_64_BITS
 100 +#elif ARCH_CPU_64_BITS || defined(__ILP32__)
 101    const int kRegisterPadding = 16;
 102  #endif
 103