Updated LLVM from 3.9.1 to 4.0.0

README.md

@@ -115,7 +115,7 @@ Each child module in turn relies on its corresponding native libraries being alr
  * OpenBLAS 0.2.19  http://www.openblas.net/
  * FFTW 3.3.5  http://www.fftw.org/download.html
  * GSL 2.2.1  http://www.gnu.org/software/gsl/#downloading
- * LLVM 3.9.1  http://llvm.org/releases/download.html
+ * LLVM 4.0.0  http://llvm.org/releases/download.html
  * Leptonica 1.73  http://www.leptonica.org/download.html
  * Tesseract 3.04.01  https://github.com/tesseract-ocr/tesseract
  * Caffe  https://github.com/BVLC/caffe

llvm/README.md

@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * LLVM 3.9.1  http://llvm.org/
+ * LLVM 4.0.0  http://llvm.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -45,7 +45,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>llvm-platform</artifactId>
-            <version>3.9.1-1.3.3-SNAPSHOT</version>
+            <version>4.0.0-1.3.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

llvm/cppbuild.sh

@@ -28,7 +28,7 @@ case $PLATFORM in
         ;;
 esac
 
-LLVM_VERSION=3.9.1
+LLVM_VERSION=4.0.0
 download http://llvm.org/releases/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.xz llvm-$LLVM_VERSION.src.tar.xz
 download http://llvm.org/releases/$LLVM_VERSION/cfe-$LLVM_VERSION.src.tar.xz cfe-$LLVM_VERSION.src.tar.xz
 

llvm/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>llvm-platform</artifactId>
-  <version>3.9.1-${project.parent.version}</version>
+  <version>4.0.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for LLVM</name>
 
   <properties>

llvm/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>llvm</artifactId>
-  <version>3.9.1-${project.parent.version}</version>
+  <version>4.0.0-${project.parent.version}</version>
   <name>JavaCPP Presets for LLVM</name>
 
   <dependencies>

llvm/src/main/java/org/bytedeco/javacpp/LLVM.java

@@ -344,51 +344,6 @@ public static native void LLVMParseCommandLineOptions(int argc, @Cast("const cha
  * \{
  */
 
-/** enum LLVMAttribute */
-public static final int
-    LLVMZExtAttribute       =  1<<0,
-    LLVMSExtAttribute       =  1<<1,
-    LLVMNoReturnAttribute   =  1<<2,
-    LLVMInRegAttribute      =  1<<3,
-    LLVMStructRetAttribute  =  1<<4,
-    LLVMNoUnwindAttribute   =  1<<5,
-    LLVMNoAliasAttribute    =  1<<6,
-    LLVMByValAttribute      =  1<<7,
-    LLVMNestAttribute       =  1<<8,
-    LLVMReadNoneAttribute   =  1<<9,
-    LLVMReadOnlyAttribute   =  1<<10,
-    LLVMNoInlineAttribute   =  1<<11,
-    LLVMAlwaysInlineAttribute    =  1<<12,
-    LLVMOptimizeForSizeAttribute =  1<<13,
-    LLVMStackProtectAttribute    =  1<<14,
-    LLVMStackProtectReqAttribute =  1<<15,
-    LLVMAlignment =  31<<16,
-    LLVMNoCaptureAttribute  =  1<<21,
-    LLVMNoRedZoneAttribute  =  1<<22,
-    LLVMNoImplicitFloatAttribute =  1<<23,
-    LLVMNakedAttribute      =  1<<24,
-    LLVMInlineHintAttribute =  1<<25,
-    LLVMStackAlignment =  7<<26,
-    LLVMReturnsTwice =  1 << 29,
-    LLVMUWTable =  1 << 30,
-    LLVMNonLazyBind =  1 << 31;
-
-    /* FIXME: These attributes are currently not included in the C API as
-       a temporary measure until the API/ABI impact to the C API is understood
-       and the path forward agreed upon.
-    LLVMSanitizeAddressAttribute = 1ULL << 32,
-    LLVMStackProtectStrongAttribute = 1ULL<<35,
-    LLVMColdAttribute = 1ULL << 40,
-    LLVMOptimizeNoneAttribute = 1ULL << 42,
-    LLVMInAllocaAttribute = 1ULL << 43,
-    LLVMNonNullAttribute = 1ULL << 44,
-    LLVMJumpTableAttribute = 1ULL << 45,
-    LLVMConvergentAttribute = 1ULL << 46,
-    LLVMSafeStackAttribute = 1ULL << 47,
-    LLVMSwiftSelfAttribute = 1ULL << 48,
-    LLVMSwiftErrorAttribute = 1ULL << 49,
-    */
-
 /** enum LLVMOpcode */
 public static final int
   /* Terminator Instructions */
@@ -2585,7 +2540,6 @@ public static native LLVMValueRef LLVMAddAlias(LLVMModuleRef M, LLVMTypeRef Ty,
  *
  * @see llvm::Function::addAttribute()
  */
-public static native void LLVMAddFunctionAttr(LLVMValueRef Fn, @Cast("LLVMAttribute") int PA);
 
 public static native void LLVMAddAttributeAtIndex(LLVMValueRef F, @Cast("LLVMAttributeIndex") int Idx,
                              LLVMAttributeRef A);
@@ -2619,18 +2573,6 @@ public static native void LLVMAddTargetDependentFunctionAttr(LLVMValueRef Fn, @C
 public static native void LLVMAddTargetDependentFunctionAttr(LLVMValueRef Fn, String A,
                                         String V);
 
-/**
- * Obtain an attribute from a function.
- *
- * @see llvm::Function::getAttributes()
- */
-public static native @Cast("LLVMAttribute") int LLVMGetFunctionAttr(LLVMValueRef Fn);
-
-/**
- * Remove an attribute from a function.
- */
-public static native void LLVMRemoveFunctionAttr(LLVMValueRef Fn, @Cast("LLVMAttribute") int PA);
-
 /**
  * \defgroup LLVMCCoreValueFunctionParameters Function Parameters
  *
@@ -2713,25 +2655,6 @@ public static native void LLVMAddTargetDependentFunctionAttr(LLVMValueRef Fn, St
  */
 public static native LLVMValueRef LLVMGetPreviousParam(LLVMValueRef Arg);
 
-/**
- * Add an attribute to a function argument.
- *
- * @see llvm::Argument::addAttr()
- */
-public static native void LLVMAddAttribute(LLVMValueRef Arg, @Cast("LLVMAttribute") int PA);
-
-/**
- * Remove an attribute from a function argument.
- *
- * @see llvm::Argument::removeAttr()
- */
-public static native void LLVMRemoveAttribute(LLVMValueRef Arg, @Cast("LLVMAttribute") int PA);
-
-/**
- * Get an attribute from a function argument.
- */
-public static native @Cast("LLVMAttribute") int LLVMGetAttribute(LLVMValueRef Arg);
-
 /**
  * Set the alignment for a function parameter.
  *
@@ -3199,9 +3122,6 @@ public static native LLVMBasicBlockRef LLVMInsertBasicBlock(LLVMBasicBlockRef In
  */
 public static native @Cast("unsigned") int LLVMGetInstructionCallConv(LLVMValueRef Instr);
 
-public static native void LLVMAddInstrAttribute(LLVMValueRef Instr, @Cast("unsigned") int index, @Cast("LLVMAttribute") int arg2);
-public static native void LLVMRemoveInstrAttribute(LLVMValueRef Instr, @Cast("unsigned") int index,
-                              @Cast("LLVMAttribute") int arg2);
 public static native void LLVMSetInstrParamAlignment(LLVMValueRef Instr, @Cast("unsigned") int index,
                                 @Cast("unsigned") int Align);
 

llvm/src/main/java/org/bytedeco/javacpp/presets/LLVM.java

@@ -30,7 +30,7 @@
                "<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>",
                "<llvm-c/Transforms/IPO.h>", "<llvm-c/Transforms/PassManagerBuilder.h>", "<llvm-c/Transforms/Scalar.h>", "<llvm-c/Transforms/Vectorize.h>"},
-    compiler = "cpp11", link = {"LLVM-3.9", "LTO"}), @Platform(value = "macosx", link = {"LLVM", "LTO"}) })
+    compiler = "cpp11", link = {"LLVM-4.0", "LTO"}), @Platform(value = "macosx", link = {"LLVM", "LTO"}) })
 public class LLVM implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("LLVMOpaqueContext").pointerTypes("LLVMContextRef"))