[haiku-webkit-commits] r421 - in webkit/trunk: . JavaScriptCore JavaScriptCore/wtf WebCore WebKit WebKitTools/DumpRenderTree WebKitTools/haiku
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Fri, 16 Apr 2010 16:08:29 +0000
Author: stippi
Date: Fri Apr 16 16:08:29 2010
New Revision: 421
URL: http://mmlr.dyndns.org/changeset/421
Log:
* Moved pretty much all #defines into the Haiku section of wtf/Platform.h.
* Switched to the ENABLE_YARR_JIT code.
A completely clean build (Remove everything from JavaScriptCore/DerivedSources
and WebCore/DerivedSources and all objects) seems to finally work correctly
with Facebook. Thus the problem seems to have been either incompatible defines
again resulting in differently sized objects, or the non YARR_JIT code is
simply broken.
Modified:
webkit/trunk/Jamfile
webkit/trunk/JavaScriptCore/Jamfile
webkit/trunk/JavaScriptCore/wtf/Platform.h
webkit/trunk/WebCore/Jamfile
webkit/trunk/WebKit/Jamfile
webkit/trunk/WebKitTools/DumpRenderTree/Jamfile
webkit/trunk/WebKitTools/haiku/make-generated-sources.sh
Modified: webkit/trunk/Jamfile
==============================================================================
--- webkit/trunk/Jamfile Fri Apr 16 16:05:38 2010 (r420)
+++ webkit/trunk/Jamfile Fri Apr 16 16:08:29 2010 (r421)
@@ -1,6 +1,6 @@
SubDir TOP ;
-local defines = [ FDefines BUILDING_HAIKU__=1 USE_SYSTEM_MALLOC=1
ENABLE_XSLT=0 ] ;
+local defines = [ FDefines BUILDING_HAIKU__=1 ] ;
SubDirC++Flags $(defines) ;
SubDirCcFlags $(defines) ;
Modified: webkit/trunk/JavaScriptCore/Jamfile
==============================================================================
--- webkit/trunk/JavaScriptCore/Jamfile Fri Apr 16 16:05:38 2010 (r420)
+++ webkit/trunk/JavaScriptCore/Jamfile Fri Apr 16 16:08:29 2010 (r421)
@@ -1,20 +1,6 @@
SubDir TOP JavaScriptCore ;
-local defines = [ FDefines
- BUILDING_HAIKU__=1
- ENABLE_DATABASE=1
- ENABLE_JAVASCRIPT_DEBUGGER=1
- ENABLE_DOM_STORAGE=1
- ENABLE_YARR=1
- WTF_USE_PTHREADS=1
- HAVE_POSIX_MEMALIGN=1
- HAVE_SYS_TIME_H=1
- ENABLE_SVG=1
- ENABLE_SVG_ANIMATION=1
- ENABLE_SVG_FONTS=1
- ENABLE_SVG_FOREIGN_OBJECT=1
- ENABLE_SVG_USE=1
-] ;
+local defines = [ FDefines BUILDING_HAIKU__=1 ] ;
# To turn off debugging symbols export NDEBUG=1 in the environment
SubDirC++Flags $(defines) ;
Modified: webkit/trunk/JavaScriptCore/wtf/Platform.h
==============================================================================
--- webkit/trunk/JavaScriptCore/wtf/Platform.h Fri Apr 16 16:05:38 2010
(r420)
+++ webkit/trunk/JavaScriptCore/wtf/Platform.h Fri Apr 16 16:08:29 2010
(r421)
@@ -620,14 +620,25 @@
#endif
#if PLATFORM(HAIKU)
-#define HAVE_POSIX_MEMALIGN 1
#define WTF_USE_CURL 1
#define WTF_USE_PTHREADS 1
+#define HAVE_POSIX_MEMALIGN 1
#define HAVE_PTHREAD_RWLOCK 1
+#define HAVE_SYS_TIME_H 1
#define USE_SYSTEM_MALLOC 1
#define ENABLE_NETSCAPE_PLUGIN_API 0
#define ENABLE_ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL 1
//#define ENABLE_FAST_MALLOC_MATCH_VALIDATION 1
+#define ENABLE_DATABASE 1
+#define ENABLE_JAVASCRIPT_DEBUGGER 1
+#define ENABLE_DOM_STORAGE 1
+#define ENABLE_YARR 1
+#define ENABLE_YARR_JIT 1
+#define ENABLE_SVG 1
+#define ENABLE_SVG_ANIMATION 1
+#define ENABLE_SVG_FONTS 1
+#define ENABLE_SVG_FOREIGN_OBJECT 1
+#define ENABLE_SVG_USE 1
#endif
#if PLATFORM(BREWMP)
Modified: webkit/trunk/WebCore/Jamfile
==============================================================================
--- webkit/trunk/WebCore/Jamfile Fri Apr 16 16:05:38 2010 (r420)
+++ webkit/trunk/WebCore/Jamfile Fri Apr 16 16:08:29 2010 (r421)
@@ -1,20 +1,6 @@
SubDir TOP WebCore ;
-local defines = [ FDefines
- BUILDING_HAIKU__=1
- ENABLE_DATABASE=1
- ENABLE_JAVASCRIPT_DEBUGGER=1
- ENABLE_DOM_STORAGE=1
- ENABLE_YARR=1
- WTF_USE_PTHREADS=1
- HAVE_POSIX_MEMALIGN=1
- HAVE_SYS_TIME_H=1
- ENABLE_SVG=1
- ENABLE_SVG_ANIMATION=1
- ENABLE_SVG_FONTS=1
- ENABLE_SVG_FOREIGN_OBJECT=1
- ENABLE_SVG_USE=1
-] ;
+local defines = [ FDefines BUILDING_HAIKU__=1 ] ;
# To turn off debugging symbols export NDEBUG=1 in the environment
SubDirC++Flags $(defines) ;
Modified: webkit/trunk/WebKit/Jamfile
==============================================================================
--- webkit/trunk/WebKit/Jamfile Fri Apr 16 16:05:38 2010 (r420)
+++ webkit/trunk/WebKit/Jamfile Fri Apr 16 16:08:29 2010 (r421)
@@ -1,20 +1,6 @@
SubDir TOP WebKit ;
-local defines = [ FDefines
- BUILDING_HAIKU__=1
- ENABLE_DATABASE=1
- ENABLE_JAVASCRIPT_DEBUGGER=1
- ENABLE_DOM_STORAGE=1
- ENABLE_YARR=1
- WTF_USE_PTHREADS=1
- HAVE_POSIX_MEMALIGN=1
- HAVE_SYS_TIME_H=1
- ENABLE_SVG=1
- ENABLE_SVG_ANIMATION=1
- ENABLE_SVG_FONTS=1
- ENABLE_SVG_FOREIGN_OBJECT=1
- ENABLE_SVG_USE=1
-] ;
+local defines = [ FDefines BUILDING_HAIKU__=1 ] ;
# To turn off debugging symbols export NDEBUG=1 in the environment
SubDirC++Flags $(defines) ;
Modified: webkit/trunk/WebKitTools/DumpRenderTree/Jamfile
==============================================================================
--- webkit/trunk/WebKitTools/DumpRenderTree/Jamfile Fri Apr 16 16:05:38
2010 (r420)
+++ webkit/trunk/WebKitTools/DumpRenderTree/Jamfile Fri Apr 16 16:08:29
2010 (r421)
@@ -1,6 +1,6 @@
SubDir TOP WebKitTools DumpRenderTree ;
-local defines = [ FDefines BUILDING_HAIKU__=1 USE_SYSTEM_MALLOC=1
HAVE_POSIX_MEMALIGN=1 HAVE_SYS_TIME_H=1 ENABLE_DOM_STORAGE=1 WTF_USE_JSC=1 ] ;
+local defines = [ FDefines BUILDING_HAIKU__=1 ] ;
# To turn on debugging symbols just add -ggdb to each of these
SubDirC++Flags $(defines) ;
Modified: webkit/trunk/WebKitTools/haiku/make-generated-sources.sh
==============================================================================
--- webkit/trunk/WebKitTools/haiku/make-generated-sources.sh Fri Apr 16
16:05:38 2010 (r420)
+++ webkit/trunk/WebKitTools/haiku/make-generated-sources.sh Fri Apr 16
16:08:29 2010 (r421)
@@ -42,7 +42,7 @@
WK_ROOT=$scriptDir/../..
WK_ROOTDIR="$WK_ROOT"
-DEFINES="ENABLE_DATABASE ENABLE_JAVASCRIPT_DEBUGGER ENABLE_DOM_STORAGE
ENABLE_YARR \
+DEFINES="ENABLE_DATABASE ENABLE_JAVASCRIPT_DEBUGGER ENABLE_DOM_STORAGE
ENABLE_YARR ENABLE_YARR_JIT \
WTF_USE_PTHREADS HAVE_POSIX_MEMALIGN HAVE_SYS_TIME_H \
ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT
ENABLE_SVG_USE"
Other related posts:
- » [haiku-webkit-commits] r421 - in webkit/trunk: . JavaScriptCore JavaScriptCore/wtf WebCore WebKit WebKitTools/DumpRenderTree WebKitTools/haiku - webkit
