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
DynamoRIO · Jul 4, 2016 · e5f674e · e5f674e
1 parent 3dc4207
commit e5f674e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/core/unix/module_elf.c b/core/unix/module_elf.c
@@ -1667,13 +1667,15 @@ dr_symbol_export_iterator_stop(dr_symbol_export_iterator_t *dr_iter)
 
 #endif /* CLIENT_INTERFACE */
 
+#ifndef ANDROID
 static size_t
 tlsdesc_resolver(void *arg)
 {
     /* FIXME i#1961: TLS descriptors are not implemented */
     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