[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15.1-1-39-gad8f3c7

Gustavo Noronha Silva kov at debian.org
Thu Oct 29 20:30:48 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit f2d453823a0b2e3d08c5107ba0c3b1a02d7c5984
Merge: 17525ee507fe04b186468a90e6d32bb85653b090 43a6bb2a49e5d7d7040895198b1f17c4f61510b4
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Tue Oct 6 21:02:48 2009 +0100

    Merge branch 'webkit-1.1' into debian/unstable

diff --combined JavaScriptCore/wtf/Platform.h
index 76f11c8,09dde24..598ed64
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@@ -257,6 -257,10 +257,10 @@@
  #undef ARM_ARCH_VERSION
  #define ARM_ARCH_VERSION 7
  #endif
+ /* On ARMv5 and below the natural alignment is required. */
+ #if !defined(ARM_REQUIRE_NATURAL_ALIGNMENT) && ARM_ARCH_VERSION <= 5
+ #define ARM_REQUIRE_NATURAL_ALIGNMENT 1
+ #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__)
@@@ -288,13 -292,6 +292,13 @@@
  #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
@@@ -320,16 -317,6 +324,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) */

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list