From 422d7a5eb53fca6642ebf4e8910d8b0311bb2597 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
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:
      <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" />
---
 src/java/jogamp/common/os/PlatformPropsImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/java/jogamp/common/os')

diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java
index 464f4d4..111523d 100644
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -223,8 +223,8 @@ public abstract class PlatformPropsImpl {
      *   <li>linux-amd64</li>
      *   <li>linux-ia64</li>
      *   <li>linux-i586</li>
-     *   <li>linux-armv7</li>
-     *   <li>android-armv7</li>
+     *   <li>linux-armv6</li>
+     *   <li>android-armv6</li>
      *   <li>macosx-universal</li>
      *   <li>solaris-sparc</li>
      *   <li>solaris-sparcv9</li>
@@ -243,16 +243,16 @@ public abstract class PlatformPropsImpl {
                 _os_and_arch = "i586";
                 break;
             case ARM:
-                _os_and_arch = "armv7"; // TODO: sync with gluegen-cpptasks-base.xml
+                _os_and_arch = "armv6"; // TODO: sync with gluegen-cpptasks-base.xml
                 break;
             case ARMv5:
-                _os_and_arch = "armv5";
+                _os_and_arch = "armv6";
                 break;
             case ARMv6:
-                _os_and_arch = "armv5";
+                _os_and_arch = "armv6";
                 break;
             case ARMv7:
-                _os_and_arch = "armv7";
+                _os_and_arch = "armv6";
                 break;
             case SPARC_32:
                 _os_and_arch = "sparc"; 
-- 
cgit v1.2.3