[HarfBuzz] harfbuzz: Branch 'master' - 4 commits

[Behdad Esfahbod]

 CMakeLists.txt |   33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 75931427aa4344cd75321c618b8373ffcf1ffc33
Author: ebraminio <ebrahim at gnu.org>
Date:   Fri Apr 14 05:08:11 2017 +0430

    [cmake] Fix try compile link issues (#466)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2ae8009..a43857e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -302,6 +302,7 @@ file(WRITE "${PROJECT_BINARY_DIR}/try_compile_intel_atomic_primitives.c"
 		int atomic_add (int *i) { return __sync_fetch_and_add (i, 1); }
 		int mutex_trylock (int *m) { return __sync_lock_test_and_set (m, 1); }
 		void mutex_unlock (int *m) { __sync_lock_release (m); }
+		int main () { return 0; }
 ")
 try_compile(HB_HAVE_INTEL_ATOMIC_PRIMITIVES
   ${PROJECT_BINARY_DIR}/try_compile_intel_atomic_primitives
@@ -317,6 +318,7 @@ file(WRITE "${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops.c"
 		void memory_barrier (void) { __machine_rw_barrier (); }
 		int atomic_add (volatile unsigned *i) { return atomic_add_int_nv (i, 1); }
 		void *atomic_ptr_cmpxchg (volatile void **target, void *cmp, void *newval) { return atomic_cas_ptr (target, cmp, newval); }
+		int main () { return 0; }
 ")
 try_compile(HB_HAVE_SOLARIS_ATOMIC_OPS
   ${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops
commit cb021e14ab345def326fb58ce486515af179b2cf
Author: ebraminio <ebrahim at gnu.org>
Date:   Fri Apr 14 04:31:17 2017 +0430

    [cmake] typo (#465)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93d30a9d..c2ae8009 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -321,8 +321,8 @@ file(WRITE "${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops.c"
 try_compile(HB_HAVE_SOLARIS_ATOMIC_OPS
   ${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops
   SOURCES ${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops.c)
-if (HB_HB_HAVE_SOLARIS_ATOMIC_OPS)
-  add_definitions(-DHB_HAVE_SOLARIS_ATOMIC_OPS)
+if (HB_HAVE_SOLARIS_ATOMIC_OPS)
+  add_definitions(-DHAVE_SOLARIS_ATOMIC_OPS)
 endif ()
 ##
 
commit a41d5ea4453995dfd7c523427c6017623164c6ff
Author: ebraminio <ebrahim at gnu.org>
Date:   Fri Apr 14 04:25:50 2017 +0430

    [cmake] Add atomic ops availability detection (#464)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b374e57b..93d30a9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,6 +296,36 @@ endif ()
 set(project_sources ${project_sources} ${project_headers})
 ##
 
+## Atomic ops availability detection
+file(WRITE "${PROJECT_BINARY_DIR}/try_compile_intel_atomic_primitives.c"
+"		void memory_barrier (void) { __sync_synchronize (); }
+		int atomic_add (int *i) { return __sync_fetch_and_add (i, 1); }
+		int mutex_trylock (int *m) { return __sync_lock_test_and_set (m, 1); }
+		void mutex_unlock (int *m) { __sync_lock_release (m); }
+")
+try_compile(HB_HAVE_INTEL_ATOMIC_PRIMITIVES
+  ${PROJECT_BINARY_DIR}/try_compile_intel_atomic_primitives
+  SOURCES ${PROJECT_BINARY_DIR}/try_compile_intel_atomic_primitives.c)
+if (HB_HAVE_INTEL_ATOMIC_PRIMITIVES)
+  add_definitions(-DHAVE_INTEL_ATOMIC_PRIMITIVES)
+endif ()
+
+file(WRITE "${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops.c"
+"		#include <atomic.h>
+		/* This requires Solaris Studio 12.2 or newer: */
+		#include <mbarrier.h>
+		void memory_barrier (void) { __machine_rw_barrier (); }
+		int atomic_add (volatile unsigned *i) { return atomic_add_int_nv (i, 1); }
+		void *atomic_ptr_cmpxchg (volatile void **target, void *cmp, void *newval) { return atomic_cas_ptr (target, cmp, newval); }
+")
+try_compile(HB_HAVE_SOLARIS_ATOMIC_OPS
+  ${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops
+  SOURCES ${PROJECT_BINARY_DIR}/try_compile_solaris_atomic_ops.c)
+if (HB_HB_HAVE_SOLARIS_ATOMIC_OPS)
+  add_definitions(-DHB_HAVE_SOLARIS_ATOMIC_OPS)
+endif ()
+##
+
 add_library(harfbuzz ${project_sources})
 target_link_libraries(harfbuzz ${THIRD_PARTY_LIBS})
 
commit 8568588202dd718b089e43cd6d46f689c706f665
Author: ebraminio <ebrahim at gnu.org>
Date:   Thu Apr 13 02:17:16 2017 +0430

    [cmake] Remove NO_MT flag (#462)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e373733c..b374e57b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,6 @@ include_directories(AFTER
 
 # feel free to discuss these or more with the maintainers
 add_definitions(-DHAVE_OT)
-add_definitions(-DHB_NO_MT)
 add_definitions(-DHB_DISABLE_DEPRECATED)
 
 if (BUILD_SHARED_LIBS)