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 /src | |
| 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 'src')
| -rw-r--r-- | src/java/com/jogamp/gluegen/package.html | 2 | ||||
| -rw-r--r-- | src/java/jogamp/common/os/PlatformPropsImpl.java | 12 |
2 files changed, 7 insertions, 7 deletions
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 & Alignment for x86, x86_64, armv7l-32bit-eabi and Window(mingw/mingw64)</h5> + <h5>Type Size & Alignment for x86, x86_64, armv6l-32bit-eabi and Window(mingw/mingw64)</h5> Runtime query is implemented as follows: <pre> typedef struct { 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"; |