ARM build for LLVM preset

bytedeco · Jul 25, 2019 · 6fa3419 · 6fa3419
1 parent 1bb6289
commit 6fa3419
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -217,6 +217,10 @@ matrix:
         env: PROJ=cpu_features,systems OS=linux-arm64
         install: true
         script: ./ci/install-arm.sh
+      - os: linux
+        env: PROJ=llvm OS=linux-arm64
+        install: true
+        script: ./ci/install-arm.sh
 
       - os: linux
         env: PROJ=opencv,artoolkitplus,chilitags,flandmark OS=linux-ppc64le

diff --git a/llvm/cppbuild.sh b/llvm/cppbuild.sh
@@ -40,6 +40,11 @@ case $PLATFORM in
         make -j $MAKEJ
         make install > /dev/null
         ;;
+    linux-arm64)
+        $CMAKE -DCMAKE_INSTALL_PREFIX=../.. -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD=host -DLIBXML2_LIBRARIES= -DLLVM_INCLUDE_TESTS=OFF ..
+        make -j $MAKEJ
+        make install > /dev/null
+        ;;
 #    linux-armhf)
 #        export CC_FLAGS="clang -target arm -march=armv7 -mfloat-abi=hard"
 #        export CXX_FLAGS="-target arm -march=armv7 -mfloat-abi=hard"

diff --git a/llvm/platform/pom.xml b/llvm/platform/pom.xml
@@ -38,6 +38,12 @@
       <version>${project.version}</version>
       <classifier>${javacpp.platform.linux-x86_64}</classifier>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>${javacpp.moduleId}</artifactId>
+      <version>${project.version}</version>
+      <classifier>${javacpp.platform.linux-arm64}</classifier>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>${javacpp.moduleId}</artifactId>
@@ -68,7 +74,7 @@
             <configuration>
               <archive>
                 <manifestEntries>
-                  <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
+                  <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
                 </manifestEntries>
               </archive>
             </configuration>
@@ -115,6 +121,7 @@
                     module org.bytedeco.${javacpp.moduleId}.platform {
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
+                      requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
                       requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.windows.x86;
                       requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;

diff --git a/llvm/src/main/java/org/bytedeco/llvm/presets/LLVM.java b/llvm/src/main/java/org/bytedeco/llvm/presets/LLVM.java
@@ -27,7 +27,7 @@
 import org.bytedeco.javacpp.tools.*;
 
 @Properties(target = "org.bytedeco.llvm.LLVM", global = "org.bytedeco.llvm.global.LLVM", value = {@Platform(
-    value = {"linux-x86", "macosx", "windows"}, define = {"__STDC_LIMIT_MACROS", "__STDC_CONSTANT_MACROS"},
+    value = {"linux", "macosx", "windows"}, define = {"__STDC_LIMIT_MACROS", "__STDC_CONSTANT_MACROS"},
     include = {"<llvm-c/Types.h>", "<llvm-c/Support.h>", "<llvm-c/Core.h>", "<llvm-c/Analysis.h>", "<llvm-c/BitReader.h>", "<llvm-c/BitWriter.h>",
                "<llvm-c/DisassemblerTypes.h>", "<llvm-c/Disassembler.h>", "<llvm-c/Initialization.h>", "<llvm-c/IRReader.h>", "<llvm-c/Linker.h>", "<llvm-c/LinkTimeOptimizer.h>",
                "<llvm-c/lto.h>", "<llvm-c/Object.h>", "<llvm-c/Target.h>", "<llvm-c/TargetMachine.h>", "<llvm-c/ExecutionEngine.h>",