aboutsummaryrefslogtreecommitdiffstats
path: root/make/lib
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-03-28 03:09:39 +0200
committerSven Gothel <[email protected]>2012-03-28 03:09:39 +0200
commit0d486ab4bc73a53218cb015936aed755e8e9e6de (patch)
treef6d02062c504c3a23ba5bd9df0a1c50b725c1721 /make/lib
parentdd19355464d63ff2e77013f2e537e49d3ba750a1 (diff)
Add support for armhf/gnueabihf resulting in new 'os.and.arch' := [ 'android-armv7hf' and 'linux-armv7hf' ]
- Platform gets new ABIType [ GENERIC, ARMEL, ARMHF ] - Platform impl. needs to guess ABIType in case of ARM, since no Java system property ('os.arch' ..) reflects the new EABI. I consider this a bug, since this will also hinder JNLP to work. The latter also uses 'os.arch' sys property to determine the nativelib resource! (See Platform.guessABITypeImpl(..) for details how we guess the type.) - Adding symbolic links to ubuntu's gnueabihf cross tool chain - Adding armhf crossbuild script
Diffstat (limited to 'make/lib')
-rw-r--r--make/lib/gluegen-cpptasks-linux-armv7.xml2
-rw-r--r--make/lib/gluegen-cpptasks-linux-armv7hf.xml35
l---------make/lib/linux/arm-linux-gnueabihf/bin/gcc1
l---------make/lib/linux/arm-linux-gnueabihf/bin/ld1
l---------make/lib/linux/arm-linux-gnueabihf/bin/objdump1
l---------make/lib/linux/arm-linux-gnueabihf/bin/strip1
6 files changed, 40 insertions, 1 deletions
diff --git a/make/lib/gluegen-cpptasks-linux-armv7.xml b/make/lib/gluegen-cpptasks-linux-armv7.xml
index fad15af..e07d58e 100644
--- a/make/lib/gluegen-cpptasks-linux-armv7.xml
+++ b/make/lib/gluegen-cpptasks-linux-armv7.xml
@@ -24,7 +24,7 @@
<property name="isX11" value="true" />
<property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" />
<property name="isCrosscompilation" value="true" />
-
+ <property name="isAbiEabiGnuArmel" value="true" />
<echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv7' done"/>
</target>
diff --git a/make/lib/gluegen-cpptasks-linux-armv7hf.xml b/make/lib/gluegen-cpptasks-linux-armv7hf.xml
new file mode 100644
index 0000000..7e20f24
--- /dev/null
+++ b/make/lib/gluegen-cpptasks-linux-armv7hf.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ This is an example of how to add custom compiler/linker
+ arguments for a crosscompiler.
+
+ You can use such files with setting the property 'gluegen-cpptasks.file', ie:
+
+ -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml
+
+ In case you want to compile for 32bit on a 64bit machine,
+ you might also need to set the 'os.arch' to 'x86'.
+ Example: gluegen/make/make.gluegen.all.linux-x86.sh
+ -->
+
+<project name="GlueGen-cpptasks-linux-armv7hf" basedir="." >
+
+<!-- Set OS and ARCH for crosscompilation compiler configuration -->
+<target name="gluegen.cpptasks.detect.os.custom">
+ <property name="gluegen.cpptasks.detected.os" value="true" />
+ <property name="isUnix" value="true" />
+ <property name="isLinux" value="true" />
+ <property name="isLinuxARMv7" value="true" />
+ <property name="isX11" value="true" />
+ <property name="jvmDataModel.arg" value="-Djnlp.no.jvm.data.model.set=true" />
+ <property name="isCrosscompilation" value="true" />
+ <property name="isAbiEabiGnuArmhf" value="true" />
+ <echo message="gluegen.cpptasks.detect.os.custom: GLUEGEN_CPPTASKS_FILE 'gluegen-cpptasks-linux-armv7hf' done"/>
+</target>
+
+<import file="${gluegen.root.abs-path}/make/gluegen-cpptasks-base.xml" optional="false" />
+
+</project>
+
+
diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/gcc b/make/lib/linux/arm-linux-gnueabihf/bin/gcc
new file mode 120000
index 0000000..dca59c0
--- /dev/null
+++ b/make/lib/linux/arm-linux-gnueabihf/bin/gcc
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabihf-gcc \ No newline at end of file
diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/ld b/make/lib/linux/arm-linux-gnueabihf/bin/ld
new file mode 120000
index 0000000..bce9f7f
--- /dev/null
+++ b/make/lib/linux/arm-linux-gnueabihf/bin/ld
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabihf-ld \ No newline at end of file
diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/objdump b/make/lib/linux/arm-linux-gnueabihf/bin/objdump
new file mode 120000
index 0000000..ded739c
--- /dev/null
+++ b/make/lib/linux/arm-linux-gnueabihf/bin/objdump
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabihf-objdump \ No newline at end of file
diff --git a/make/lib/linux/arm-linux-gnueabihf/bin/strip b/make/lib/linux/arm-linux-gnueabihf/bin/strip
new file mode 120000
index 0000000..c941465
--- /dev/null
+++ b/make/lib/linux/arm-linux-gnueabihf/bin/strip
@@ -0,0 +1 @@
+/usr/bin/arm-linux-gnueabihf-strip \ No newline at end of file