From e5f674e7cd6c3070120840f057c26e26a3e102f5 Mon Sep 17 00:00:00 2001
From: Edmund Grimley Evans <Edmund.Grimley-Evans@arm.com>
Date: Mon, 4 Jul 2016 17:13:00 +0100
Subject: [PATCH] i#1569 AArch64: Make ELF_R_TLS_DESC fail at run time, not
 load time.

Fix-up for b86fc3a.

Review-URL: https://codereview.appspot.com/298670043
---
 core/unix/module_elf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/unix/module_elf.c b/core/unix/module_elf.c
index 9ae01e798c3..7158caf1c8c 100644
--- a/core/unix/module_elf.c
+++ b/core/unix/module_elf.c
@@ -1667,6 +1667,7 @@ dr_symbol_export_iterator_stop(dr_symbol_export_iterator_t *dr_iter)
 
 #endif /* CLIENT_INTERFACE */
 
+#ifndef ANDROID
 static size_t
 tlsdesc_resolver(void *arg)
 {
@@ -1674,6 +1675,7 @@ tlsdesc_resolver(void *arg)
     ASSERT_NOT_IMPLEMENTED(false);
     return 0;
 }
+#endif
 
 /* This routine is duplicated in privload_relocate_symbol for relocating
  * dynamorio symbols in a bootstrap stage. Any update here should be also