diff options
| author | Fathi Boudra <fabo@debian.org> | 2010-06-08 11:08:10 +0300 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2010-06-08 11:08:10 +0300 |
| commit | 328adb5ba29c9aadb7b9979f94ae1b29d3e5e5cf (patch) | |
| tree | 889ce6c2e30d738dfa305ccf7c59baf594aee446 | |
| parent | 9620a896d524a22724b6886142121891a47842db (diff) | |
| download | qt4-x11-328adb5ba29c9aadb7b9979f94ae1b29d3e5e5cf.tar.gz | |
Update 30_webkit_unaligned_access.diff
(arm/sh4 platform added, sparc still missing)
| -rw-r--r-- | debian/patches/30_webkit_unaligned_access.diff | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/debian/patches/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff index 418e4e4..604a556 100644 --- a/debian/patches/30_webkit_unaligned_access.diff +++ b/debian/patches/30_webkit_unaligned_access.diff @@ -101,27 +101,12 @@ a real problem yet. if (*stringCharacters++ != *characters++) --- a/src/3rdparty/webkit/WebCore/platform/text/StringHash.h +++ b/src/3rdparty/webkit/WebCore/platform/text/StringHash.h -@@ -47,6 +47,15 @@ namespace WebCore { +@@ -48,7 +48,7 @@ namespace WebCore { if (aLength != bLength) return false; -+#if PLATFORM(ARM) || PLATFORM(SPARC) -+ const UChar* aChars = a->characters(); -+ const UChar* bChars = b->characters(); -+ for (unsigned i = 0; i != aLength; ++i) -+ if (*aChars++ != *bChars++) -+ return false; -+ -+ return true; -+#else - const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters()); - const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters()); - -@@ -59,6 +68,7 @@ namespace WebCore { - return false; - - return true; -+#endif - } - - static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); } +-#if PLATFORM(ARM) || PLATFORM(SH4) ++#if PLATFORM(ARM) || PLATFORM(SH4) || PLATFORM(SPARC) + const UChar* aChars = a->characters(); + const UChar* bChars = b->characters(); + for (unsigned i = 0; i != aLength; ++i) { |