Linux ARMel eabi: Use armv6t, soft-float - low profile to target more devices. Our ARMhf build is high profile.

3 files changed, 61 insertions, 1 deletions

diff --git a/make/lib/gluegen-cpptasks-linux-armv4.xml b/make/lib/gluegen-cpptasks-linux-armv4.xml
new file mode 100644
index 0000000..1e5f162
--- /dev/null
+++ b/make/lib/gluegen-cpptasks-linux-armv4.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    This is an example of how to add custom compiler/linker 
+    arguments for a crosscompiler.
+
+    You can use such files with setting the property 'gluegen-cpptasks.file', ie:
+
+        -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
+
+    In case you want to compile for 32bit on a 64bit machine,
+    you might also need to set the 'os.arch' to 'x86'.
+    Example: gluegen/make/make.gluegen.all.linux-x86.sh
+  -->
+
+<project name="GlueGen-cpptasks-linux-armv4" basedir="." >
+
+<!-- Set OS and ARCH for crosscompilation compiler configuration -->
+<target name="gluegen.cpptasks.detect.os.custom">
+    <property name="gluegen.cpptasks.detected.os"     value="true" /> 
+    <property name="isUnix"                           value="true" /> 
+    <property name="isLinux"                          value="true" /> 
+    <property name="isLinuxARMv7"                     value="true" /> 
+    <property name="isX11"                            value="true" /> 
+    <property name="jvmDataModel.arg"                 value="-Djnlp.no.jvm.data.model.set=true" /> 
+    <property name="isCrosscompilation"               value="true" />
+    <property name="isAbiEabiGnuArmel"                value="true" />
+    <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv4' done"/>
+</target>
+
+<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" />
+
+<target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
+    <echo message="Custom forced compiler Linux ARMv4t soft float" />
+
+    <compiler id="compiler.cfg.linux.armv7" name="gcc">
+      <defineset>
+        <define name="__unix__"/>
+        <define name="__X11__"  if="isX11"/>
+        <define name="_DEBUG"   if="c.compiler.use-debug"/>        
+        <define name="DEBUG"    if="c.compiler.use-debug"/>        
+        <define name="NDEBUG"   unless="c.compiler.use-debug"/>        
+      </defineset>
+      <compilerarg value="-fpic" /> 
+      <compilerarg value="-march=armv4t" />
+      <compilerarg value="-msoft-float" /> 
+    </compiler>
+
+    <linker id="linker.cfg.linux.armv7" name="gcc">
+      <linkerarg value="-fpic" /> 
+      <linkerarg value="-march=armv4t" />
+    </linker>
+
+</target>
+
+</project>
+
+
diff --git a/make/scripts/make.gluegen.all.linux-armv7-cross.sh b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
index d8511b6..d364faf 100755
--- a/make/scripts/make.gluegen.all.linux-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
@@ -32,7 +32,7 @@ export TARGET_PLATFORM_ROOT=/opt-linux-armv7-armel
 export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib
 export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm
 
-export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv7.xml"
+export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv4.xml"
 
 #export JUNIT_DISABLED="true"
 export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
diff --git a/make/scripts/make.gluegen.all.linux-armv7.sh b/make/scripts/make.gluegen.all.linux-armv7.sh
index ee7cbea..1d78d74 100755
--- a/make/scripts/make.gluegen.all.linux-armv7.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7.sh
@@ -11,6 +11,8 @@
 export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabi
 export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm
 
+export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv4.xml"
+
 ant \
     -Drootrel.build=build-linux-armv7 \
     $* 2>&1 | tee make.gluegen.all.linux-armv7.log