diff options
author | Sven Gothel <[email protected]> | 2012-08-16 14:39:30 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-08-16 14:39:30 +0200 |
commit | 422d7a5eb53fca6642ebf4e8910d8b0311bb2597 (patch) | |
tree | 7a59a1a87dd688becc54f951d3ef8a2877b1ab29 /make/build.xml | |
parent | 01531a73c2d3afcef06d9aa0e91161a6561b6a4a (diff) |
Change/Lower ARM Requierements for GNU/Linux & Android-GNU/Linux ARM: ARMv7hf -> ARMv6hf, ARMv7-soft -> ARMv5te/ARMV6 (soft)
platform build config files:
lib/gluegen-cpptasks-linux-armv7.xml -> lib/gluegen-cpptasks-linux-armv6.xml
lib/gluegen-cpptasks-linux-armv7hf.xml -> lib/gluegen-cpptasks-linux-armv6hf.xml
properties:
isLinuxARMv7 -> isLinuxARMv6
isLinuxARMv7Armel -> isLinuxARMv6Armel
isLinuxARMv7Armhf -> isLinuxARMv6Armhf
isAndroidARMv7 -> isAndroidARMv6
isAndroidARMv7Armel -> isAndroidARMv6Armel
isAndroidARMv7Armhf -> isAndroidARMv6Armhf
targets:
compiler.cfg.linux.armv7 -> compiler.cfg.linux.armv6
linker.cfg.linux.armv7 -> linker.cfg.linux.armv6
compiler.cfg.linux.armv6:
<compilerarg value="-fpic" />
<compilerarg value="-march=armv5te" />
<compilerarg value="-marm" />
<compilerarg value="-mfloat-abi=softfp" />
<linkerarg value="-fpic" />
<linkerarg value="-march=armv5te" />
<linkerarg value="-marm" />
<linkerarg value="-mfloat-abi=softfp" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
compiler.cfg.linux.armv6hf:
<compilerarg value="-fpic" />
<compilerarg value="-march=armv6" />
<compilerarg value="-marm" />
<compilerarg value="-mfloat-abi=hard" />
<linkerarg value="-fpic" />
<linkerarg value="-march=armv6" />
<linkerarg value="-marm" />
<linkerarg value="-mfloat-abi=hard" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
gluegen-cpptasks-android-armv6.xml:
<compilerarg value="-fpic" />
<compilerarg value="-march=armv6" />
<compilerarg value="-mfloat-abi=softfp" />
<compilerarg value="-marm" />
<linkerarg value="-march=armv6" />
<linkerarg value="-mfloat-abi=softfp" />
<linkerarg value="-marm" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
Diffstat (limited to 'make/build.xml')
-rw-r--r-- | make/build.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index 671e3c3..3f7c4da 100644 --- a/make/build.xml +++ b/make/build.xml @@ -310,10 +310,10 @@ <property name="linker.cfg.id" value="linker.cfg.linux" /> </target> - <target name="declare.linux.armv7" if="isLinuxARMv7"> - <echo message="Linux.armv7" /> - <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7" /> - <property name="linker.cfg.id" value="linker.cfg.linux.armv7" /> + <target name="declare.linux.armv6" if="isLinuxARMv6"> + <echo message="Linux.armv6" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6" /> + <property name="linker.cfg.id" value="linker.cfg.linux.armv6" /> </target> <target name="declare.linux.alpha" if="isLinuxAlpha"> @@ -364,7 +364,7 @@ <property name="linker.cfg.id" value="linker.cfg.linux.sparc" /> </target> - <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv7" if="isLinux" > + <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" > <property name="c.src.dir.os" value="unix" /> <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> |