diff options
| author | Gary King <gking@nvidia.com> | 2009-09-29 12:54:07 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-01-12 17:35:35 -0800 |
| commit | 9166f7bfa7796489d9b34f49846541cfd9a640d5 (patch) | |
| tree | e36dc21e9a9206ed9dc7d1c33d3dc994c96478c8 /opengl/libagl | |
| parent | 97acf3d48c3e9bea35739dbd16fcf537448528e8 (diff) | |
| download | frameworks_native-9166f7bfa7796489d9b34f49846541cfd9a640d5.zip frameworks_native-9166f7bfa7796489d9b34f49846541cfd9a640d5.tar.gz frameworks_native-9166f7bfa7796489d9b34f49846541cfd9a640d5.tar.bz2 | |
Use correct TLS codepath in graphics libraries
Duplicate ARCH_ARM_HAVE_TLS_REGISTER BoardConfig to proprocessor
HAVE_ARM_TLS_REGISTER define from Bionic's libc Android.mk to ensure that
OpenGL libraries (libEGL, libGLESv1_CM, libGLESv2, libGLES_android) use the
correct codepath in bionic_tls.h for accessing the TLS address
Diffstat (limited to 'opengl/libagl')
| -rw-r--r-- | opengl/libagl/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 9837845..c2e9f31 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -39,6 +39,11 @@ endif ifneq ($(TARGET_SIMULATOR),true) # we need to access the private Bionic header <bionic_tls.h> + # on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER + # behavior from the bionic Android.mk file + ifeq ($(TARGET_ARCH)-$(ARCH_ARM_HAVE_TLS_REGISTER),arm-true) + LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER + endif LOCAL_C_INCLUDES += bionic/libc/private endif |