[SCM] WebKit Debian packaging branch, debian, updated. 0+svn25144-1-3-g5b1601d

[Mike Hommey]

The branch, debian has been updated
       via  5b1601dfdfafb08bd3e7ba9c5c5cfc079744a06d (commit)
      from  b9d06520977bc8670598621238d80acc66da6cc6 (commit)


- Shortlog ------------------------------------------------------------
5b1601d Better arm defines

Summary of changes:
 JavaScriptCore/kjs/ustring.h        |    4 ++--
 JavaScriptCore/wtf/Platform.h       |    7 +++++++
 WebCore/platform/DeprecatedString.h |    4 ++--
 debian/changelog                    |    9 ++++++---
 4 files changed, 17 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 5b1601dfdfafb08bd3e7ba9c5c5cfc079744a06d
Author: Riku Voipio <riku.voipio at iki.fi>
Date:   Mon Aug 27 21:05:21 2007 +0200

    Better arm defines
      * JavaScriptCore/wtf/Platform.h: Use better defines for our various arm ports.
      * JavaScriptCore/kjs/ustring.h, WebCore/platform/DeprecatedString.h: Use
        these new defines.

diff --git a/JavaScriptCore/kjs/ustring.h b/JavaScriptCore/kjs/ustring.h
index fbfd638..f8311e7 100644
--- a/JavaScriptCore/kjs/ustring.h
+++ b/JavaScriptCore/kjs/ustring.h
@@ -32,9 +32,9 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 
-/* On ARM some versions of GCC don't pack structures by default so sizeof(UChar)
+/* On some ARM platforms GCC won't pack structures by default so sizeof(UChar)
    will end up being != 2 which causes crashes since the code depends on that. */
-#if COMPILER(GCC) && PLATFORM(ARM)
+#if COMPILER(GCC) && PLATFORM(FORCE_PACK)
 #define PACK_STRUCT __attribute__((packed))
 #else
 #define PACK_STRUCT
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 533230e..dca8351 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -130,8 +130,15 @@
 #if   defined(arm) \
    || defined(__arm__)
 #define WTF_PLATFORM_ARM 1
+#if defined(__ARMEB__)
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#elif !defined(__ARM_EABI__) && !defined(__ARMEB__)
 #define WTF_PLATFORM_MIDDLE_ENDIAN 1
 #endif
+#if !defined(__ARM_EABI__)
+#define WTF_PLATFORM_FORCE_PACK 1
+#endif
+#endif
 
 /* PLATFORM(X86) */
 #if   defined(__i386__) \
diff --git a/WebCore/platform/DeprecatedString.h b/WebCore/platform/DeprecatedString.h
index c9ee76c..01366f2 100644
--- a/WebCore/platform/DeprecatedString.h
+++ b/WebCore/platform/DeprecatedString.h
@@ -32,9 +32,9 @@
 
 #include <ctype.h>
 
-/* On ARM some versions of GCC don't pack structures by default so sizeof(DeprecatedChar)
+/* On some ARM platforms GCC won't pack structures by default so sizeof(DeprecatedChar)
    will end up being != 2 which causes crashes since the code depends on that. */
-#if COMPILER(GCC) && PLATFORM(ARM)
+#if COMPILER(GCC) && PLATFORM(FORCE_PACK)
 #define PACK_STRUCT __attribute__((packed))
 #else
 #define PACK_STRUCT
diff --git a/debian/changelog b/debian/changelog
index 879dfe4..47bddd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
 webkit (0~svn25144-2) UNRELEASED; urgency=low
 
-  * JavaScriptCore/wtf/Platform.h: Also test if __arm__ is defined, which
-    should fix the FTBFS on arm.
+  * JavaScriptCore/wtf/Platform.h:
+    - Also test if __arm__ is defined, which should fix the FTBFS on arm.
+    - Use better defines for our various arm ports.
+  * JavaScriptCore/kjs/ustring.h, WebCore/platform/DeprecatedString.h: Use
+    these new defines. Thanks Riku Voipio.
   * debian/control: Build depend on Qt >= 4.3. Thanks Hubert Figuiere.
     Closes: #439672.
 
- -- Mike Hommey <glandium at debian.org>  Sun, 26 Aug 2007 18:14:57 +0200
+ -- Mike Hommey <glandium at debian.org>  Mon, 27 Aug 2007 20:58:36 +0200
 
 webkit (0~svn25144-1) unstable; urgency=low
 

-- 
WebKit Debian packaging