summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-09-30 13:48:07 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2009-10-02 07:19:43 (GMT)
commitea6d4e94c802f648e296eec0bde1661728d82024 (patch)
tree4008d96c61c20f8ac376c294ad54f352916f1f79 /configure
parent7ea326d796a6d2ecb13b961c576c82a797d84706 (diff)
downloadQt-ea6d4e94c802f648e296eec0bde1661728d82024.zip
Qt-ea6d4e94c802f648e296eec0bde1661728d82024.tar.gz
Qt-ea6d4e94c802f648e296eec0bde1661728d82024.tar.bz2
Add configure flags to force turning on or off JavaScriptCore JIT
Also add configure test to see if arm toolchain can compile JavaScript JIT Task-number:QTBUG-4632 Reviewed-by:Simon Hausmann <simon.hausmann@nokia.com>, Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure37
1 files changed, 35 insertions, 2 deletions
diff --git a/configure b/configure
index e86d008..1430d78 100755
--- a/configure
+++ b/configure
@@ -673,6 +673,7 @@ CFG_PHONON_BACKEND=yes
CFG_MULTIMEDIA=yes
CFG_SVG=yes
CFG_WEBKIT=auto # (yes|no|auto)
+CFG_JAVASCRIPTCORE_JIT=auto
CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb"
CFG_GFX_ON="linuxfb multiscreen"
@@ -911,7 +912,7 @@ while [ "$#" -gt 0 ]; do
VAL=no
;;
#Qt style yes options
- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-svg|-webkit|-script|-scripttools|-rpath|-force-pkg-config)
+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-svg|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
@@ -1854,6 +1855,13 @@ while [ "$#" -gt 0 ]; do
fi
fi
;;
+ javascript-jit)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then
+ CFG_JAVASCRIPTCORE_JIT="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
confirm-license)
if [ "$VAL" = "yes" ]; then
OPT_CONFIRM_LICENSE="$VAL"
@@ -3225,7 +3233,7 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
[-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns]
[-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
[-no-openssl] [-openssl] [-openssl-linked]
- [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit]
+ [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit]
[-no-script] [-script] [-no-scripttools] [-scripttools]
[additional platform specific options (see below)]
@@ -3375,6 +3383,9 @@ fi
+ -webkit ............ Build the WebKit module.
WebKit is built if a decent C++ compiler is used.
+ -no-javascript-jit . Do not build the JavaScriptCore JIT compiler.
+ + -javascript-jit .... Build the JavaScriptCore JIT compiler.
+
-no-script ......... Do not build the QtScript module.
+ -script ............ Build the QtScript module.
@@ -5757,6 +5768,21 @@ if [ "$CFG_ALSA" = "auto" ]; then
fi
fi
+if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
+ if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
+ "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/javascriptcore-jit "javascriptcore-jit" $L_FLAGS $I_FLAGS $l_FLAGS
+ if [ $? != "0" ]; then
+ CFG_JAVASCRIPTCORE_JIT=no
+ fi
+ fi
+fi
+
+if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ]; then
+ QMakeVar set JAVASCRIPTCORE_JIT yes
+elif [ "$CFG_JAVASCRIPTCORE_JIT" = "no" ]; then
+ QMakeVar set JAVASCRIPTCORE_JIT no
+fi
+
#-------------------------------------------------------------------------------
# ask for all that hasn't been auto-detected or specified in the arguments
#-------------------------------------------------------------------------------
@@ -7268,6 +7294,13 @@ echo "Phonon module ....... $CFG_PHONON"
echo "Multimedia module ... $CFG_MULTIMEDIA"
echo "SVG module .......... $CFG_SVG"
echo "WebKit module ....... $CFG_WEBKIT"
+if [ "$CFG_WEBKIT" = "yes" ]; then
+ if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
+ echo "JavaScriptCore JIT .. To be decided by JavaScriptCore"
+ else
+ echo "JavaScriptCore JIT .. $CFG_JAVASCRIPTCORE_JIT"
+ fi
+fi
echo "STL support ......... $CFG_STL"
echo "PCH support ......... $CFG_PRECOMPILE"
echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"