From 422d7a5eb53fca6642ebf4e8910d8b0311bb2597 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 16 Aug 2012 14:39:30 +0200 Subject: 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: compiler.cfg.linux.armv6hf: gluegen-cpptasks-android-armv6.xml: --- make/gluegen-cpptasks-base.xml | 100 +++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 44 deletions(-) (limited to 'make/gluegen-cpptasks-base.xml') diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 0a895fc..8891695 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -16,7 +16,7 @@ - configuration is exactly as specified. - - is64Bit - - isAbiEabiGnuArmel (implicit if isAndroidARMv7 or isLinuxARMv7) + - isAbiEabiGnuArmel (implicit if isAndroidARMv6 or isLinuxARMv6) - isAbiEabiGnuArmhf (shall be declared explicit) - isUnix - isX11 @@ -26,16 +26,16 @@ - isHPUX - isIA64 - isAndroid - - isAndroidARMv7 - - isAndroidARMv7Armel (set in gluegen.cpptasks.detected.os.2) - - isAndroidARMv7Armhf (set in gluegen.cpptasks.detected.os.2) + - isAndroidARMv6 + - isAndroidARMv6Armel (set in gluegen.cpptasks.detected.os.2) + - isAndroidARMv6Armhf (set in gluegen.cpptasks.detected.os.2) - isLinux - isLinuxAMD64 - isLinuxIA64 - isLinuxX86 - - isLinuxARMv7 - - isLinuxARMv7Armel (set in gluegen.cpptasks.detected.os.2) - - isLinuxARMv7Armhf (set in gluegen.cpptasks.detected.os.2) + - isLinuxARMv6 + - isLinuxARMv6Armel (set in gluegen.cpptasks.detected.os.2) + - isLinuxARMv6Armhf (set in gluegen.cpptasks.detected.os.2) - isLinuxAlpha - isLinuxHppa - isLinuxMips @@ -117,7 +117,7 @@ - compiler.cfg.linux - compiler.cfg.linux.x86 - compiler.cfg.linux.amd64 - - compiler.cfg.linux.armv7 + - compiler.cfg.linux.armv6 - compiler.cfg.linux.alpha - compiler.cfg.linux.hppa - compiler.cfg.linux.mips @@ -138,7 +138,7 @@ - linker.cfg.linux - linker.cfg.linux.x86 - linker.cfg.linux.amd64 - - linker.cfg.linux.armv7 + - linker.cfg.linux.armv6 - linker.cfg.linux.alpha - linker.cfg.linux.hppa - linker.cfg.linux.mips @@ -209,7 +209,7 @@ by a custom file set in property 'gluegen-cpptasks.file' or environment var 'GLUEGEN_CPPTASKS_FILE' - See 'lib/gluegen-cpptasks-linux-armv7.xml' which sets OS and ARCH + See 'lib/gluegen-cpptasks-linux-armv6.xml' which sets OS and ARCH for crosscompilation. --> @@ -292,20 +292,22 @@ - + + - + + @@ -314,8 +316,8 @@ - - + + @@ -503,29 +505,29 @@ - + - + - + - + - + - + - + - + @@ -541,16 +543,16 @@ - - - + + + - - - + + + @@ -604,12 +606,12 @@ - - + + - - + + @@ -644,15 +646,15 @@ - - + + - - + + - + @@ -899,7 +901,7 @@ - + @@ -907,6 +909,10 @@ + + + + @@ -1106,7 +1112,13 @@ - + + + + + + + @@ -1296,10 +1308,10 @@ - - - - + + + + @@ -1359,7 +1371,7 @@ - + -- cgit v1.2.3