View | Details | Raw Unified | Return to bug 228603
Collapse All | Expand All

(-)www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn (-11 / +34 lines)
Lines 1-6 Link Here
1 
--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig	2017-01-26 00:49:07 UTC
 1 
--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig	2018-01-15 11:39:43 UTC
2 
+++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
 2 
+++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
3 
@@ -150,7 +150,7 @@ config("compiler") {
 3 
@@ -156,7 +156,7 @@ config("compiler") {
4 
     configs += [ "//build/config/win:compiler" ]
 4 
     configs += [ "//build/config/win:compiler" ]
5 
   } else if (is_android) {
 5 
   } else if (is_android) {
6 
     configs += [ "//build/config/android:compiler" ]
 6 
     configs += [ "//build/config/android:compiler" ]
Lines 9-15 Link Here
9 
     configs += [ "//build/config/linux:compiler" ]
 9 
     configs += [ "//build/config/linux:compiler" ]
10 
   } else if (is_nacl) {
 10 
   } else if (is_nacl) {
11 
     configs += [ "//build/config/nacl:compiler" ]
 11 
     configs += [ "//build/config/nacl:compiler" ]
12 
@@ -277,7 +277,7 @@ config("compiler") {
 12 
@@ -290,7 +290,7 @@ config("compiler") {
13
13
14 
   # Linux/Android common flags setup.
 14 
   # Linux/Android common flags setup.
15 
   # ---------------------------------
 15 
   # ---------------------------------
Lines 18-24 Link Here
18 
     cflags += [
 18 
     cflags += [
19 
       "-fPIC",
 19 
       "-fPIC",
20 
       "-pipe",  # Use pipes for communicating between sub-processes. Faster.
 20 
       "-pipe",  # Use pipes for communicating between sub-processes. Faster.
21 
@@ -401,14 +401,14 @@ config("compiler") {
 21 
@@ -414,14 +414,14 @@ config("compiler") {
22 
   # clang-cl (used if is_win) doesn't expose this flag.
 22 
   # clang-cl (used if is_win) doesn't expose this flag.
23 
   # Currently disabled for nacl since its toolchain lacks this flag (too old).
 23 
   # Currently disabled for nacl since its toolchain lacks this flag (too old).
24 
   # TODO(zforman): Once nacl's toolchain is updated, remove check.
 24 
   # TODO(zforman): Once nacl's toolchain is updated, remove check.
Lines 35-41 Link Here
35 
     # gnu++11 instead of c++11 is needed because some code uses typeof() (a
 35 
     # gnu++11 instead of c++11 is needed because some code uses typeof() (a
36 
     # GNU extension).
 36 
     # GNU extension).
37 
     # TODO(thakis): Eventually switch this to c++11 instead,
 37 
     # TODO(thakis): Eventually switch this to c++11 instead,
38 
@@ -458,7 +458,7 @@ config("compiler") {
 38 
@@ -475,7 +475,7 @@ config("compiler") {
39 
       ]
 39 
       ]
40
40
41 
       # Apply a lower LTO optimization level as the default is too slow.
 41 
       # Apply a lower LTO optimization level as the default is too slow.
Lines 44-50 Link Here
44 
         if (use_lld) {
 44 
         if (use_lld) {
45 
           ldflags += [ "-Wl,--lto-O1" ]
 45 
           ldflags += [ "-Wl,--lto-O1" ]
46 
         } else {
 46 
         } else {
47 
@@ -478,7 +478,7 @@ config("compiler") {
 47 
@@ -495,7 +495,7 @@ config("compiler") {
48 
     # targeting ARM, without this flag, LTO produces a .text section that is
 48 
     # targeting ARM, without this flag, LTO produces a .text section that is
49 
     # larger than the maximum call displacement, preventing the linker from
 49 
     # larger than the maximum call displacement, preventing the linker from
50 
     # relocating calls (http://llvm.org/PR22999).
 50 
     # relocating calls (http://llvm.org/PR22999).
Lines 53-59 Link Here
53 
       ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
 53 
       ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
54 
     }
 54 
     }
55 
   }
 55 
   }
56 
@@ -742,7 +742,7 @@ config("compiler_codegen") {
 56 
@@ -541,11 +541,11 @@ config("compiler_cpu_abi") {
57 
         ]
58 
       }
59 
     } else if (current_cpu == "arm") {
60 
-      if (is_clang && !is_android && !is_nacl) {
61 
+      if (is_clang && !is_android && !is_nacl && !is_bsd) {
62 
         cflags += [ "--target=arm-linux-gnueabihf" ]
63 
         ldflags += [ "--target=arm-linux-gnueabihf" ]
64 
       }
65 
-      if (!is_nacl) {
66 
+      if (!is_nacl && !is_bsd) {
67 
         cflags += [
68 
           "-march=$arm_arch",
69 
           "-mfloat-abi=$arm_float_abi",
70 
@@ -555,7 +555,7 @@ config("compiler_cpu_abi") {
71 
         cflags += [ "-mtune=$arm_tune" ]
72 
       }
73 
     } else if (current_cpu == "arm64") {
74 
-      if (is_clang && !is_android && !is_nacl) {
75 
+      if (is_clang && !is_android && !is_nacl && !is_bsd) {
76 
         cflags += [ "--target=aarch64-linux-gnu" ]
77 
         ldflags += [ "--target=aarch64-linux-gnu" ]
78 
       }
79 
@@ -758,7 +758,7 @@ config("compiler_codegen") {
57 
 #   configs -= [ "//build/config/compiler:clang_stackrealign" ]
 80 
 #   configs -= [ "//build/config/compiler:clang_stackrealign" ]
58 
 # See https://crbug.com/556393 for details of where it must be avoided.
 81 
 # See https://crbug.com/556393 for details of where it must be avoided.
59 
 config("clang_stackrealign") {
 82 
 config("clang_stackrealign") {
Lines 62-68 Link Here
62 
     cflags = [
 85 
     cflags = [
63 
       # Align the stack on 16-byte boundaries, http://crbug.com/418554.
 86 
       # Align the stack on 16-byte boundaries, http://crbug.com/418554.
64 
       "-mstack-alignment=16",
 87 
       "-mstack-alignment=16",
65 
@@ -788,7 +788,7 @@ config("runtime_library") {
 88 
@@ -804,7 +804,7 @@ config("runtime_library") {
66 
   # smaller.
 89 
   # smaller.
67 
   if (is_win) {
 90 
   if (is_win) {
68 
     configs += [ "//build/config/win:runtime_library" ]
 91 
     configs += [ "//build/config/win:runtime_library" ]
Lines 71-77 Link Here
71 
     configs += [ "//build/config/linux:runtime_library" ]
 94 
     configs += [ "//build/config/linux:runtime_library" ]
72 
   } else if (is_ios) {
 95 
   } else if (is_ios) {
73 
     configs += [ "//build/config/ios:runtime_library" ]
 96 
     configs += [ "//build/config/ios:runtime_library" ]
74 
@@ -1038,7 +1038,7 @@ config("default_warnings") {
 97 
@@ -1054,7 +1054,7 @@ config("default_warnings") {
75 
         "-Wno-nonportable-include-path",
 98 
         "-Wno-nonportable-include-path",
76
99
77 
         # TODO(hans): https://crbug.com/637306
 100 
         # TODO(hans): https://crbug.com/637306
Lines 80-86 Link Here
80 
       ]
 103 
       ]
81 
     }
 104 
     }
82 
   }
 105 
   }
83 
@@ -1070,7 +1070,7 @@ config("chromium_code") {
 106 
@@ -1086,7 +1086,7 @@ config("chromium_code") {
84 
     ]
 107 
     ]
85
108
86 
     if (!is_debug && !using_sanitizer &&
 109 
     if (!is_debug && !using_sanitizer &&
Lines 89-95 Link Here
89 
       # _FORTIFY_SOURCE isn't really supported by Clang now, see
 112 
       # _FORTIFY_SOURCE isn't really supported by Clang now, see
90 
       # http://llvm.org/bugs/show_bug.cgi?id=16821.
 113 
       # http://llvm.org/bugs/show_bug.cgi?id=16821.
91 
       # It seems to work fine with Ubuntu 12 headers though, so use it in
 114 
       # It seems to work fine with Ubuntu 12 headers though, so use it in
92 
@@ -1128,7 +1128,7 @@ config("no_chromium_code") {
 115 
@@ -1144,7 +1144,7 @@ config("no_chromium_code") {
93 
     ]
 116 
     ]
94 
   }
 117 
   }
95
118
(-)www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_cpu.h (+11 lines)
Line 0 Link Here
1 
--- src/3rdparty/chromium/third_party/boringssl/src/include/openssl/cpu.h.orig	2018-03-21 07:29:16 UTC
2 
+++ src/3rdparty/chromium/third_party/boringssl/src/include/openssl/cpu.h
3 
@@ -95,7 +95,7 @@ extern uint32_t OPENSSL_ia32cap_P[4];
4
5 
 #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
6
7 
-#if defined(OPENSSL_APPLE)
8 
+#if defined(OPENSSL_APPLE) || defined(__FreeBSD__)
9 
 /* iOS builds use the static ARM configuration. */
10 
 #define OPENSSL_STATIC_ARMCAP
11 
 #endif
(-)www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_arm_cpu-arm.cc (+23 lines)
Line 0 Link Here
1 
--- src/3rdparty/chromium/v8/src/arm/cpu-arm.cc.orig	2017-09-25 11:16:57 UTC
2 
+++ src/3rdparty/chromium/v8/src/arm/cpu-arm.cc
3 
@@ -17,6 +17,11 @@
4 
 #include "src/assembler.h"
5 
 #include "src/macro-assembler.h"
6
7 
+#if V8_OS_FREEBSD
8 
+#include <sys/types.h>
9 
+#include <machine/sysarch.h>
10 
+#endif
11 
+
12 
 namespace v8 {
13 
 namespace internal {
14
15 
@@ -24,6 +29,8 @@ void CpuFeatures::FlushICache(void* start, size_t size
16 
 #if !defined(USE_SIMULATOR)
17 
 #if V8_OS_QNX
18 
   msync(start, size, MS_SYNC | MS_INVALIDATE_ICACHE);
19 
+#elif V8_OS_FREEBSD
20 
+  __clear_cache(start, reinterpret_cast<char*>(start) + size);
21 
 #else
22 
   register uint32_t beg asm("r0") = reinterpret_cast<uint32_t>(start);
23 
   register uint32_t end asm("r1") = beg + size;
(-)www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_cpu.cc (+19 lines)
Line 0 Link Here
1 
--- src/3rdparty/chromium/v8/src/base/cpu.cc.orig	2018-03-20 07:26:22 UTC
2 
+++ src/3rdparty/chromium/v8/src/base/cpu.cc
3 
@@ -600,7 +600,7 @@ CPU::CPU()
4 
 #endif
5
6 
 #elif V8_HOST_ARCH_ARM64
7 
-
8 
+#if V8_OS_LINUX
9 
   CPUInfo cpu_info;
10
11 
   // Extract implementor from the "CPU implementer" field.
12 
@@ -634,6 +634,7 @@ CPU::CPU()
13 
     }
14 
     delete[] part;
15 
   }
16 
+#endif // V8_OS_LINUX
17
18 
 #elif V8_HOST_ARCH_PPC
19
(-)www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc (+25 lines)
Line 0 Link Here
1 
--- src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc.orig	2017-09-25 11:52:56 UTC
2 
+++ src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc
3 
@@ -36,6 +36,22 @@ namespace v8 {
4 
 namespace base {
5
6
7 
+#ifdef __arm__
8 
+bool OS::ArmUsingHardFloat() {
9 
+#if defined(__ARM_PCS_VFP)
10 
+  return true;
11 
+#elif defined(__ARM_PCS) || defined(__SOFTFP__) || defined(__SOFTFP) || \
12 
+      !defined(__VFP_FP__)
13 
+  return false;
14 
+#else
15 
+#error "Your compiler does not report the FP ABI compiled for."         \
16 
+       "Please report it on this issue"                                 \
17 
+       "http://code.google.com/p/v8/issues/detail?id=2140"
18 
+#endif
19 
+}
20 
+#endif
21 
+
22 
+
23 
 const char* OS::LocalTimezone(double time, TimezoneCache* cache) {
24 
   if (std::isnan(time)) return "";
25 
   time_t tv = static_cast<time_t>(std::floor(time/msPerSecond));
(-)www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc (+15 lines)
Line 0 Link Here
1 
--- src/3rdparty/chromium/v8/src/libsampler/sampler.cc.orig	2018-03-20 07:19:58 UTC
2 
+++ src/3rdparty/chromium/v8/src/libsampler/sampler.cc
3 
@@ -499,9 +499,9 @@ void SignalHandler::FillRegisterState(void* context, R
4 
   state->sp = reinterpret_cast<void*>(mcontext.mc_rsp);
5 
   state->fp = reinterpret_cast<void*>(mcontext.mc_rbp);
6 
 #elif V8_HOST_ARCH_ARM
7 
-  state->pc = reinterpret_cast<void*>(mcontext.mc_r15);
8 
-  state->sp = reinterpret_cast<void*>(mcontext.mc_r13);
9 
-  state->fp = reinterpret_cast<void*>(mcontext.mc_r11);
10 
+  state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]);
11 
+  state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]);
12 
+  state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]);
13 
 #endif  // V8_HOST_ARCH_*
14 
 #elif V8_OS_NETBSD
15 
 #if V8_HOST_ARCH_IA32

Return to bug 228603