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/com/jogamp/gluegen/package.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/java/com/jogamp/gluegen/package.html')

diff --git a/src/java/com/jogamp/gluegen/package.html b/src/java/com/jogamp/gluegen/package.html
index c253473..7ea9d51 100644
--- a/src/java/com/jogamp/gluegen/package.html
+++ b/src/java/com/jogamp/gluegen/package.html
@@ -62,7 +62,7 @@
    aligned_offset = offset + padding ;   
   </blockquote>
   
-  <h5>Type Size &amp; Alignment for x86, x86_64, armv7l-32bit-eabi and Window(mingw/mingw64)</h5>
+  <h5>Type Size &amp; Alignment for x86, x86_64, armv6l-32bit-eabi and Window(mingw/mingw64)</h5>
   Runtime query is implemented as follows: 
   <pre>
    typedef struct {
-- 
cgit v1.2.3