[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 652 Do not use armv4 incompatible code

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 652
Revision Id: iuculano at debian.org-20100717151742-vcb8ro7dv66zu3ul
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Do not use armv4 incompatible code


--------------------------------------------------------
  ** Added :
        - debian/patches/armv4.patch

  ** Modified :
        - debian/changelog
        - debian/patches/series

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-07-17 15:16:56 +0000
+++ b/debian/changelog	2010-07-17 15:17:42 +0000
@@ -1,8 +1,9 @@
 chromium-browser (5.0.375.99~r51029-4) UNRELEASED; urgency=low
 
   * Fix FTBFS with icu 4.4 (Closes: #589414)
+  * Do not use armv4 incompatible code
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 17 Jul 2010 17:08:55 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 17 Jul 2010 17:17:18 +0200
 
 chromium-browser (5.0.375.99~r51029-3) unstable; urgency=low
 

=== added file 'debian/patches/armv4.patch'
--- a/debian/patches/armv4.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/armv4.patch	2010-07-17 15:17:42 +0000
@@ -0,0 +1,33 @@
+Do not use armv4 incopatible code
+--- a/src/third_party/skia/include/core/SkMath.h
++++ b/src/third_party/skia/include/core/SkMath.h
+@@ -170,7 +170,7 @@ static inline int SkNextLog2(uint32_t va
+ #if defined(__arm__) \
+   && !defined(__thumb__) \
+   && !defined(__ARM_ARCH_4T__) \
+-  && !defined(__ARM_ARCH_5T__)
++  && 0
+     static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
+         SkASSERT((int16_t)x == x);
+         SkASSERT((int16_t)y == y);
+--- a/src/base/debug_util_posix.cc
++++ b/src/base/debug_util_posix.cc
+@@ -248,7 +248,7 @@ bool DebugUtil::BeingDebugged() {
+ #if defined(NDEBUG) && !defined(OS_MACOSX)
+ #define DEBUG_BREAK() abort()
+ #elif defined(ARCH_CPU_ARM_FAMILY)
+-#define DEBUG_BREAK() asm("bkpt 0")
++#define DEBUG_BREAK() asm("nop")
+ #else
+ #define DEBUG_BREAK() asm("int3")
+ #endif
+--- a/src/build/common.gypi
++++ b/src/build/common.gypi
+@@ -915,6 +915,7 @@
+                   # silences those warnings, as they are not helpful and
+                   # clutter legitimate warnings.
+                   '-Wno-abi',
++                  '-fno-tree-sink',
+                 ],
+                 'conditions': [
+                   ['arm_thumb == 1', {

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2010-07-17 15:16:56 +0000
+++ b/debian/patches/series	2010-07-17 15:17:42 +0000
@@ -20,3 +20,4 @@
 webkit-CVE-2010-1760.patch
 gtk-ambiance.patch
 icu44.patch
+armv4.patch