diff -Nrup WebKit-r29292/configure WebKit-r29292-avr32/configure --- WebKit-r29292/configure 2008-01-08 13:12:02.000000000 -0500 +++ WebKit-r29292-avr32/configure 2008-01-08 13:10:07.000000000 -0500 @@ -937,6 +937,8 @@ ENABLE_COVERAGE_TRUE ENABLE_COVERAGE_FALSE SVG_FLAGS_TRUE SVG_FLAGS_FALSE +ENABLE_UCLIBC_TRUE +ENABLE_UCLIBC_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1570,6 +1572,7 @@ Optional Features: enable SVG use element support (experimental) default=no --enable-coverage enable code coverage support default=no + --enable-uclibc enable uClibc threading support default=no Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4473,7 +4476,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4476 "configure"' > conftest.$ac_ext + echo '#line 4479 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7216,11 +7219,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7219: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7222: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7223: \$? = $ac_status" >&5 + echo "$as_me:7226: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7506,11 +7509,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7509: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7512: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7513: \$? = $ac_status" >&5 + echo "$as_me:7516: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7610,11 +7613,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7613: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7616: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7617: \$? = $ac_status" >&5 + echo "$as_me:7620: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9961,7 +9964,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12487: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12488: \$? = $ac_status" >&5 + echo "$as_me:12491: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12585,11 +12588,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12588: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12591: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12592: \$? = $ac_status" >&5 + echo "$as_me:12595: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14149,11 +14152,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14152: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14155: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14156: \$? = $ac_status" >&5 + echo "$as_me:14159: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14253,11 +14256,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14256: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14259: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14260: \$? = $ac_status" >&5 + echo "$as_me:14263: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16442,11 +16445,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16445: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16448: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16449: \$? = $ac_status" >&5 + echo "$as_me:16452: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16732,11 +16735,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16735: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16738: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16739: \$? = $ac_status" >&5 + echo "$as_me:16742: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16836,11 +16839,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16839: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16842: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16843: \$? = $ac_status" >&5 + echo "$as_me:16846: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22841,6 +22844,19 @@ fi { echo "$as_me:$LINENO: result: $enable_coverage" >&5 echo "${ECHO_T}$enable_coverage" >&6; } +# check whether to enable uClibc support +{ echo "$as_me:$LINENO: checking whether to enable uClibc support" >&5 +echo $ECHO_N "checking whether to enable uClibc support... $ECHO_C" >&6; } +# Check whether --enable-coverage was given. +if test "${enable_coverage+set}" = set; then + enableval=$enable_coverage; +else + enable_uclibc="no" +fi + +{ echo "$as_me:$LINENO: result: $enable_uclibc" >&5 +echo "${ECHO_T}$enable_uclibc" >&6; } + # Add '-g' flag to gcc if it's debug build if test "$enable_debug" = "yes"; then CXXFLAGS="$CXXFLAGS -g" @@ -23236,6 +23252,11 @@ if test "$enable_coverage" = "yes"; then fi +# check for uClibc support +if test "$enable_uclibc" = "yes"; then + UCLIBC_CFLAGS="-D__UCLIBC__" +fi + # check for SVG features, enabling SVG if necessary if test "$enable_svg" = "no" && (\ test "$enable_svg_animation" = "yes" || \ @@ -23431,6 +23452,14 @@ else SVG_FLAGS_FALSE= fi + if test "$enable_uclibc" = "yes"; then + ENABLE_UCLIBC_TRUE= + ENABLE_UCLIBC_FALSE='#' +else + ENABLE_UCLIBC_TRUE='#' + ENABLE_UCLIBC_FALSE= +fi + ac_config_files="$ac_config_files GNUmakefile WebKit/gtk/WebKitGtk.pc:WebKit/gtk/WebKitGtk.pc.in" @@ -23720,6 +23749,13 @@ echo "$as_me: error: conditional \"SVG_F Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ENABLE_UCLIBC_TRUE}" && test -z "${ENABLE_UCLIBC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_UCLIBC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_UCLIBC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -24462,11 +24498,13 @@ ENABLE_COVERAGE_TRUE!$ENABLE_COVERAGE_TR ENABLE_COVERAGE_FALSE!$ENABLE_COVERAGE_FALSE$ac_delim SVG_FLAGS_TRUE!$SVG_FLAGS_TRUE$ac_delim SVG_FLAGS_FALSE!$SVG_FLAGS_FALSE$ac_delim +ENABLE_UCLIBC_TRUE!$ENABLE_UCLIBC_TRUE$ac_delim +ENABLE_UCLIBC_FALSE!$ENABLE_UCLIBC_FALSE$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -25082,4 +25120,5 @@ WebKit was configured with the following SVG use element support : $enable_svg_use_element XPATH support : $enable_xpath XSLT support : $enable_xslt + uClibc support : $enable_uclibc " diff -Nrup WebKit-r29292/configure.ac WebKit-r29292-avr32/configure.ac --- WebKit-r29292/configure.ac 2008-01-07 19:46:07.000000000 -0500 +++ WebKit-r29292-avr32/configure.ac 2008-01-08 13:08:16.000000000 -0500 @@ -273,6 +273,14 @@ AC_ARG_ENABLE(coverage, [],[enable_coverage="no"]) AC_MSG_RESULT([$enable_coverage]) +# check whether to enable uClibc support +AC_MSG_CHECKING([whether to enable uClibc support]) +AC_ARG_ENABLE(coverage, + AC_HELP_STRING([--enable-uclibc], + [enable uClibc threading support [default=no]]), + [],[enable_uclibc="no"]) +AC_MSG_RESULT([$enable_uclibc]) + # Add '-g' flag to gcc if it's debug build if test "$enable_debug" = "yes"; then CXXFLAGS="$CXXFLAGS -g" @@ -312,6 +320,11 @@ if test "$enable_coverage" = "yes"; then AC_SUBST([COVERAGE_LDFLAGS]) fi +# check for uClibc support +if test "$enable_uclibc" = "yes"; then + UCLIBC_CFLAGS="-D__UCLIBC__" +fi + # check for SVG features, enabling SVG if necessary if test "$enable_svg" = "no" && (\ test "$enable_svg_animation" = "yes" || \ @@ -352,6 +365,7 @@ AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[te AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"]) AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) +AM_CONDITIONAL([ENABLE_UCLIBC],[test "$enable_uclibc" = "yes"]) AC_CONFIG_FILES([ GNUmakefile @@ -378,4 +392,5 @@ WebKit was configured with the following SVG use element support : $enable_svg_use_element XPATH support : $enable_xpath XSLT support : $enable_xslt + uClibc support : $enable_uclibc " diff -Nrup WebKit-r29292/GNUmakefile.am WebKit-r29292-avr32/GNUmakefile.am --- WebKit-r29292/GNUmakefile.am 2008-01-04 00:40:20.000000000 -0500 +++ WebKit-r29292-avr32/GNUmakefile.am 2008-01-08 13:08:16.000000000 -0500 @@ -201,6 +201,11 @@ global_cppflags += \ -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS endif +if ENABLE_UCLIBC +global_cppflags += \ + -D__UCLIBC__ +endif + if ENABLE_VIDEO webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10 endif diff -Nrup WebKit-r29292/GNUmakefile.in WebKit-r29292-avr32/GNUmakefile.in --- WebKit-r29292/GNUmakefile.in 2008-01-08 13:12:01.000000000 -0500 +++ WebKit-r29292-avr32/GNUmakefile.in 2008-01-08 13:10:06.000000000 -0500 @@ -83,7 +83,10 @@ noinst_PROGRAMS = Programs/dftables$(EXE @ENABLE_COVERAGE_TRUE@ -DGCC_GENERATE_TEST_COVERAGE_FILES \ @ENABLE_COVERAGE_TRUE@ -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS -@ENABLE_VIDEO_TRUE@am__append_7 = -lgstinterfaces-0.10 -lgstvideo-0.10 +@ENABLE_UCLIBC_TRUE@am__append_7 = \ +@ENABLE_UCLIBC_TRUE@ -D__UCLIBC__ + +@ENABLE_VIDEO_TRUE@am__append_8 = -lgstinterfaces-0.10 -lgstvideo-0.10 DIST_COMMON = README $(am__configure_deps) \ $(libJavaScriptCore_la_HEADERS) $(libWebKitGtk_la_HEADERS) \ $(noinst_HEADERS) $(srcdir)/GNUmakefile.am \ @@ -96,11 +99,11 @@ DIST_COMMON = README $(am__configure_dep config.sub depcomp install-sh ltmain.sh missing # Debug build -@ENABLE_DEBUG_TRUE@am__append_8 = \ +@ENABLE_DEBUG_TRUE@am__append_9 = \ @ENABLE_DEBUG_TRUE@ DerivedSources/grammar.h \ @ENABLE_DEBUG_TRUE@ DerivedSources/grammar.cpp -@ENABLE_DEBUG_TRUE@am__append_9 = \ +@ENABLE_DEBUG_TRUE@am__append_10 = \ @ENABLE_DEBUG_TRUE@ JavaScriptCore/kjs/CommonIdentifiers.cpp \ @ENABLE_DEBUG_TRUE@ JavaScriptCore/kjs/DateMath.cpp \ @ENABLE_DEBUG_TRUE@ JavaScriptCore/kjs/ExecState.cpp \ @@ -143,19 +146,19 @@ DIST_COMMON = README $(am__configure_dep @ENABLE_DEBUG_TRUE@ JavaScriptCore/wtf/FastMalloc.cpp \ @ENABLE_DEBUG_TRUE@ JavaScriptCore/wtf/TCSystemAlloc.cpp -@ENABLE_DEBUG_FALSE@am__append_10 = \ +@ENABLE_DEBUG_FALSE@am__append_11 = \ @ENABLE_DEBUG_FALSE@ DerivedSources/grammar.h \ @ENABLE_DEBUG_FALSE@ DerivedSources/grammar.cpp -@ENABLE_DEBUG_FALSE@am__append_11 = \ +@ENABLE_DEBUG_FALSE@am__append_12 = \ @ENABLE_DEBUG_FALSE@ JavaScriptCore/kjs/AllInOneFile.cpp # ---- # Database Support # ---- -@ENABLE_DATABASE_TRUE@am__append_12 = ENABLE_DATABASE=1 -@ENABLE_DATABASE_TRUE@am__append_13 = \ +@ENABLE_DATABASE_TRUE@am__append_13 = ENABLE_DATABASE=1 +@ENABLE_DATABASE_TRUE@am__append_14 = \ @ENABLE_DATABASE_TRUE@ DerivedSources/JSDatabase.h \ @ENABLE_DATABASE_TRUE@ DerivedSources/JSSQLError.h \ @ENABLE_DATABASE_TRUE@ DerivedSources/JSSQLResultSet.h \ @@ -167,19 +170,19 @@ DIST_COMMON = README $(am__configure_dep @ENABLE_DATABASE_TRUE@ DerivedSources/JSSQLResultSetRowList.cpp \ @ENABLE_DATABASE_TRUE@ DerivedSources/JSSQLTransaction.cpp -@ENABLE_DATABASE_TRUE@am__append_14 = \ +@ENABLE_DATABASE_TRUE@am__append_15 = \ @ENABLE_DATABASE_TRUE@ WebCore/storage/Database.idl \ @ENABLE_DATABASE_TRUE@ WebCore/storage/SQLError.idl \ @ENABLE_DATABASE_TRUE@ WebCore/storage/SQLResultSet.idl \ @ENABLE_DATABASE_TRUE@ WebCore/storage/SQLResultSetRowList.idl \ @ENABLE_DATABASE_TRUE@ WebCore/storage/SQLTransaction.idl -@ENABLE_DATABASE_TRUE@am__append_15 = \ +@ENABLE_DATABASE_TRUE@am__append_16 = \ @ENABLE_DATABASE_TRUE@ -DENABLE_DATABASE=1 \ @ENABLE_DATABASE_TRUE@ -I $(top_srcdir)/WebCore/platform/sql \ @ENABLE_DATABASE_TRUE@ -I $(top_srcdir)/WebCore/storage -@ENABLE_DATABASE_TRUE@am__append_16 = \ +@ENABLE_DATABASE_TRUE@am__append_17 = \ @ENABLE_DATABASE_TRUE@ WebCore/platform/sql/SQLiteAuthorizer.cpp \ @ENABLE_DATABASE_TRUE@ WebCore/platform/sql/SQLiteDatabase.cpp \ @ENABLE_DATABASE_TRUE@ WebCore/platform/sql/SQLiteStatement.cpp \ @@ -207,23 +210,23 @@ DIST_COMMON = README $(am__configure_dep # ---- # Icon Database Support # ---- -@ENABLE_ICONDATABASE_TRUE@am__append_17 = -DENABLE_ICONDATABASE=1 -@ENABLE_ICONDATABASE_TRUE@am__append_18 = \ +@ENABLE_ICONDATABASE_TRUE@am__append_18 = -DENABLE_ICONDATABASE=1 +@ENABLE_ICONDATABASE_TRUE@am__append_19 = \ @ENABLE_ICONDATABASE_TRUE@ WebCore/loader/icon/IconDatabase.cpp \ @ENABLE_ICONDATABASE_TRUE@ WebCore/loader/icon/IconRecord.cpp \ @ENABLE_ICONDATABASE_TRUE@ WebCore/loader/icon/PageURLRecord.cpp -@ENABLE_ICONDATABASE_FALSE@am__append_19 = \ +@ENABLE_ICONDATABASE_FALSE@am__append_20 = \ @ENABLE_ICONDATABASE_FALSE@ WebCore/loader/icon/IconDatabaseNone.cpp # ---- # Video Support # ---- -@ENABLE_VIDEO_TRUE@am__append_20 = ENABLE_VIDEO=1 -@ENABLE_VIDEO_TRUE@am__append_21 = -DENABLE_VIDEO=1 -@ENABLE_DEBUG_TRUE@@ENABLE_VIDEO_TRUE@am__append_22 = -DGST_DISABLE_DEPRECATED -@ENABLE_VIDEO_TRUE@am__append_23 = \ +@ENABLE_VIDEO_TRUE@am__append_21 = ENABLE_VIDEO=1 +@ENABLE_VIDEO_TRUE@am__append_22 = -DENABLE_VIDEO=1 +@ENABLE_DEBUG_TRUE@@ENABLE_VIDEO_TRUE@am__append_23 = -DGST_DISABLE_DEPRECATED +@ENABLE_VIDEO_TRUE@am__append_24 = \ @ENABLE_VIDEO_TRUE@ DerivedSources/JSHTMLSourceElement.h \ @ENABLE_VIDEO_TRUE@ DerivedSources/JSHTMLAudioElement.h \ @ENABLE_VIDEO_TRUE@ DerivedSources/JSHTMLMediaElement.h \ @@ -239,7 +242,7 @@ DIST_COMMON = README $(am__configure_dep @ENABLE_VIDEO_TRUE@ DerivedSources/JSTimeRanges.cpp \ @ENABLE_VIDEO_TRUE@ DerivedSources/JSVoidCallback.cpp -@ENABLE_VIDEO_TRUE@am__append_24 = \ +@ENABLE_VIDEO_TRUE@am__append_25 = \ @ENABLE_VIDEO_TRUE@ WebCore/html/HTMLAudioElement.idl \ @ENABLE_VIDEO_TRUE@ WebCore/html/HTMLMediaElement.idl \ @ENABLE_VIDEO_TRUE@ WebCore/html/HTMLSourceElement.idl \ @@ -248,7 +251,7 @@ DIST_COMMON = README $(am__configure_dep @ENABLE_VIDEO_TRUE@ WebCore/html/TimeRanges.idl \ @ENABLE_VIDEO_TRUE@ WebCore/html/VoidCallback.idl -@ENABLE_VIDEO_TRUE@am__append_25 = \ +@ENABLE_VIDEO_TRUE@am__append_26 = \ @ENABLE_VIDEO_TRUE@ WebCore/html/HTMLAudioElement.cpp \ @ENABLE_VIDEO_TRUE@ WebCore/html/HTMLMediaElement.cpp \ @ENABLE_VIDEO_TRUE@ WebCore/html/HTMLSourceElement.cpp \ @@ -260,7 +263,7 @@ DIST_COMMON = README $(am__configure_dep @ENABLE_VIDEO_TRUE@ WebCore/rendering/RenderMedia.cpp \ @ENABLE_VIDEO_TRUE@ WebCore/bindings/js/JSHTMLAudioElementConstructor.cpp -@ENABLE_VIDEO_TRUE@am__append_26 = \ +@ENABLE_VIDEO_TRUE@am__append_27 = \ @ENABLE_VIDEO_TRUE@ WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \ @ENABLE_VIDEO_TRUE@ WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp @@ -268,9 +271,9 @@ DIST_COMMON = README $(am__configure_dep # ---- # XPath Support # ---- -@ENABLE_XPATH_TRUE@am__append_27 = ENABLE_XPATH=1 -@ENABLE_XPATH_TRUE@am__append_28 = -DENABLE_XPATH=1 -@ENABLE_XPATH_TRUE@am__append_29 = \ +@ENABLE_XPATH_TRUE@am__append_28 = ENABLE_XPATH=1 +@ENABLE_XPATH_TRUE@am__append_29 = -DENABLE_XPATH=1 +@ENABLE_XPATH_TRUE@am__append_30 = \ @ENABLE_XPATH_TRUE@ DerivedSources/XPathGrammar.h \ @ENABLE_XPATH_TRUE@ DerivedSources/XPathGrammar.cpp \ @ENABLE_XPATH_TRUE@ DerivedSources/JSXPathEvaluator.h \ @@ -284,14 +287,14 @@ DIST_COMMON = README $(am__configure_dep @ENABLE_XPATH_TRUE@ DerivedSources/JSXPathNSResolver.cpp \ @ENABLE_XPATH_TRUE@ DerivedSources/JSXPathResult.cpp -@ENABLE_XPATH_TRUE@am__append_30 = \ +@ENABLE_XPATH_TRUE@am__append_31 = \ @ENABLE_XPATH_TRUE@ WebCore/xml/XPathNSResolver.idl \ @ENABLE_XPATH_TRUE@ WebCore/xml/XPathException.idl \ @ENABLE_XPATH_TRUE@ WebCore/xml/XPathExpression.idl \ @ENABLE_XPATH_TRUE@ WebCore/xml/XPathResult.idl \ @ENABLE_XPATH_TRUE@ WebCore/xml/XPathEvaluator.idl -@ENABLE_XPATH_TRUE@am__append_31 = \ +@ENABLE_XPATH_TRUE@am__append_32 = \ @ENABLE_XPATH_TRUE@ WebCore/xml/NativeXPathNSResolver.cpp \ @ENABLE_XPATH_TRUE@ WebCore/xml/XPathEvaluator.cpp \ @ENABLE_XPATH_TRUE@ WebCore/xml/XPathExpression.cpp \ @@ -313,9 +316,9 @@ DIST_COMMON = README $(am__configure_dep # ---- # XSLT Support # ---- -@ENABLE_XSLT_TRUE@am__append_32 = ENABLE_XSLT=1 -@ENABLE_XSLT_TRUE@am__append_33 = -DENABLE_XSLT=1 -@ENABLE_XSLT_TRUE@am__append_34 = \ +@ENABLE_XSLT_TRUE@am__append_33 = ENABLE_XSLT=1 +@ENABLE_XSLT_TRUE@am__append_34 = -DENABLE_XSLT=1 +@ENABLE_XSLT_TRUE@am__append_35 = \ @ENABLE_XSLT_TRUE@ WebCore/xml/XSLImportRule.cpp \ @ENABLE_XSLT_TRUE@ WebCore/xml/XSLStyleSheet.cpp \ @ENABLE_XSLT_TRUE@ WebCore/xml/XSLTExtensions.cpp \ @@ -328,11 +331,11 @@ DIST_COMMON = README $(am__configure_dep # # FIXME: allow a more fine-grained inclusion/generation of sources per SVG feature # ---- -@ENABLE_SVG_TRUE@am__append_35 = ENABLE_SVG=1 -@ENABLE_SVG_TRUE@am__append_36 = \ +@ENABLE_SVG_TRUE@am__append_36 = ENABLE_SVG=1 +@ENABLE_SVG_TRUE@am__append_37 = \ @ENABLE_SVG_TRUE@ -I $(srcdir)/WebCore/svg/graphics/cairo -@ENABLE_SVG_TRUE@am__append_37 = \ +@ENABLE_SVG_TRUE@am__append_38 = \ @ENABLE_SVG_TRUE@ DerivedSources/XLinkNames.cpp \ @ENABLE_SVG_TRUE@ DerivedSources/SVGElementFactory.cpp \ @ENABLE_SVG_TRUE@ DerivedSources/SVGNames.cpp \ @@ -596,7 +599,7 @@ DIST_COMMON = README $(am__configure_dep @ENABLE_SVG_TRUE@ DerivedSources/JSSVGMarkerElement.cpp \ @ENABLE_SVG_TRUE@ DerivedSources/JSSVGZoomEvent.cpp -@ENABLE_SVG_TRUE@am__append_38 = \ +@ENABLE_SVG_TRUE@am__append_39 = \ @ENABLE_SVG_TRUE@ WebCore/svg/SVGZoomEvent.idl \ @ENABLE_SVG_TRUE@ WebCore/svg/SVGAElement.idl \ @ENABLE_SVG_TRUE@ WebCore/svg/SVGAngle.idl \ @@ -730,13 +733,13 @@ DIST_COMMON = README $(am__configure_dep @ENABLE_SVG_TRUE@ WebCore/svg/SVGUseElement.idl \ @ENABLE_SVG_TRUE@ WebCore/svg/SVGViewElement.idl -@ENABLE_SVG_TRUE@am__append_39 = \ +@ENABLE_SVG_TRUE@am__append_40 = \ @ENABLE_SVG_TRUE@ -DENABLE_SVG=1 \ @ENABLE_SVG_TRUE@ -I \$(top_srcdir)/WebCore/svg \ @ENABLE_SVG_TRUE@ -I \$(top_srcdir)/WebCore/svg/graphics \ @ENABLE_SVG_TRUE@ -I \$(top_srcdir)/WebCore/svg/graphics/filters -@ENABLE_SVG_TRUE@am__append_40 = \ +@ENABLE_SVG_TRUE@am__append_41 = \ @ENABLE_SVG_TRUE@ WebCore/bindings/js/JSSVGElementWrapperFactory.cpp \ @ENABLE_SVG_TRUE@ WebCore/bindings/js/JSSVGMatrixCustom.cpp \ @ENABLE_SVG_TRUE@ WebCore/bindings/js/JSSVGPathSegCustom.cpp \ @@ -932,7 +935,7 @@ DIST_COMMON = README $(am__configure_dep @ENABLE_SVG_TRUE@ WebCore/rendering/SVGRenderSupport.cpp \ @ENABLE_SVG_TRUE@ WebCore/rendering/SVGRootInlineBox.cpp -@ENABLE_SVG_TRUE@am__append_41 = \ +@ENABLE_SVG_TRUE@am__append_42 = \ @ENABLE_SVG_TRUE@ WebCore/svg/graphics/cairo/RenderPathCairo.cpp \ @ENABLE_SVG_TRUE@ WebCore/svg/graphics/cairo/SVGPaintServerCairo.cpp \ @ENABLE_SVG_TRUE@ WebCore/svg/graphics/cairo/SVGPaintServerGradientCairo.cpp \ @@ -943,11 +946,11 @@ DIST_COMMON = README $(am__configure_dep # SVG Features -@ENABLE_SVG_TRUE@@ENABLE_SVG_USE_TRUE@am__append_42 = ENABLE_SVG_USE=1 -@ENABLE_SVG_FONTS_TRUE@@ENABLE_SVG_TRUE@am__append_43 = ENABLE_SVG_FONTS=1 -@ENABLE_SVG_FILTERS_TRUE@@ENABLE_SVG_TRUE@am__append_44 = ENABLE_SVG_FILTERS=1 -@ENABLE_SVG_AS_IMAGE_TRUE@@ENABLE_SVG_TRUE@am__append_45 = ENABLE_SVG_AS_IMAGE=1 -@ENABLE_SVG_ANIMATION_TRUE@@ENABLE_SVG_TRUE@am__append_46 = ENABLE_SVG_ANIMATION=1 +@ENABLE_SVG_TRUE@@ENABLE_SVG_USE_TRUE@am__append_43 = ENABLE_SVG_USE=1 +@ENABLE_SVG_FONTS_TRUE@@ENABLE_SVG_TRUE@am__append_44 = ENABLE_SVG_FONTS=1 +@ENABLE_SVG_FILTERS_TRUE@@ENABLE_SVG_TRUE@am__append_45 = ENABLE_SVG_FILTERS=1 +@ENABLE_SVG_AS_IMAGE_TRUE@@ENABLE_SVG_TRUE@am__append_46 = ENABLE_SVG_AS_IMAGE=1 +@ENABLE_SVG_ANIMATION_TRUE@@ENABLE_SVG_TRUE@am__append_47 = ENABLE_SVG_ANIMATION=1 subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -3763,8 +3766,8 @@ IDL_BINDINGS := WebCore/css/Counter.idl WebCore/page/DOMWindow.idl WebCore/page/History.idl \ WebCore/page/Screen.idl WebCore/xml/DOMParser.idl \ WebCore/xml/XMLHttpRequestException.idl \ - WebCore/xml/XMLSerializer.idl $(am__append_14) \ - $(am__append_24) $(am__append_30) $(am__append_38) + WebCore/xml/XMLSerializer.idl $(am__append_15) \ + $(am__append_25) $(am__append_31) $(am__append_39) # Files that will be distributed EXTRA_DIST := @@ -3780,7 +3783,7 @@ global_cppflags := -I $(srcdir)/JavaScri -I $(top_builddir)/DerivedSources -DBUILDING_GTK__=1 \ -DUSE_SYSTEM_MALLOC -DWTF_CHANGES $(am__append_1) \ $(am__append_2) $(am__append_4) $(am__append_5) \ - $(am__append_6) + $(am__append_6) $(am__append_7) # Default compiler flags global_cflags := \ @@ -3838,9 +3841,9 @@ javascriptcore_sources := JavaScriptCore JavaScriptCore/pcre/pcre_xclass.cpp \ JavaScriptCore/wtf/Assertions.cpp \ JavaScriptCore/wtf/HashTable.cpp \ - JavaScriptCore/wtf/unicode/UTF8.cpp $(am__append_9) \ - $(am__append_11) -javascriptcore_built_sources := $(am__append_8) + JavaScriptCore/wtf/unicode/UTF8.cpp $(am__append_10) \ + $(am__append_12) +javascriptcore_built_sources := $(am__append_9) javascriptcore_built_nosources := \ JavaScriptCore/kjs/array_object.lut.h \ JavaScriptCore/kjs/date_object.lut.h \ @@ -3849,7 +3852,7 @@ javascriptcore_built_nosources := \ JavaScriptCore/kjs/regexp_object.lut.h \ JavaScriptCore/kjs/string_object.lut.h \ JavaScriptCore/pcre/chartables.c DerivedSources/lexer.lut.h \ - $(am__append_10) + $(am__append_11) # The variables above are already included below so no need to touch # these variables unless you really have to @@ -3885,9 +3888,9 @@ webcore_cppflags := -I $(srcdir)/WebCore $(srcdir)/WebCore/platform/image-decoders/png -I \ $(srcdir)/WebCore/platform/image-decoders/xbm -I \ $(srcdir)/WebCore/rendering -I \ - $(top_builddir)/WebCore/bindings/js $(am__append_15) \ - $(am__append_17) $(am__append_21) $(am__append_22) \ - $(am__append_28) $(am__append_33) $(am__append_39) + $(top_builddir)/WebCore/bindings/js $(am__append_16) \ + $(am__append_18) $(am__append_22) $(am__append_23) \ + $(am__append_29) $(am__append_34) $(am__append_40) webcore_sources := WebCore/bindings/js/GCController.cpp \ WebCore/bindings/js/JSAttrCustom.cpp \ WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp \ @@ -4274,9 +4277,9 @@ webcore_sources := WebCore/bindings/js/G WebCore/rendering/RenderWordBreak.cpp \ WebCore/rendering/RootInlineBox.cpp WebCore/xml/DOMParser.cpp \ WebCore/xml/XMLHttpRequest.cpp WebCore/xml/XMLSerializer.cpp \ - $(am__append_16) $(am__append_18) $(am__append_19) \ - $(am__append_25) $(am__append_31) $(am__append_34) \ - $(am__append_40) + $(am__append_17) $(am__append_19) $(am__append_20) \ + $(am__append_26) $(am__append_32) $(am__append_35) \ + $(am__append_41) webcore_headers := WebCore/loader/icon/IconDatabase.h webcore_built_sources := DerivedSources/CSSPropertyNames.h \ DerivedSources/CSSValueKeywords.h DerivedSources/HTMLNames.h \ @@ -4493,8 +4496,8 @@ webcore_built_sources := DerivedSources/ DerivedSources/JSTextEvent.cpp DerivedSources/JSTreeWalker.cpp \ DerivedSources/JSUIEvent.cpp DerivedSources/JSWheelEvent.cpp \ DerivedSources/JSXMLHttpRequestException.cpp \ - DerivedSources/JSXMLSerializer.cpp $(am__append_13) \ - $(am__append_23) $(am__append_29) $(am__append_37) + DerivedSources/JSXMLSerializer.cpp $(am__append_14) \ + $(am__append_24) $(am__append_30) $(am__append_38) webcore_built_nosources := DerivedSources/DocTypeStrings.cpp \ DerivedSources/tokenizer.cpp DerivedSources/ColorData.c \ WebCore/bindings/js/JSEventTargetBase.lut.h \ @@ -4607,7 +4610,7 @@ webkitgtk_sources := WebKit/gtk/WebView/ WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp \ WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp \ WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp \ - $(am__append_26) $(am__append_41) + $(am__append_27) $(am__append_42) # # WEBKIT GTK+ @@ -4619,8 +4622,8 @@ webkitgtk_cppflags := $(am__append_3) -I $(srcdir)/WebCore/platform/network/curl -I \ $(srcdir)/WebCore/loader/gtk -I $(srcdir)/WebCore/page/gtk -I \ $(srcdir)/WebKit/gtk/WebCoreSupport -I \ - $(srcdir)/WebKit/gtk/WebView $(am__append_36) -webkitgtk_ldflags := $(am__append_7) + $(srcdir)/WebKit/gtk/WebView $(am__append_37) +webkitgtk_ldflags := $(am__append_8) webkitgtk_built_sources := WebKit/gtk/WebView/webkit-marshal.h \ WebKit/gtk/WebView/webkit-marshal.cpp webkitgtk_built_nosources := @@ -4741,11 +4744,11 @@ Programs_testkjs_CXXFLAGS = $(ICU_CFLAGS Programs_testkjs_LDADD = $(ICU_LIBS) libJavaScriptCore.la Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs WebCore := $(srcdir)/WebCore -FEATURE_DEFINES_JAVASCRIPT := LANGUAGE_JAVASCRIPT=1 $(am__append_12) \ - $(am__append_20) $(am__append_27) $(am__append_32) \ - $(am__append_35) -SVG_FEATURES := $(am__append_42) $(am__append_43) $(am__append_44) \ - $(am__append_45) $(am__append_46) +FEATURE_DEFINES_JAVASCRIPT := LANGUAGE_JAVASCRIPT=1 $(am__append_13) \ + $(am__append_21) $(am__append_28) $(am__append_33) \ + $(am__append_36) +SVG_FEATURES := $(am__append_43) $(am__append_44) $(am__append_45) \ + $(am__append_46) $(am__append_47) # user agent style sheets USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/svg.css @@ -21063,7 +21066,7 @@ DerivedSources/lexer.lut.h: $(CREATE_HAS $^ -i > $@ JavaScriptCore/pcre/chartables.c: $(top_builddir)/Programs/dftables$(EXEEXT) - ./Programs/dftables $@ + ./Host-DFTABLES/dftables $@ # XPath grammar diff -Nrup WebKit-r29292/JavaScriptCore/GNUmakefile.am WebKit-r29292-avr32/JavaScriptCore/GNUmakefile.am --- WebKit-r29292/JavaScriptCore/GNUmakefile.am 2008-01-08 05:30:40.000000000 -0500 +++ WebKit-r29292-avr32/JavaScriptCore/GNUmakefile.am 2008-01-08 13:08:16.000000000 -0500 @@ -135,7 +135,7 @@ DerivedSources/lexer.lut.h: $(CREATE_HAS $^ -i > $@ JavaScriptCore/pcre/chartables.c: $(top_builddir)/Programs/dftables$(EXEEXT) - ./Programs/dftables $@ + ./Host-DFTABLES/dftables $@ noinst_PROGRAMS += \ Programs/dftables \ diff -Nrup WebKit-r29292/JavaScriptCore/kjs/collector.cpp WebKit-r29292-avr32/JavaScriptCore/kjs/collector.cpp --- WebKit-r29292/JavaScriptCore/kjs/collector.cpp 2008-01-07 19:45:58.000000000 -0500 +++ WebKit-r29292-avr32/JavaScriptCore/kjs/collector.cpp 2008-01-08 13:08:16.000000000 -0500 @@ -69,6 +69,97 @@ #define DEBUG_COLLECTOR 0 +#ifdef __UCLIBC__ +extern "C" { +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern int *__libc_stack_end; +void* pthread_getattr_np(pthread_t thread, pthread_attr_t *attr); + +void* pthread_getattr_np(pthread_t thread, pthread_attr_t *attr) +{ + static void *stackBase = 0; + static size_t stackSize = 0; + int ret = 0; + /* Stack size limit. */ + struct rlimit rl; + + /* The safest way to get the top of the stack is to read + /proc/self/maps and locate the line into which + __libc_stack_end falls. */ + FILE *fp = fopen("/proc/self/maps", "rc"); + if (fp == NULL) + ret = errno; + /* We need the limit of the stack in any case. */ + else if (getrlimit (RLIMIT_STACK, &rl) != 0) + ret = errno; + else { + /* We need no locking. */ + __fsetlocking (fp, FSETLOCKING_BYCALLER); + + /* Until we found an entry (which should always be the case) + mark the result as a failure. */ + ret = ENOENT; + + char *line = NULL; + size_t linelen = 0; + uintptr_t last_to = 0; + + while (! feof_unlocked (fp)) { + if (getdelim (&line, &linelen, '\n', fp) <= 0) + break; + + uintptr_t from; + uintptr_t to; + if (sscanf (line, "%x-%x", &from, &to) != 2) + continue; + if (from <= (uintptr_t) __libc_stack_end + && (uintptr_t) __libc_stack_end < to) { + /* Found the entry. Now we have the info we need. */ + attr->__stacksize = rl.rlim_cur; +#ifdef _STACK_GROWS_UP + /* Don't check to enforce a limit on the __stacksize */ + attr->__stackaddr = (void *) from; +#else + attr->__stackaddr = (void *) to; + + /* The limit might be too high. */ + if ((size_t) attr->__stacksize > (size_t) attr->__stackaddr - last_to) + attr->__stacksize = (size_t) attr->__stackaddr - last_to; +#endif + + /* We succeed and no need to look further. */ + ret = 0; + break; + } + last_to = to; + } + + fclose (fp); + free (line); + } +#ifndef _STACK_GROWS_UP + stackBase = (char *) attr->__stackaddr - attr->__stacksize; +#else + stackBase = attr->__stackaddr; +#endif + stackSize = attr->__stacksize; + return (void*)(size_t(stackBase) + stackSize); +} + +}; +#endif //__UCLIBC__ + using std::max; namespace KJS { @@ -344,15 +435,22 @@ static inline void* currentThreadStackBa #if HAVE(PTHREAD_NP_H) // e.g. on FreeBSD 5.4, neundorf@kde.org pthread_attr_get_np(thread, &sattr); +#elif __UCLIBC__ + void* stack = pthread_getattr_np(thread, &sattr); + pthread_attr_destroy(&sattr); + stackThread = thread; + return stack; #else // FIXME: this function is non-portable; other POSIX systems may have different np alternatives pthread_getattr_np(thread, &sattr); #endif +#ifndef __UCLIBC__ int rc = pthread_attr_getstack(&sattr, &stackBase, &stackSize); (void)rc; // FIXME: deal with error code somehow? seems fatal... ASSERT(stackBase); pthread_attr_destroy(&sattr); stackThread = thread; +#endif //__UCLIBC__ } return (void*)(size_t(stackBase) + stackSize); #else diff -Nrup WebKit-r29292/JavaScriptCore/wtf/MathExtras.h WebKit-r29292-avr32/JavaScriptCore/wtf/MathExtras.h --- WebKit-r29292/JavaScriptCore/wtf/MathExtras.h 2007-12-21 23:34:41.000000000 -0500 +++ WebKit-r29292-avr32/JavaScriptCore/wtf/MathExtras.h 2008-01-08 13:08:16.000000000 -0500 @@ -57,6 +57,10 @@ const double piOverFourDouble = M_PI_4; const float piOverFourFloat = static_cast(M_PI_4); #endif +#ifdef __UCLIBC__ +inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); } +#endif + #if COMPILER(MSVC) inline bool isinf(double num) { return !_finite(num) && !_isnan(num); }