Djam/chromium-browser-stable-test
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-test.git synced 2025-02-24 10:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to 37.0.2062.120. Fix crash on 32bit gcc 4.9 builds https://code.google.com/p/chromium/issues/detail?id=412967

Browse source
This commit is contained in:
Tigro 2014-09-16 19:45:33 +04:00
parent 7b52071704
commit 8d316adc98
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
chromium-37.0.2062.120-issue566583002_1.patch Normal file
View file

@ -0,0 +1,28 @@
diff -urN chromium-37.0.2062.120/v8/src/utils.h chromium-37.0.2062.120.new/v8/src/utils.h
--- chromium-37.0.2062.120/v8/src/utils.h 2014-09-10 03:48:34.000000000 +0400
+++ chromium-37.0.2062.120.new/v8/src/utils.h 2014-09-16 15:46:48.494162841 +0400
@@ -1424,20 +1424,10 @@
void CopyCharsUnsigned(sinkchar* dest, const sourcechar* src, int chars) {
sinkchar* limit = dest + chars;
#ifdef V8_HOST_CAN_READ_UNALIGNED
- if (sizeof(*dest) == sizeof(*src)) {
- if (chars >= static_cast<int>(kMinComplexMemCopy / sizeof(*dest))) {
- MemCopy(dest, src, chars * sizeof(*dest));
- return;
- }
- // Number of characters in a uintptr_t.
- static const int kStepSize = sizeof(uintptr_t) / sizeof(*dest); // NOLINT
- ASSERT(dest + kStepSize > dest); // Check for overflow.
- while (dest + kStepSize <= limit) {
- *reinterpret_cast<uintptr_t*>(dest) =
- *reinterpret_cast<const uintptr_t*>(src);
- dest += kStepSize;
- src += kStepSize;
- }
+ if ((sizeof(*dest) == sizeof(*src)) &&
+ (chars >= static_cast<int>(kMinComplexMemCopy / sizeof(*dest)))) {
+ MemCopy(dest, src, chars * sizeof(*dest));
+ return;
}
#endif
while (dest < limit) {

3
chromium-browser-stable.spec
View file

@ -25,6 +25,8 @@ Patch4: chromium-30.0.1599.66-master-prefs-path.patch
Patch14: chromium-25.0.1364.172-no-courgette.patch Patch14: chromium-25.0.1364.172-no-courgette.patch
# PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings # PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings
Patch15: chromium-25.0.1364.172-sandbox-pie.patch Patch15: chromium-25.0.1364.172-sandbox-pie.patch
# fix https://code.google.com/p/chromium/issues/detail?id=412967
Patch20: chromium-37.0.2062.120-issue566583002_1.patch
Provides: %{crname} Provides: %{crname}
Conflicts: chromium-browser-unstable Conflicts: chromium-browser-unstable
@ -98,6 +100,7 @@ members of the Chromium and WebDriver teams.
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15 -p1
%patch20 -p1
# Hard code extra version # Hard code extra version
FILE=chrome/common/chrome_version_info_posix.cc FILE=chrome/common/chrome_version_info_posix.cc