diff --git a/build.xml b/build.xml
index abfbc1a3ff75539c4506945857fc47276c600664..443d381e2eba07a6cc474ca9ac3d2dbe6d98507f 100644
--- a/build.xml
+++ b/build.xml
@@ -5,8 +5,9 @@
<condition property="x86_or_x86_64" value="x86" else="x86_64"> <or><os arch="x86" /><os arch="i386"/></or> </condition>
<condition property="dist" value="dist_windows_${x86_or_x86_64}"><os family="windows" /></condition>
- <condition property="dist" value="dist_linux_${x86_or_x86_64}"><and><not><os family="mac"/></not><os family="unix" /></and></condition>
+ <condition property="dist" value="dist_linux_${x86_or_x86_64}"><and><not><os family="mac"/></not><not><os name="FreeBSD"/></not><os family="unix" /></and></condition>
<condition property="dist" value="dist_mac_${x86_or_x86_64}"><os family="mac" /></condition>
+ <condition property="dist" value="dist_freebsd_${x86_or_x86_64}"><os name="FreeBSD" /></condition>
<target name="help">
<echo message="Available targets are:-"/>
diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 035bc928bbeb0a01880f7613fa7cc47b23c6534c..9dc834cf71fc9d1504b079f700167129bd4d567b 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -91,6 +91,28 @@ First consider editing the properties in build.properties
</condition>
<echo message=" intel.app.sdk.dir ${intel.app.sdk.dir}"/>
+
+ <available property="freebsd.opencl.exists" file="/usr/local/lib/libOpenCL.so" type="file"/>
+ <condition property="freebsd.app.sdk.dir" value="/usr/local">
+ <and>
+ <os name="FreeBSD" />
+ <isset property="freebsd.opencl.exists" />
+ <not>
+ <isset property="win32.amd.app.sdk.exists" />
+ </not>
+ <not>
+ <isset property="win64.amd.app.sdk.exists" />
+ </not>
+ <not>
+ <isset property="linux.amd.app.sdk.exists" />
+ </not>
+ <not>
+ <isset property="linux.intel.app.sdk.exists" />
+ </not>
+ </and>
+ </condition>
+
+ <echo message=" freebsd.app.sdk.dir ${freebsd.app.sdk.dir}"/>
<condition property="vendor.name" value="amd">
<isset property="amd.app.sdk.dir" />
@@ -105,6 +127,18 @@ First consider editing the properties in build.properties
</and>
</condition>
+ <condition property="vendor.name" value="freebsd">
+ <and>
+ <isset property="freebsd.app.sdk.dir" />
+ <not>
+ <isset property="amd.app.sdk.dir" />
+ </not>
+ <not>
+ <isset property="intel.app.sdk.dir" />
+ </not>
+ </and>
+ </condition>
+
<echo message=" vendor.name ${vendor.name}"/>
<condition property="app.sdk.dir" value="${amd.app.sdk.dir}">
@@ -119,6 +153,15 @@ First consider editing the properties in build.properties
</not>
</and>
</condition>
+
+ <condition property="freebsd.sdk.dir" value="${freebsd.app.sdk.dir}">
+ <and>
+ <isset property="freebsd.app.sdk.dir" />
+ <not>
+ <isset property="app.sdk.dir" />
+ </not>
+ </and>
+ </condition>
<echo message="app.sdk.dir ${app.sdk.dir}"/>
@@ -348,6 +391,9 @@ First consider editing the properties in build.properties
<os family="unix" />
<not>
<os family="mac" />
+ </not>
+ <not>
+ <os name="FreeBSD" />
</not>
</and>
</condition>
@@ -355,6 +401,10 @@ First consider editing the properties in build.properties
<condition property="use.gcc_mac">
<os family="mac" />
</condition>
+
+ <condition property="use.clang_freebsd">
+ <os name="FreeBSD" />
+ </condition>
<condition property="x86_or_x86_64" value="x86" else="x86_64">
<or>
@@ -406,7 +456,10 @@ First consider editing the properties in build.properties
<not>
<os family="mac" />
</not>
- <not>
+ <not>
+ <os name="FreeBSD" />
+ </not>
+ <not>
<isset property="app.sdk.dir" />
</not>
</and>
@@ -426,6 +479,9 @@ First consider editing the properties in build.properties
<not>
<os family="mac" />
</not>
+ <not>
+ <os name="FreeBSD" />
+ </not>
<not>
<isset property="app.sdk.dir.exists" />
</not>
@@ -582,6 +638,45 @@ First consider editing the properties in build.properties
<arg value="-Wno-write-strings" />
</exec>
</target>
+
+ <target name="clang_freebsd" if="use.clang_freebsd">
+ <mkdir dir="${basedir}/dist"/>
+ <echo message="freebsdcc ${os.arch}" />
+ <exec executable="clang++" failonerror="true">
+ <arg value="-m${gcc.m.value}" />
+ <arg value="-O3" />
+ <arg value="-g" />
+ <arg value="-fPIC" />
+ <arg value="-DCL_USE_DEPRECATED_OPENCL_1_1_APIS"/>
+ <arg value="-I${java.home}/../include" />
+ <arg value="-I${java.home}/../include/freebsd" />
+ <arg value="-Iinclude" />
+ <arg value="-I/usr/local/include" />
+ <arg value="-Isrc/cpp" />
+ <arg value="-Isrc/cpp/runKernel" />
+ <arg value="-Isrc/cpp/invoke" />
+ <arg value="-shared" />
+ <arg value="-o" />
+ <arg value="${basedir}/dist/libaparapi_${x86_or_x86_64}.so" />
+ <arg value="src/cpp/runKernel/Aparapi.cpp" />
+ <arg value="src/cpp/runKernel/ArrayBuffer.cpp" />
+ <arg value="src/cpp/runKernel/AparapiBuffer.cpp" />
+ <arg value="src/cpp/runKernel/Config.cpp" />
+ <arg value="src/cpp/runKernel/JNIContext.cpp" />
+ <arg value="src/cpp/runKernel/KernelArg.cpp" />
+ <arg value="src/cpp/runKernel/ProfileInfo.cpp" />
+ <arg value="src/cpp/runKernel/Range.cpp" />
+ <arg value="src/cpp/invoke/OpenCLJNI.cpp" />
+ <arg value="src/cpp/invoke/OpenCLArgDescriptor.cpp" />
+ <arg value="src/cpp/invoke/OpenCLMem.cpp" />
+ <arg value="src/cpp/CLHelper.cpp" />
+ <arg value="src/cpp/classtools.cpp" />
+ <arg value="src/cpp/JNIHelper.cpp" />
+ <arg value="src/cpp/agent.cpp" />
+ <arg value="-L/usr/local/lib" />
+ <arg value="-lOpenCL" />
+ </exec>
+ </target>
<target name="msvc" if="use.msvc">
<mkdir dir="${basedir}\dist"/>
@@ -632,7 +727,7 @@ First consider editing the properties in build.properties
</exec>
</target>
- <target name="build" depends="clean, javah, msvc, gcc, gcc_mac" />
+ <target name="build" depends="clean, javah, msvc, gcc, gcc_mac, clang_freebsd" />
<target name="msvc_cltest" if="use.msvc">
<mkdir dir="${basedir}\dist"/>
@@ -684,6 +779,24 @@ First consider editing the properties in build.properties
<arg value="OpenCL" />
</exec>
</target>
+
+ <target name="freebsd_cltest" if="use.clang_freebsd">
+ <mkdir dir="${basedir}/dist"/>
+ <echo message="clang cltest ${os.arch}" />
+ <exec executable="clang++" failonerror="true">
+ <arg value="-O3" />
+ <arg value="-g" />
+ <arg value="-fPIC" />
+ <arg value="-DCL_USE_DEPRECATED_OPENCL_1_1_APIS"/>
+ <arg value="-I${java.home}/../include" />
+ <arg value="-I${java.home}/../include/freebsd" />
+ <arg value="-I/usr/local/include" />
+ <arg value="src/cpp/cltest.cpp" />
+ <arg value="-L/usr/local/lib -lOpenCL" />
+ <arg value="-o" />
+ <arg value="${basedir}/dist/cltest" />
+ </exec>
+ </target>
<target name="gcc_cltest" if="use.gcc">
<mkdir dir="${basedir}/dist"/>
@@ -733,6 +846,6 @@ First consider editing the properties in build.properties
</exec>
</target>
- <target name="cltest" depends="check,msvc_cltest,mac_cltest,gcc_cltest" />
- <target name="clt" depends="check,gcc_clt,mac_clt" />
+ <target name="cltest" depends="check,msvc_cltest,mac_cltest,freebsd_cltest,gcc_cltest" />
+ <target name="clt" depends="check,gcc_clt,mac_clt,freebsd_cltest" />
</project>
diff --git a/com.amd.aparapi.jni/src/cpp/Common.h b/com.amd.aparapi.jni/src/cpp/Common.h
index 1abcb7e907b5c5128614b3067c2c806dd8d6d316..7e34ed21a3f43cafb27ffc418c7836e3b11cc969 100644
--- a/com.amd.aparapi.jni/src/cpp/Common.h
+++ b/com.amd.aparapi.jni/src/cpp/Common.h
@@ -44,7 +44,7 @@
#include <string.h>
#include <time.h>
-#ifndef __APPLE__
+#if not defined __APPLE__ && not defined __FreeBSD__
#include <malloc.h>
#endif