From f123ec8f7d449b2e079ea8d5d7e431ff83235f56 Mon Sep 17 00:00:00 2001
From: Magnus Landqvist <magnus.landqvist@sonyericsson.com>
Date: Fri, 19 Feb 2010 12:06:59 +0100
Subject: [PATCH] Build software AGL library with correct get_tls() macro for
 ARMv7 based platforms

This prevents crashes on snapdragon processors.
---
 opengl/libagl/Android.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk
index 983784554d301..518be8b5322e9 100644
--- a/opengl/libagl/Android.mk
+++ b/opengl/libagl/Android.mk
@@ -37,6 +37,10 @@ ifeq ($(TARGET_ARCH),arm)
 	LOCAL_CFLAGS += -fstrict-aliasing
 endif
 
+ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
+    LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
+endif
+
 ifneq ($(TARGET_SIMULATOR),true)
     # we need to access the private Bionic header <bionic_tls.h>
     LOCAL_C_INCLUDES += bionic/libc/private