<html>
<body>
<div id="body" style="background-color:#ffffff;" >
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head" style="border-bottom-width:1px;border-bottom-style:solid;" ><td class="headtd" style="padding:0;padding-top:.2em;" colspan="4">Commit in <b><tt>lxdream</tt></b></td></tr>
<tr><td><tt><a href="#file1">Makefile.am</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+4</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-4</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">1ca50e1330cd -> d63f73cc586f</td></tr>
<tr class="alt" style=";" ><td><tt><a href="#file2">Makefile.in</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+5</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-4</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">1ca50e1330cd -> d63f73cc586f</td></tr>
<tr><td><tt><a href="#file3">configure</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+29</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-11</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">1ca50e1330cd -> d63f73cc586f</td></tr>
<tr class="alt" style=";" ><td><tt>m4/<a href="#file4">android.m4</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+17</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-7</td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">1ca50e1330cd -> d63f73cc586f</td></tr>
<tr><td><tt>src/<a href="#file5">Makefile.in</a></tt></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+1</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">1ca50e1330cd -> d63f73cc586f</td></tr>
<tr class="alt" style=";" ><td><tt>src/tools/<a href="#file6">Makefile.in</a></tt></td><td id="addedalt" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ccf7cc;" align="right">+1</td><td></td><td class="headtd2" style="padding-left:.3em;padding-right:.3em;" nowrap="nowrap">1ca50e1330cd -> d63f73cc586f</td></tr>
<tr><td></td><td id="added" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ddffdd;" align="right">+57</td><td id="removed" class="headtd2" style="padding-left:.3em;padding-right:.3em; background-color:#ffdddd;" align="right">-26</td><td></td></tr>
</table>
<small id="info" style="color: #888888;" >6 modified files</small><br />
<pre class="comment" style="white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd;" >
Add support for armv7-a abi and make it the default - it's a good bit faster
</pre>
<hr /><a name="file1" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.am</b></big> <small id="info" style="color: #888888;" >1ca50e1330cd -> d63f73cc586f</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/Makefile.am
+++ lxdream/Makefile.am
@@ -106,10 +106,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
-Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
-Dtarget=$(ANDROID_SDK_VERSION) clean )
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- $(mkdir_p) android/libs/armeabi
- $(INSTALL) src/liblxdream.so android/libs/armeabi/liblxdream.so
- $(INSTALL) $(ANDROID_GDBSERVER) android/libs/armeabi/gdbserver
- $(STRIP) --strip-unneeded android/libs/armeabi/liblxdream.so
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ $(mkdir_p) android/libs/$(ANDROID_ABI)
+ $(INSTALL) src/liblxdream.so android/libs/$(ANDROID_ABI)/liblxdream.so
+ $(INSTALL) $(ANDROID_GDBSERVER) android/libs/$(ANDROID_ABI)/gdbserver
+ $(STRIP) --strip-unneeded android/libs/$(ANDROID_ABI)/liblxdream.so
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > (TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
$(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
-Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
</pre></div>
<hr /><a name="file2" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.in</b></big> <small id="info" style="color: #888888;" >1ca50e1330cd -> d63f73cc586f</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/Makefile.in
+++ lxdream/Makefile.in
@@ -94,6 +94,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANDROID_ABI = @ANDROID_ABI@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_GDBSERVER = @ANDROID_GDBSERVER@
ANDROID_NDK_HOME = @ANDROID_NDK_HOME@
ANDROID_NDK_VERSION = @ANDROID_NDK_VERSION@
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -896,10 +897,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_ANDROID_TRUE@ -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
@GUI_ANDROID_TRUE@ -Dnative.libs.absolute.dir="$$TARGETDIR/libs" \
@GUI_ANDROID_TRUE@ -Dtarget=$(ANDROID_SDK_VERSION) clean )
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-@GUI_ANDROID_TRUE@ $(mkdir_p) android/libs/armeabi
-@GUI_ANDROID_TRUE@ $(INSTALL) src/liblxdream.so android/libs/armeabi/liblxdream.so
-@GUI_ANDROID_TRUE@ $(INSTALL) $(ANDROID_GDBSERVER) android/libs/armeabi/gdbserver
-@GUI_ANDROID_TRUE@ $(STRIP) --strip-unneeded android/libs/armeabi/liblxdream.so
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+@GUI_ANDROID_TRUE@ $(mkdir_p) android/libs/$(ANDROID_ABI)
+@GUI_ANDROID_TRUE@ $(INSTALL) src/liblxdream.so android/libs/$(ANDROID_ABI)/liblxdream.so
+@GUI_ANDROID_TRUE@ $(INSTALL) $(ANDROID_GDBSERVER) android/libs/$(ANDROID_ABI)/gdbserver
+@GUI_ANDROID_TRUE@ $(STRIP) --strip-unneeded android/libs/$(ANDROID_ABI)/liblxdream.so
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > @GUI_ANDROID_TRUE@ (TARGETDIR="`pwd`/android" && cd $(srcdir)/android && \
@GUI_ANDROID_TRUE@ $(ANT) -buildfile build.xml -Dsdk.dir=$(ANDROID_SDK_HOME) \
@GUI_ANDROID_TRUE@ -Dout.dir="$$TARGETDIR" -Dnative.libs.dir="$$TARGETDIR/libs" \
</pre></div>
<hr /><a name="file3" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>configure</b></big> <small id="info" style="color: #888888;" >1ca50e1330cd -> d63f73cc586f</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/configure
+++ lxdream/configure
@@ -683,6 +683,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > host_vendor
host_os
ANT
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANDROID_ABI
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_SDK_HOME
ANDROID_NDK_HOME
ANDROID_SDK_VERSION
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -1467,6 +1468,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > --with-android-ndk=NDK Specify the location of the Android NDK
--with-android-version Specify target Android SDK version
--with-android-version Specify target Android NDK version
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ --with-android-abi Specify target Android ABI
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > --with-osmesa Build with the osmesa GL library (software
rendering)
--with-gtk Build with the GTK UI. Default on X11 systems
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2557,6 +2559,14 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fi
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+# Check whether --with-android-abi was given.
+if test "${with_android_abi+set}" = set; then
+ withval=$with_android_abi;
+else
+ ANDROID_ABI="armeabi-v7a"
+fi
+
+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > if test "x$with_android" != "x"; then
if test "$with_android" = "yes"; then
{ { echo "$as_me:$LINENO: error: --with-android option must be given with the path to the Android SDK " >&5
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2656,8 +2666,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > fi
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- case $host_alias in
- arm-* | "")
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ TARGETFLAGS="-ffunction-sections -funwind-tables -fomit-frame-pointer -DANDROID -Wa,--noexecstack"
+
+ case $ANDROID_ABI in
+ armeabi | armeabi-v7a)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > host_alias="arm-linux-androideabi"
host_cpu="arm"
host_vendor="unknown";
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2665,10 +2677,14 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/*/bin`
ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/gdbserver`
ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_NDK_VERSION/arch-arm"
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- TARGETFLAGS="-ffunction-sections -funwind-tables -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wno-psabi -Wa,--noexecstack"
- TARGETFLAGS="$TARGETFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -march=armv5te -mtune=xscale -msoft-float -mthumb -Os"
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ TARGETFLAGS="$TARGETFLAGS -fstack-protector -finline-limit=64 -fno-strict-aliasing -Wno-psabi -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__"
+ if test "x$with_abi" = "armeabi"; then
+ TARGETFLAGS="$TARGETFLAGS -march=armv5te -mtune=xscale -msoft-float"
+ else
+ TARGETFLAGS="$TARGETFLAGS -march=armv7-a -mtune=cortex-a8 -mfloat-abi=softfp -mfpu=vfp"
+ fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ;;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- i686-*)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ x86)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > host_alias="i686-android-linux"
host_cpu="i686"
host_vendor="android"
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2676,11 +2692,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/*/bin`
ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/gdbserver`
ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_NDK_VERSION/arch-x86"
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- TARGETFLAGS=""
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ TARGETFLAGS="$TARGETFLAGS -finline-limit=300 -fno-rtti -funswitch-loops -fstrict-aliasing"
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ;;
*)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- { { echo "$as_me:$LINENO: error: Unsupported android host $host_alias" >&5
-echo "$as_me: error: Unsupported android host $host_alias" >&2;}
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ { { echo "$as_me:$LINENO: error: Unsupported android ABI $ANDROID_ABI" >&5
+echo "$as_me: error: Unsupported android ABI $ANDROID_ABI" >&2;}
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > { (exit 1); exit 1; }; }
;;
esac
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -2744,6 +2760,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_BUILD=yes
cross_compiling=yes
fi
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16760,6 +16777,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
ANT!$ANT$ac_delim
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANDROID_ABI!$ANDROID_ABI$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_SDK_HOME!$ANDROID_SDK_HOME$ac_delim
ANDROID_NDK_HOME!$ANDROID_NDK_HOME$ac_delim
ANDROID_SDK_VERSION!$ANDROID_SDK_VERSION$ac_delim
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16786,7 +16804,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > CPP!$CPP$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-CPPFLAGS!$CPPFLAGS$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16828,6 +16845,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+CPPFLAGS!$CPPFLAGS$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
ac_ct_CC_FOR_BUILD!$ac_ct_CC_FOR_BUILD$ac_delim
CC_FOR_BUILDDEPMODE!$CC_FOR_BUILDDEPMODE$ac_delim
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16924,7 +16942,6 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > BUILD_SYSTEST_FALSE!$BUILD_SYSTEST_FALSE$ac_delim
BUILD_ARMTEST_TRUE!$BUILD_ARMTEST_TRUE$ac_delim
BUILD_ARMTEST_FALSE!$BUILD_ARMTEST_FALSE$ac_delim
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >-LXDREAM_LIBS!$LXDREAM_LIBS$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16966,6 +16983,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+LXDREAM_LIBS!$LXDREAM_LIBS$ac_delim
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
MSGFMT!$MSGFMT$ac_delim
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -16987,7 +17005,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = <span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >19</span>; then
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = <span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >20</span>; then
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
</pre></div>
<hr /><a name="file4" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/m4</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>android.m4</b></big> <small id="info" style="color: #888888;" >1ca50e1330cd -> d63f73cc586f</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/m4/android.m4
+++ lxdream/m4/android.m4
@@ -8,6 +8,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_ARG_WITH( android-ndk, AS_HELP_STRING( [--with-android-ndk=NDK], [Specify the location of the Android NDK] ) )
AC_ARG_WITH( android-version, AS_HELP_STRING( [--with-android-version], [Specify target Android SDK version]), [], [with_android_version="android-11"] )
AC_ARG_WITH( android-ndk-version, AS_HELP_STRING( [--with-android-version], [Specify target Android NDK version]), [], [with_ndk_version="android-9"] )
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ AC_ARG_WITH( android-abi, AS_HELP_STRING( [--with-android-abi], [Specify target Android ABI]), [], [ANDROID_ABI="armeabi-v7a"] )
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" >
if test "x$with_android" != "x"; then
if test "$with_android" = "yes"; then
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -26,8 +27,11 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_CHECK_FILE( [$ANDROID_SDK_HOME/platforms/$ANDROID_SDK_VERSION/sdk.properties], [], [ AC_MSG_ERROR([Android platform version $ANDROID_SDK_VERSION not found in $ANDROID_SDK_HOME]) ])
AC_CHECK_FILE( [$ANDROID_NDK_HOME/toolchains], [], [ AC_MSG_ERROR([Android NDK not found in $ANDROID_NDK_HOME]) ])
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- case $host_alias in
- arm-* | "")
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ dnl common flags
+ TARGETFLAGS="-ffunction-sections -funwind-tables -fomit-frame-pointer -DANDROID -Wa,--noexecstack"
+
+ case $ANDROID_ABI in
+ armeabi | armeabi-v7a)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > host_alias="arm-linux-androideabi"
host_cpu="arm"
host_vendor="unknown";
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -35,10 +39,15 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/*/bin`
ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/arm-*/prebuilt/gdbserver`
ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_NDK_VERSION/arch-arm"
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- TARGETFLAGS="-ffunction-sections -funwind-tables -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wno-psabi -Wa,--noexecstack"
- TARGETFLAGS="$TARGETFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -march=armv5te -mtune=xscale -msoft-float -mthumb -Os"
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ dnl Common ARM flags
+ TARGETFLAGS="$TARGETFLAGS -fstack-protector -finline-limit=64 -fno-strict-aliasing -Wno-psabi -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__"
+ if test "x$with_abi" = "armeabi"; then
+ TARGETFLAGS="$TARGETFLAGS -march=armv5te -mtune=xscale -msoft-float"
+ else
+ TARGETFLAGS="$TARGETFLAGS -march=armv7-a -mtune=cortex-a8 -mfloat-abi=softfp -mfpu=vfp"
+ fi
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ;;
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- i686-*)
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ x86)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > host_alias="i686-android-linux"
host_cpu="i686"
host_vendor="android"
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -46,10 +55,10 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_NDK_BIN=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/*/bin`
ANDROID_GDBSERVER=`echo $ANDROID_NDK_HOME/toolchains/x86-*/prebuilt/gdbserver`
ANDROID_SYSROOT="$ANDROID_NDK_HOME/platforms/$ANDROID_NDK_VERSION/arch-x86"
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- TARGETFLAGS=""
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ TARGETFLAGS="$TARGETFLAGS -finline-limit=300 -fno-rtti -funswitch-loops -fstrict-aliasing"
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ;;
*)
</pre><pre id="removed" class="diff" style="margin:0; background-color:#ffdddd;" >- AC_MSG_ERROR([Unsupported android <span id="removedchars" style="background-color:#ff9999;font-weight:bolder;" >host $host_alias</span>])
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ AC_MSG_ERROR([Unsupported android <span id="addedchars" style="background-color:#99ff99;font-weight:bolder;" >ABI $ANDROID_ABI</span>])
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ;;
esac
</pre><pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >@@ -67,6 +76,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > LDFLAGS="-nostdlib -Wl,--no-undefined -L${ANDROID_SYSROOT}/usr/lib -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib -Wl,-allow-shlib-undefined -Wl,-z,noexecstack $LDFLAGS"
LIBS="$LIBS -liconv -landroid -llog -lgcc -lc -lm"
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ AC_SUBST(ANDROID_ABI)
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AC_SUBST(ANDROID_SDK_HOME)
AC_SUBST(ANDROID_NDK_HOME)
AC_SUBST(ANDROID_SDK_VERSION)
</pre></div>
<hr /><a name="file5" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.in</b></big> <small id="info" style="color: #888888;" >1ca50e1330cd -> d63f73cc586f</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/Makefile.in
+++ lxdream/src/Makefile.in
@@ -345,6 +345,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANDROID_ABI = @ANDROID_ABI@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_GDBSERVER = @ANDROID_GDBSERVER@
ANDROID_NDK_HOME = @ANDROID_NDK_HOME@
ANDROID_NDK_VERSION = @ANDROID_NDK_VERSION@
</pre></div>
<hr /><a name="file6" /><div class="file" style="border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;" >
<span class="pathname" style="font-family:monospace; float:right;" >lxdream/src/tools</span><br />
<div class="fileheader" style="margin-bottom:.5em;" ><big><b>Makefile.in</b></big> <small id="info" style="color: #888888;" >1ca50e1330cd -> d63f73cc586f</small></div>
<pre class="diff" style="margin:0;" ><small id="info" style="color: #888888;" >--- lxdream/src/tools/Makefile.in
+++ lxdream/src/tools/Makefile.in
@@ -78,6 +78,7 @@
</small></pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
</pre><pre id="added" class="diff" style="margin:0; background-color:#ddffdd;" >+ANDROID_ABI = @ANDROID_ABI@
</pre><pre id="context" class="diff" style="margin:0; background-color:#eeeeee;" > ANDROID_GDBSERVER = @ANDROID_GDBSERVER@
ANDROID_NDK_HOME = @ANDROID_NDK_HOME@
ANDROID_NDK_VERSION = @ANDROID_NDK_VERSION@
</pre></div>
<center><small>Chaos Theory</small></center>
</div></body></html>