[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.1.14-1-406-ga33802f

Tue Sep 22 00:28:16 UTC 2009

The following commit has been merged in the debian/experimental branch:
commit fbacd1e9a0f962ee6aabaa89afce89e462803597
Merge: fc9065950f65d928a4a96b02cf2455b7ee2aa91d 9c60ba1852732a2fd073d97373ec89605e73b740
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Mon Sep 21 19:12:48 2009 -0300

    Merge branch 'webkit-1.1' into debian/experimental

diff --combined JavaScriptCore/wtf/Platform.h
index 9e83bff,2894d43..76f11c8

--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@@ -226,6 -226,8 +226,8 @@@
  #endif
  
  /* PLATFORM(ARM) */
+ #define PLATFORM_ARM_ARCH(N) (PLATFORM(ARM) && ARM_ARCH_VERSION >= N)
+ 
  #if   defined(arm) \
     || defined(__arm__)
  #define WTF_PLATFORM_ARM 1
@@@ -234,9 -236,6 +236,6 @@@
  #elif !defined(__ARM_EABI__) && !defined(__EABI__) && !defined(__VFP_FP__)
  #define WTF_PLATFORM_MIDDLE_ENDIAN 1
  #endif
- #if !defined(__ARM_EABI__) && !defined(__EABI__)
- #define WTF_PLATFORM_FORCE_PACK 1
- #endif
  #define ARM_ARCH_VERSION 3
  #if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
  #undef ARM_ARCH_VERSION
@@@ -258,8 -257,21 +257,21 @@@
  #undef ARM_ARCH_VERSION
  #define ARM_ARCH_VERSION 7
  #endif
+ /* Defines two pseudo-platforms for ARM and Thumb-2 instruction set. */
+ #if !defined(WTF_PLATFORM_ARM_TRADITIONAL) && !defined(WTF_PLATFORM_ARM_THUMB2)
+ #  if defined(thumb2) || defined(__thumb2__)
+ #    define WTF_PLATFORM_ARM_TRADITIONAL 0
+ #    define WTF_PLATFORM_ARM_THUMB2 1
+ #  elif PLATFORM_ARM_ARCH(4)
+ #    define WTF_PLATFORM_ARM_TRADITIONAL 1
+ #    define WTF_PLATFORM_ARM_THUMB2 0
+ #  else
+ #    error "Not supported ARM architecture"
+ #  endif
+ #elif PLATFORM(ARM_TRADITIONAL) && PLATFORM(ARM_THUMB2) /* Sanity Check */
+ #  error "Cannot use both of WTF_PLATFORM_ARM_TRADITIONAL and WTF_PLATFORM_ARM_THUMB2 platforms"
+ #endif // !defined(ARM_TRADITIONAL) && !defined(ARM_THUMB2)
  #endif /* ARM */
- #define PLATFORM_ARM_ARCH(N) (PLATFORM(ARM) && ARM_ARCH_VERSION >= N)
  
  /* PLATFORM(X86) */
  #if   defined(__i386__) \
@@@ -276,20 -288,13 +288,20 @@@
  #define WTF_PLATFORM_X86_64 1
  #endif
  
 +/* PLATFORM(SPARC) */
 +#if   defined(__sparc__) \
 +   || defined(__sparc)
 +#define WTF_PLATFORM_SPARC 1
 +#define WTF_PLATFORM_BIG_ENDIAN 1
 +#endif
 +
  /* PLATFORM(SH4) */
  #if defined(__SH4__)
  #define WTF_PLATFORM_SH4 1
  #endif
  
  /* PLATFORM(SPARC64) */
- #if defined(__sparc64__)
+ #if defined(__sparc__) && defined(__arch64__) || defined (__sparcv9)
  #define WTF_PLATFORM_SPARC64 1
  #define WTF_PLATFORM_BIG_ENDIAN 1
  #endif
@@@ -308,16 -313,6 +320,16 @@@
  #   endif
  #endif
  
 +/* For undefined platforms */
 +#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
 +#include <sys/param.h>
 +#if __BYTE_ORDER == __BIG_ENDIAN
 +#define WTF_PLATFORM_BIG_ENDIAN 1
 +#elif  __BYTE_ORDER == __PDP_ENDIAN
 +#define WTF_PLATFORM_MIDDLE_ENDIAN 1
 +#endif
 +#endif
 +
  /* Compiler */
  
  /* COMPILER(MSVC) */
@@@ -430,7 -425,10 +442,10 @@@
  #if PLATFORM(IPHONE)
  #define WTF_PLATFORM_CF 1
  #define WTF_USE_PTHREADS 1
+ #define ENABLE_CONTEXT_MENUS 0
+ #define ENABLE_DRAG_SUPPORT 0
  #define ENABLE_FTPDIR 1
+ #define ENABLE_INSPECTOR 0
  #define ENABLE_MAC_JAVA_BRIDGE 0
  #define ENABLE_ICONDATABASE 0
  #define ENABLE_GEOLOCATION 1
@@@ -572,10 -570,22 +587,22 @@@
  #define ENABLE_FTPDIR 1
  #endif
  
+ #if !defined(ENABLE_CONTEXT_MENUS)
+ #define ENABLE_CONTEXT_MENUS 1
+ #endif
+ 
+ #if !defined(ENABLE_DRAG_SUPPORT)
+ #define ENABLE_DRAG_SUPPORT 1
+ #endif
+ 
  #if !defined(ENABLE_DASHBOARD_SUPPORT)
  #define ENABLE_DASHBOARD_SUPPORT 0
  #endif
  
+ #if !defined(ENABLE_INSPECTOR)
+ #define ENABLE_INSPECTOR 1
+ #endif
+ 
  #if !defined(ENABLE_MAC_JAVA_BRIDGE)
  #define ENABLE_MAC_JAVA_BRIDGE 0
  #endif
@@@ -616,10 -626,14 +643,14 @@@
  #endif
  
  #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
- #if PLATFORM(X86_64) && (PLATFORM(MAC) || PLATFORM(LINUX))
+ #if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
  #define WTF_USE_JSVALUE64 1
  #elif PLATFORM(ARM) || PLATFORM(PPC64)
  #define WTF_USE_JSVALUE32 1
+ #elif PLATFORM(WIN_OS) && COMPILER(MINGW)
+ /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg
+ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
+ #define WTF_USE_JSVALUE32 1
  #else
  #define WTF_USE_JSVALUE32_64 1
  #endif
@@@ -638,7 -652,7 +669,7 @@@
  #elif PLATFORM(X86) && PLATFORM(MAC)
      #define ENABLE_JIT 1
      #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
- #elif PLATFORM_ARM_ARCH(7) && PLATFORM(IPHONE)
+ #elif PLATFORM(ARM_THUMB2) && PLATFORM(IPHONE)
      /* Under development, temporarily disabled until 16Mb link range limit in assembler is fixed. */
      #define ENABLE_JIT 0
      #define ENABLE_JIT_OPTIMIZE_NATIVE_CALL 0
@@@ -657,8 -671,11 +688,11 @@@
  #elif PLATFORM(X86) && PLATFORM(LINUX) && GCC_VERSION >= 40100
      #define ENABLE_JIT 1
      #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
- #elif PLATFORM(ARM) && !PLATFORM_ARM_ARCH(7) && PLATFORM(LINUX)
+ #elif PLATFORM(ARM_TRADITIONAL) && PLATFORM(LINUX)
      #define ENABLE_JIT 1
+     #if PLATFORM(ARM_THUMB2)
+         #define ENABLE_JIT_OPTIMIZE_NATIVE_CALL 0
+     #endif
  #endif
  #endif /* PLATFORM(QT) */
  
@@@ -704,7 -721,7 +738,7 @@@
  #if (PLATFORM(X86) && PLATFORM(MAC)) \
   || (PLATFORM(X86_64) && PLATFORM(MAC)) \
   /* Under development, temporarily disabled until 16Mb link range limit in assembler is fixed. */ \
-  || (PLATFORM_ARM_ARCH(7) && PLATFORM(IPHONE) && 0) \
+  || (PLATFORM(ARM_THUMB2) && PLATFORM(IPHONE) && 0) \
   || (PLATFORM(X86) && PLATFORM(WIN))
  #define ENABLE_YARR 1
  #define ENABLE_YARR_JIT 1
@@@ -714,7 -731,7 +748,7 @@@
  #if (PLATFORM(X86) && PLATFORM(WIN_OS) && COMPILER(MINGW) && GCC_VERSION >= 40100) \
   || (PLATFORM(X86) && PLATFORM(WIN_OS) && COMPILER(MSVC)) \
   || (PLATFORM(X86) && PLATFORM(LINUX) && GCC_VERSION >= 40100) \
-  || (PLATFORM(ARM) && !PLATFORM_ARM_ARCH(7) && PLATFORM(LINUX))
+  || (PLATFORM(ARM_TRADITIONAL) && PLATFORM(LINUX))
  #define ENABLE_YARR 1
  #define ENABLE_YARR_JIT 1
  #endif
@@@ -742,10 -759,6 +776,6 @@@
  #define ENABLE_PAN_SCROLLING 1
  #endif
  
- #if !defined(ENABLE_ACTIVEX_TYPE_CONVERSION_WMPLAYER)
- #define ENABLE_ACTIVEX_TYPE_CONVERSION_WMPLAYER 1
- #endif
- 
  /* Use the QtXmlStreamReader implementation for XMLTokenizer */
  #if PLATFORM(QT)
  #if !ENABLE(XSLT)

-- 
WebKit Debian packaging

