[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.6-2-515-g1db0d2f

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 372017ea6bf5fd8cd218b9b3e50baabb7d9d84d3
Merge: 12c4fa1b79a7fe169c44cc11afa832dd16d0fec6 b1936d639d6c8ca1ef3206545a99f55ee46d25f5
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Fri May 15 11:47:12 2009 -0300

    Merge branch 'webkit-1.1' into debian/unstable
    
    Conflicts:
    	JavaScriptCore/assembler/MacroAssemblerX86_64.h
    	JavaScriptCore/jit/JITArithmetic.cpp

diff --combined JavaScriptCore/wtf/FastMalloc.cpp
index c8c3427,3869098..ce316f4
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@@ -533,7 -533,7 +533,7 @@@ static const size_t kNumClasses = 68
  static const size_t kPageMapBigAllocationThreshold = 128 << 20;
  
  // Minimum number of pages to fetch from system at a time.  Must be
- // significantly bigger than kBlockSize to amortize system-call
+ // significantly bigger than kPageSize to amortize system-call
  // overhead, and also to reduce external fragementation.  Also, we
  // should keep this value big because various incarnations of Linux
  // have small limits on the number of mmap() regions per
@@@ -2083,13 -2083,13 +2083,13 @@@ static TCMalloc_Central_FreeListPadded 
  
  // Page-level allocator
  static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
 -static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
 +static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
  static bool phinited = false;
  
  // Avoid extra level of indirection by making "pageheap" be just an alias
  // of pageheap_memory.
  typedef union {
 -    void* m_memory;
 +    uint64_t* m_memory;
      TCMalloc_PageHeap* m_pageHeap;
  } PageHeapUnion;
  
diff --combined JavaScriptCore/wtf/Platform.h
index c443d5a,605d7c9..2975e6a
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@@ -63,6 -63,13 +63,13 @@@
  #define WTF_PLATFORM_WIN_CE 1
  #endif
  
+ /* PLATFORM(LINUX) */
+ /* Operating system level dependencies for Linux-like systems that */
+ /* should be used regardless of operating environment */
+ #ifdef __linux__
+ #define WTF_PLATFORM_LINUX 1
+ #endif
+ 
  /* PLATFORM(FREEBSD) */
  /* Operating system level dependencies for FreeBSD-like systems that */
  /* should be used regardless of operating environment */
@@@ -217,13 -224,6 +224,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
@@@ -249,16 -249,6 +256,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) */
@@@ -456,16 -446,15 +463,15 @@@
  #define ENABLE_OPCODE_STATS 0
  #endif
  
- #if !defined(ENABLE_CODEBLOCK_SAMPLING)
+ #define ENABLE_SAMPLING_COUNTERS 0
+ #define ENABLE_SAMPLING_FLAGS 0
+ #define ENABLE_OPCODE_SAMPLING 0
  #define ENABLE_CODEBLOCK_SAMPLING 0
+ #if ENABLE(CODEBLOCK_SAMPLING) && !ENABLE(OPCODE_SAMPLING)
+ #error "CODEBLOCK_SAMPLING requires OPCODE_SAMPLING"
  #endif
- 
- #if ENABLE(CODEBLOCK_SAMPLING) && !defined(ENABLE_OPCODE_SAMPLING)
- #define ENABLE_OPCODE_SAMPLING 1
- #endif
- 
- #if !defined(ENABLE_OPCODE_SAMPLING)
- #define ENABLE_OPCODE_SAMPLING 0
+ #if ENABLE(OPCODE_SAMPLING) || ENABLE(SAMPLING_FLAGS)
+ #define ENABLE_SAMPLING_THREAD 1
  #endif
  
  #if !defined(ENABLE_GEOLOCATION)
@@@ -517,6 -506,20 +523,20 @@@
  #endif
  #endif
  
+ #if PLATFORM(X86_64)
+     #define JSC_HOST_CALL
+ #elif COMPILER(MSVC)
+     #define JSC_HOST_CALL __fastcall
+ #elif COMPILER(GCC) && PLATFORM(X86)
+     #define JSC_HOST_CALL __attribute__ ((fastcall))
+ #else
+     #if ENABLE(JIT)
+     #error Need to support register calling convention in this compiler
+     #else
+     #define JSC_HOST_CALL
+     #endif
+ #endif
+ 
  /* Yet Another Regex Runtime. */
  /* YARR supports x86 & x86-64, and has been tested on Mac and Windows. */
  #if (!defined(ENABLE_YARR_JIT) && PLATFORM(X86) && PLATFORM(MAC)) \

-- 
WebKit Debian packaging