diff options
Diffstat (limited to 'src/java')
| -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"; |