[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 configure.ac |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3f38c1137b6219a646da141b08463ffa922d4e35
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Jun 6 16:03:40 2014 -0400

    Don't use -mstructure-size-boundary=8 on clang arm
    
    As in building for Android / iPhone.  Only set it if
    struct{char} alignment is not 1.
    
    NOT tested on an actual Arm architecture.  Guess we'll know
    when this makes it to people's build bots.

diff --git a/configure.ac b/configure.ac
index d2036ec..fc64be1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,7 @@ AC_CHECK_HEADERS(unistd.h sys/mman.h)
 
 # Compiler flags
 AC_CANONICAL_HOST
+AC_CHECK_ALIGNOF([struct{char}])
 if test "x$GCC" = "xyes"; then
 
 	# Make symbols link locally
@@ -94,8 +95,10 @@ if test "x$GCC" = "xyes"; then
 
 	case "$host" in
 		arm-*-*)
-			# Request byte alignment on arm
-			CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
+			if test "x$ac_cv_alignof_struct_char_" != x1; then
+				# Request byte alignment
+				CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
+			fi
 		;;
 	esac
 fi