svn commit: r233674 - head/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Thu Mar 29 17:50:01 2012
New Revision: 233674
URL: http://svn.freebsd.org/changeset/base/233674

Log:
  Fix ia64 build after r233655.
  
  MFC after:	1 week

Modified:
  head/libexec/rtld-elf/rtld.c

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Thu Mar 29 17:39:18 2012	(r233673)
+++ head/libexec/rtld-elf/rtld.c	Thu Mar 29 17:50:01 2012	(r233674)
@@ -2618,7 +2618,9 @@ do_dlsym(void *handle, const char *name,
     const Elf_Sym *def;
     SymLook req;
     RtldLockState lockstate;
+#ifndef __ia64__
     tls_index ti;
+#endif
     int res;
 
     def = NULL;
@@ -2734,9 +2736,13 @@ do_dlsym(void *handle, const char *name,
 	else if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
 	    return (rtld_resolve_ifunc(defobj, def));
 	else if (ELF_ST_TYPE(def->st_info) == STT_TLS) {
+#ifdef __ia64__
+	    return (__tls_get_addr(defobj->tlsindex, def->st_value));
+#else
 	    ti.ti_module = defobj->tlsindex;
 	    ti.ti_offset = def->st_value;
 	    return (__tls_get_addr(&ti));
+#endif
 	} else
 	    return (defobj->relocbase + def->st_value);
     }