From 5b7f38979fa90117861fe327477de1707f117a8c Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 27 Apr 2011 15:10:12 -0400
Subject: [PATCH] GNOME Bug 612402 - (hb-arm) HarfBuzz compilation fix for arm

With gcc on arm, request 8-bit structure alignment.
---
 configure.ac | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2c612a579..ad2d2bec3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,9 +24,17 @@ LT_INIT([win32-dll])
 AC_CHECK_FUNCS(mprotect sysconf getpagesize)
 AC_CHECK_HEADERS(unistd.h sys/mman.h)
 
-# Make sure we don't link to libstdc++
 if test "x$GCC" = "xyes"; then
+
+	# Make sure we don't link to libstdc++
 	CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+	case "$host" in
+		arm-*-*)
+			# Request byte alignment on arm
+			CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
+		;;
+	esac
 fi
 
 dnl ==========================================================================